diff --git a/app-admin/ulogd/ulogd-2.0.2.ebuild b/app-admin/ulogd/ulogd-2.0.2.ebuild
index 5b842c98073b..2d1465f7672a 100644
--- a/app-admin/ulogd/ulogd-2.0.2.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.2.ebuild,v 1.6 2013/04/22 16:02:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.2.ebuild,v 1.7 2013/04/23 08:42:32 ago Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc x86"
+KEYWORDS="amd64 ~ia64 ppc x86"
 IUSE="dbi doc mysql nfacct +nfct +nflog pcap postgres sqlite"
 
 RDEPEND="net-firewall/iptables
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index a1eb891ef7a6..5c2bc191a599 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,3 +1,4 @@
 DIST clamav-0.97.5.tar.gz 14754465 SHA256 db6c5e1a5ec8ca0b8006cf82661d3158d3365ba1b4bc14c03c5d0bca89a93c0d SHA512 618ef2f1d256f2e3cd76beaf92b76d9df0963d449c2d80885ed6039f4edd59ddf9a73ebe0b93549c62264d7df4ac918d306d631f8c0b1df8e47a7e763550f1cc WHIRLPOOL 7d148323a4510acfe706a17f27c12bd808a013aa91807257b03af83e4a6daeb619962243689eee5614ce2922dfa39d21ae357d2509617be4642f162ac91d5d7e
 DIST clamav-0.97.6.tar.gz 14765896 SHA256 a15a2bb9200ac9f2c6f1c5e1072ac265a2c4fe5a9be4663b47d076afdfa123f8 SHA512 f897f4c70c7555d1ede480b089f73020501bceb1d5de568785b842d04f35ee0771213b8050ac6159dde1f19816ab9a8373e8bcb419106eeeb701a386932d96e7 WHIRLPOOL 1a4916592843a3568ebef78663f76e8eba96b7d561bd61199ad1e15b239fc4c2bb3c25dcc49fad713cd09fb221ab83e9e7b1ba923ed71220943eec78dc04fb16
 DIST clamav-0.97.7.tar.gz 14598481 SHA256 8527754e7eb235317e37a50706d94d3fc9d880fd0bf6f3cb83757d64a720e9ff SHA512 92120250afb882b7fb9f956f2095797f8e3c93076a229967123261c907d9b4436cda6cf2d18b2c61cec8b33afeacba9c2701ad3322aa3316163fe4f36f7a7bc7 WHIRLPOOL 1f3fb155ad4e35ef1ea3835941e40363f9da9c37ab46fe1b9d44e29add6fee9d775e1f5858648a6229f9d0f41c40ed4ade726a4fc044156d208bf10f6cc8c705
+DIST clamav-0.97.8.tar.gz 14609966 SHA256 d872bdfd692d440bc2ade2f4e5a7befc37feb8885cd81adfb6346a8214aafc12 SHA512 e3a80bbfc90922f7f49521d1ab53ec63fb948a42d448ecaa933023cbb256f35e5b695305bd2d56480ee1f94ac93703d10aa4193566c521a1fa62f2c0e1019fda WHIRLPOOL b0ddc29edd096007abc0183400f2b3ee54cf87f13bb2eab2388c444f038fab33eb25b6b5d678449d49da2258017a630ff2e6b36c27028557038a033b415b026c
diff --git a/app-antivirus/clamav/clamav-0.97.5-r1.ebuild b/app-antivirus/clamav/clamav-0.97.5-r1.ebuild
index 0a47c4df6b7a..8c3099f3f6eb 100644
--- a/app-antivirus/clamav/clamav-0.97.5-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.97.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.5-r1.ebuild,v 1.9 2012/10/05 15:49:20 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.5-r1.ebuild,v 1.10 2013/04/23 18:02:01 lordvan Exp $
 
 EAPI=4
 
diff --git a/app-antivirus/clamav/clamav-0.97.8.ebuild b/app-antivirus/clamav/clamav-0.97.8.ebuild
new file mode 100644
index 000000000000..fdbc7b3962a7
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.97.8.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.8.ebuild,v 1.1 2013/04/23 18:02:01 lordvan Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic user
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="http://www.clamav.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs uclibc"
+
+CDEPEND="bzip2? ( app-arch/bzip2 )
+	clamdtop? ( sys-libs/ncurses )
+	iconv? ( virtual/libiconv )
+	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	dev-libs/libtommath
+	>=sys-libs/zlib-1.2.2
+	sys-devel/libtool"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+RESTRICT="test"
+
+DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.97-nls.patch
+)
+
+pkg_setup() {
+	enewgroup clamav
+	enewuser clamav -1 -1 /dev/null clamav
+}
+
+src_prepare() {
+	use ppc64 && append-flags -mminimal-toic
+	use uclibc && export ac_cv_type_error_t=yes
+}
+
+src_configure() {
+	econf \
+		--disable-experimental \
+		--enable-id-check \
+		--with-dbdir="${EPREFIX}"/var/lib/clamav \
+		--with-system-tommath \
+		--with-zlib="${EPREFIX}"/usr \
+		$(use_enable bzip2) \
+		$(use_enable clamdtop) \
+		$(use_enable ipv6) \
+		$(use_enable milter) \
+		$(use_enable static-libs static) \
+		$(use_with iconv)
+}
+
+src_install() {
+	default
+
+	rm -rf "${ED}"/var/lib/clamav
+	newinitd "${FILESDIR}"/clamd.initd-r5 clamd
+	newconfd "${FILESDIR}"/clamd.conf clamd
+
+	keepdir /var/lib/clamav
+	fowners clamav:clamav /var/lib/clamav
+	keepdir /var/log/clamav
+	fowners clamav:clamav /var/log/clamav
+
+	dodir /etc/logrotate.d
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/clamav.logrotate clamav
+
+	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
+		-e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
+		-e "s:.*\(User\) .*:\1 clamav:" \
+		-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
+		-e "s:^\#\(LogTime\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${ED}"/etc/clamd.conf
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
+		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
+		-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
+		-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
+		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${ED}"/etc/freshclam.conf
+
+	if use milter ; then
+		# MilterSocket one to include ' /' because there is a 2nd line for
+		# inet: which we want to leave
+		dodoc "${FILESDIR}"/clamav-milter.README.gentoo
+		sed -i -e "s:^\(Example\):\# \1:" \
+			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
+			-e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
+			-e "s:.*\(User\) .*:\1 clamav:" \
+			-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
+			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
+			"${ED}"/etc/clamav-milter.conf
+		cat > "${ED}"/etc/conf.d/clamd <<-EOF
+			MILTER_NICELEVEL=19
+			START_MILTER=no
+		EOF
+	fi
+
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if use milter ; then
+		elog "For simple instructions how to setup the clamav-milter read the"
+		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+	fi
+}
diff --git a/app-backup/bacula/bacula-5.2.13.ebuild b/app-backup/bacula/bacula-5.2.13.ebuild
index 243b27243155..437c5afff093 100644
--- a/app-backup/bacula/bacula-5.2.13.ebuild
+++ b/app-backup/bacula/bacula-5.2.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.13.ebuild,v 1.5 2013/04/22 17:10:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.13.ebuild,v 1.6 2013/04/23 04:27:00 tomjbe Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -114,6 +114,12 @@ src_prepare() {
 	done
 	popd >&/dev/null || die
 
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
 	# drop automatic install of unneeded documentation (for bug 356499)
 	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-doc.patch
 
diff --git a/app-cdr/k3b/files/k3b-2.0.2-libav9.patch b/app-cdr/k3b/files/k3b-2.0.2-libav9.patch
new file mode 100644
index 000000000000..42ec6632da68
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-2.0.2-libav9.patch
@@ -0,0 +1,22 @@
+Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+===================================================================
+--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2013-04-22 17:46:13.523959500 +0200
++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2013-04-22 18:40:49.890007513 +0200
+@@ -95,7 +95,7 @@ bool K3bFFMpegFile::open()
+     }
+ 
+     // analyze the streams
+-    ::av_find_stream_info( d->formatContext );
++    ::avformat_find_stream_info( d->formatContext, 0 );
+ 
+     // we only handle files containing one audio stream
+     if( d->formatContext->nb_streams != 1 ) {
+@@ -129,7 +129,7 @@ bool K3bFFMpegFile::open()
+ 
+     // open the codec on our context
+     kDebug() << "(K3bFFMpegFile) found codec for " << m_filename;
+-    if( ::avcodec_open( codecContext, d->codec ) < 0 ) {
++    if( ::avcodec_open2( codecContext, d->codec, 0 ) < 0 ) {
+         kDebug() << "(K3bFFMpegDecoderFactory) could not open codec.";
+         return false;
+     }
diff --git a/app-cdr/k3b/k3b-2.0.2-r4.ebuild b/app-cdr/k3b/k3b-2.0.2-r4.ebuild
index 1dbe5f12f00e..f1748a13d4e4 100644
--- a/app-cdr/k3b/k3b-2.0.2-r4.ebuild
+++ b/app-cdr/k3b/k3b-2.0.2-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r4.ebuild,v 1.5 2012/12/10 16:56:44 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r4.ebuild,v 1.6 2013/04/23 23:54:55 lu_zero Exp $
 
 EAPI=4
 
@@ -64,6 +64,7 @@ DOCS+=( ChangeLog )
 PATCHES=(
 	"${FILESDIR}/${P}-ffmpeg.patch"
 	"${FILESDIR}/${P}-libavformat54.patch"
+	"${FILESDIR}/${P}-libav9.patch"
 )
 
 REQUIRED_USE="
diff --git a/app-crypt/oclhashcat-lite-bin/Manifest b/app-crypt/oclhashcat-lite-bin/Manifest
index 173e707548f6..dce0d8b6da78 100644
--- a/app-crypt/oclhashcat-lite-bin/Manifest
+++ b/app-crypt/oclhashcat-lite-bin/Manifest
@@ -1 +1,2 @@
 DIST oclHashcat-lite-0.14.7z 2967901 SHA256 faec3c48c1ee9adde97d4f5efad17bb36ce4e69b495eeed80ae89d6faf9db551 SHA512 71fd31947208df6cd1ce26d64b0b68191d479a8142cde936eafe4c256e11905ab955a238a93393f3cf5865c75729d13bb0d496da9109c5f644e326331dca9b08 WHIRLPOOL 4c6972b5c993debbd1590fa0b4fdc59ba409cc9bcee05de2112cf4c79a74bf67c63e5a5abf70047fe0ae4cb1d6f23a57b83b84f3f1ac34e8247e9542da1d7881
+DIST oclHashcat-lite-0.15.7z 6026598 SHA256 40fd6f5410e1c0d5d5e7c9d60c173d838289025a2fc36b86690fb26657ed5796 SHA512 b70738a40cdbc5062cb72f1de93a2d29cdd824b7f3cb0f5bc42e3a7e83246d2247385040efe230afffa26ddf26823ecefabf16f31b1925c7460e7cd8933342b8 WHIRLPOOL b53ce94f04dd464fd6727641726aa56620ec6dcf5c557887c7346955b08b33f187b59db27debf98210c477299ef13c8f7334e8c3b2234b27edf0fe97b1438235
diff --git a/app-crypt/oclhashcat-lite-bin/metadata.xml b/app-crypt/oclhashcat-lite-bin/metadata.xml
index 88e9eb110229..8006cb0e3265 100644
--- a/app-crypt/oclhashcat-lite-bin/metadata.xml
+++ b/app-crypt/oclhashcat-lite-bin/metadata.xml
@@ -6,5 +6,6 @@
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
+<use><flag name="virtualcl">Support for Mosix VirtualCL Clustering Platform</flag></use>
 </pkgmetadata>
 
diff --git a/app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.15.ebuild b/app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.15.ebuild
new file mode 100644
index 000000000000..87dcdaffaa6d
--- /dev/null
+++ b/app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.15.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.15.ebuild,v 1.1 2013/04/23 02:49:26 zerochaos Exp $
+
+EAPI=5
+
+inherit eutils pax-utils
+
+DESCRIPTION="An opencl hash cracker"
+HOMEPAGE="http://hashcat.net/oclhashcat-lite/"
+MY_P="oclHashcat-lite-${PV}"
+SRC_URI="http://hashcat.net/files/${MY_P}.7z"
+
+#license applies to this version per http://hashcat.net/forum/thread-1348.html
+LICENSE="hashcat"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE_VIDEO_CARDS="video_cards_fglrx
+	video_cards_nvidia"
+
+IUSE="virtualcl ${IUSE_VIDEO_CARDS}"
+
+RDEPEND="sys-libs/zlib
+	video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-310.32 )
+	video_cards_fglrx?  ( =x11-drivers/ati-drivers-13.1 )"
+DEPEND="${RDEPEND}
+	app-arch/p7zip"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="strip"
+QA_PREBUILT="*Hashcat-lite*.bin"
+
+src_test() {
+	printf "%02x" ${PV#0.} > "${S}"/eula.accepted
+	if use video_cards_nvidia; then
+		if [ ! -w /dev/nvidia0 ]; then
+			einfo "To run these tests, portage likely must be in the video group."
+			einfo "Please run \"passwd -a portage video\" if the tests will fail"
+		fi
+		./cudaExample0.sh || die
+		./cudaExample400.sh || die
+		./cudaExample500.sh || die
+	fi
+	if use video_cards_fglrx; then
+		./oclExample0.sh || die
+		./oclExample400.sh || die
+		./oclExample500.sh || die
+	fi
+	rm "${S}"/eula.accepted
+}
+
+src_install() {
+	dodoc docs/*
+	rm -r "${S}"/*.exe "${S}"/*.cmd "${S}"/docs || die
+	if use x86; then
+		rm oclHashcat-lite64.bin || die
+		rm cudaHashcat-lite64.bin || die
+	fi
+	if use amd64; then
+		rm oclHashcat-lite32.bin || die
+		rm cudaHashcat-lite32.bin || die
+	fi
+	if ! use video_cards_fglrx; then
+		rm -r kernels/4098 || die
+		rm oclHashcat-lite*.bin || die
+	fi
+	if ! use video_cards_nvidia; then
+		rm -r kernels/4318 || die
+		rm cudaHashcat-lite*.bin || die
+	fi
+	use virtualcl || { rm vclHashcat-lite* || die; }
+	#I assume this is needed but I didn't check
+	pax-mark m *Hashcat-lite*.bin
+
+	insinto /opt/${PN}
+	doins -r "${S}"/*
+
+	dodir /opt/bin
+
+	cat <<-EOF > "${ED}"/opt/bin/oclhashcat-lite
+		#! /bin/sh
+		echo "oclHashcat-lite and all related files have been installed in /opt/${PN}"
+		echo "Please run one of the following binaries to use gpu accelerated hashcat:"
+	EOF
+
+	for x in oclHashcat-lite64.bin oclHashcat-lite32.bin cudaHashcat-lite64.bin cudaHashcat-lite32.bin vclHashcat-lite64.bin vclHashcat-lite32.bin
+	do
+		if [ -f "${ED}"/opt/${PN}/${x} ]
+		then
+			case "${x}" in
+				oclHashcat-lite64.bin)
+					echo "echo '64 bit ATI accelerated \"oclHashcat-lite64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-lite
+					;;
+				oclHashcat-lite32.bin)
+					echo "echo '32 bit ATI accelerated \"oclHashcat-lite32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-lite
+					;;
+				cudaHashcat-lite64.bin)
+					echo "echo '64 bit NVIDIA accelerated \"cudaHashcat-lite64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-lite
+					;;
+				cudaHashcat-lite32.bin)
+					echo "echo '32 bit NVIDIA accelerated \"cudaHashcat-lite32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-lite
+					;;
+				vclHashcat-lite64.bin)
+					echo "echo '64 bit VirtualCL Cluster support \"vclHashcat-lite64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-lite
+					;;
+				vclHashcat-lite32.bin)
+					echo "echo '32 bit VirtualCL Cluster support \"vclHashcat-lite32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-lite
+					;;
+			esac
+
+			fperms +x /opt/${PN}/${x}
+
+			cat <<-EOF > "${ED}"/opt/bin/${x}
+				#! /bin/sh
+				cd /opt/${PN}
+				echo "Warning: ${x} is running from /opt/${PN} so be careful of relative paths."
+				exec ./${x} "\$@"
+			EOF
+
+			fperms +x /opt/bin/${x}
+
+		fi
+	done
+
+	fperms +x /opt/bin/oclhashcat-lite
+	fowners root:video /opt/${PN}
+	einfo "oclhashcat-lite can be run as user if you are in the video group"
+}
+
+pkg_preinst() {
+	#I feel so dirty doing this
+	#first we remove the eula.accepted because it cannot properly handle and empty or old one (crash or doesn't run at all)
+	rm -f "${EROOT}"/opt/${PN}/eula.accepted
+	#next we remove any compiled kernel files as these get built on first run only if they aren't there because there are no timestamp checks
+	rm -f "${EROOT}"/opt/${PN}/kernels/{4318,4098}/"*.kernel"
+	#have mercy on my soul
+}
diff --git a/app-crypt/oclhashcat-plus-bin/Manifest b/app-crypt/oclhashcat-plus-bin/Manifest
index 15581a9cfa3e..9c74d5cbd776 100644
--- a/app-crypt/oclhashcat-plus-bin/Manifest
+++ b/app-crypt/oclhashcat-plus-bin/Manifest
@@ -1 +1,2 @@
 DIST oclHashcat-plus-0.13.7z 22397251 SHA256 374e612979a9e10ecf01d2f2a892f8f0af00ca8cfcfbcba5e6e36eb2aae27228 SHA512 3e259ad7abb1a42b1bed30de2ccc1d3f81d0ce420b27e4969332abbbe460287e3b3420c253cc7a82e060daa7411464927edb4f084e8e671ae60553c234f097de WHIRLPOOL 075f6eab5b03e24964ce4793435189bd950678f12276cd45f49e12f57b6d638c1d6acdb91d2d8397963de5a83b44383103c41438ac21a67d6e51d4c68149d399
+DIST oclHashcat-plus-0.14.7z 43411331 SHA256 4e5ee82bdb72ecd0ebc7795414a89d2755ed35dfc26fcbf92648e46dd223056e SHA512 8f6f548eb7de0dc9285f214757a9400976a696085a5ae61c583c0a3d73fcdb8326345054dda132414c2d44cdaa3207abebb47968defbb290e77fd496fd62861d WHIRLPOOL 9cf03c51a5b65326f08acf78987397035641cd6c38b86bb00620d3880958ccfc48fde24eff8f41b40a2c022ef3478e22c203d8eb8037c545b797956473c80a94
diff --git a/app-crypt/oclhashcat-plus-bin/metadata.xml b/app-crypt/oclhashcat-plus-bin/metadata.xml
index 88e9eb110229..8006cb0e3265 100644
--- a/app-crypt/oclhashcat-plus-bin/metadata.xml
+++ b/app-crypt/oclhashcat-plus-bin/metadata.xml
@@ -6,5 +6,6 @@
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
+<use><flag name="virtualcl">Support for Mosix VirtualCL Clustering Platform</flag></use>
 </pkgmetadata>
 
diff --git a/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.13.ebuild b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.13.ebuild
index 08dcdcf704ed..ea4f76d0c81f 100644
--- a/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.13.ebuild
+++ b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.13.ebuild,v 1.1 2013/02/03 01:55:07 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.13.ebuild,v 1.2 2013/04/23 02:36:58 zerochaos Exp $
 
 EAPI=5
 
@@ -34,7 +34,7 @@ QA_PREBUILT="*Hashcat-plus*.bin"
 
 src_install() {
 	dodoc docs/*
-	rm -r *.exe docs || die
+	rm -r *.exe *.cmd docs || die
 	use x86 && rm *Hashcat-plus64*
 	use amd64 && rm *Hashcat-plus32*
 
@@ -98,3 +98,22 @@ src_install() {
 	fperms 0660 /opt/${PN}/eula.accepted
 	einfo "oclhashcat-plus can be run as user if you are in the video group"
 }
+
+src_test() {
+	printf "%02x" ${PV#0.} > "${S}"/eula.accepted
+	if use video_cards_nvidia; then
+		if [ ! -w /dev/nvidia0 ]; then
+			einfo "To run these tests, portage likely must be in the video group."
+			einfo "Please run \"passwd -a portage video\" if the tests will fail"
+		fi
+		./cudaExample0.sh || die
+		./cudaExample400.sh || die
+		./cudaExample500.sh || die
+	fi
+	if use video_cards_fglrx; then
+		./oclExample0.sh || die
+		./oclExample400.sh || die
+		./oclExample500.sh || die
+	fi
+	rm "${S}"/eula.accepted
+}
diff --git a/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.14.ebuild b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.14.ebuild
new file mode 100644
index 000000000000..e5f7deed5844
--- /dev/null
+++ b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.14.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.14.ebuild,v 1.1 2013/04/23 02:36:57 zerochaos Exp $
+
+EAPI=5
+
+inherit eutils pax-utils
+
+DESCRIPTION="An opencl multihash cracker"
+HOMEPAGE="http://hashcat.net/oclhashcat-plus/"
+
+MY_P="oclHashcat-plus-${PV}"
+SRC_URI="http://hashcat.net/files/${MY_P}.7z"
+
+LICENSE="hashcat"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE_VIDEO_CARDS="video_cards_fglrx
+	video_cards_nvidia"
+
+IUSE="virtualcl ${IUSE_VIDEO_CARDS}"
+
+RDEPEND="sys-libs/zlib
+	video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-310.32 )
+	video_cards_fglrx?  ( =x11-drivers/ati-drivers-13.1 )"
+DEPEND="${RDEPEND}
+	app-arch/p7zip"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="strip"
+QA_PREBUILT="*Hashcat-plus*.bin"
+
+src_test() {
+	printf "%02x" ${PV#0.} > "${S}"/eula.accepted
+	if use video_cards_nvidia; then
+		if [ ! -w /dev/nvidia0 ]; then
+			einfo "To run these tests, portage likely must be in the video group."
+			einfo "Please run \"passwd -a portage video\" if the tests will fail"
+		fi
+		./cudaExample0.sh || die
+		./cudaExample400.sh || die
+		./cudaExample500.sh || die
+	fi
+	if use video_cards_fglrx; then
+		./oclExample0.sh || die
+		./oclExample400.sh || die
+		./oclExample500.sh || die
+	fi
+	rm "${S}"/eula.accepted
+}
+
+src_install() {
+	dodoc docs/*
+	rm -r "${S}"/*.exe "${S}"/*.cmd "${S}"/docs || die
+	use x86 && rm *Hashcat-plus64*
+	use amd64 && rm *Hashcat-plus32*
+	use virtualcl || { rm vclHashcat-plus* || die; }
+
+	if ! use video_cards_fglrx; then
+		rm -r kernels/4098 || die
+		rm oclHashcat-plus*.bin || die
+	fi
+	if ! use video_cards_nvidia; then
+		rm -r kernels/4318 || die
+		rm cudaHashcat-plus*.bin || die
+	fi
+	pax-mark m *Hashcat-plus*.bin
+
+	insinto /opt/${PN}
+	doins -r "${S}"/* || die "Copy files failed"
+
+	dodir /opt/bin
+
+	cat <<-EOF > "${ED}"/opt/bin/oclhashcat-plus
+		#! /bin/sh
+		echo "oclHashcat-plus and all related files have been installed in /opt/${PN}"
+		echo "Please run one of the following binaries to use gpu accelerated hashcat:"
+	EOF
+
+	for x in oclHashcat-plus64.bin oclHashcat-plus32.bin cudaHashcat-plus64.bin cudaHashcat-plus32.bin vclHashcat-plus64.bin vclHashcat-plus32.bin
+	do
+		if [ -f "${ED}"/opt/${PN}/${x} ]
+		then
+			case "${x}" in
+				oclHashcat-plus64.bin)
+					echo "echo '64 bit ATI accelerated \"oclHashcat-plus64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
+					;;
+				oclHashcat-plus32.bin)
+					echo "echo '32 bit ATI accelerated \"oclHashcat-plus32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
+					;;
+				cudaHashcat-plus64.bin)
+					echo "echo '64 bit NVIDIA accelerated \"cudaHashcat-plus64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
+					;;
+				cudaHashcat-plus32.bin)
+					echo "echo '32 bit NVIDIA accelerated \"cudaHashcat-plus32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
+					;;
+				vclHashcat-plus64.bin)
+					echo "echo '64 bit VirtualCL Cluster support \"vclHashcat-plus64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
+					;;
+				vclHashcat-plus32.bin)
+					echo "echo '32 bit VirtualCL Cluster support \"vclHashcat-plus32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
+					;;
+			esac
+
+			fperms +x /opt/${PN}/${x}
+
+			cat <<-EOF > "${ED}"/opt/bin/${x}
+				#! /bin/sh
+				cd /opt/${PN}
+				echo "Warning: ${x} is running from /opt/${PN} so be careful of relative paths."
+				exec ./${x} "\$@"
+			EOF
+
+			fperms +x /opt/bin/${x}
+
+		fi
+	done
+
+	fperms +x /opt/bin/oclhashcat-plus
+	fowners root:video /opt/${PN}
+	einfo "oclhashcat-plus can be run as user if you are in the video group"
+}
+
+pkg_preinst() {
+	#I feel so dirty doing this
+	#first we remove the eula.accepted because it cannot properly handle and empty or old one (crash or doesn't run at all)
+	rm -f "${EROOT}"/opt/${PN}/eula.accepted
+	#next we remove any compiled kernel files as these get built on first run only if they aren't there because there are no timestamp checks
+	rm -f "${EROOT}"/opt/${PN}/kernels/{4318,4098}/"*.kernel"
+	#have mercy on my soul
+}
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.45.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.45.ebuild
index ef1486381aae..685cd8acecd5 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.45.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.45.ebuild,v 1.1 2013/04/17 11:48:10 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.45.ebuild,v 1.2 2013/04/23 09:07:41 ago Exp $
 
 EAPI="5"
 
@@ -20,7 +20,7 @@ SRC_URI="${X86_AT}"
 
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="1.6"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="+X alsa nsplugin pax_kernel"
 
 RESTRICT="fetch strip"
diff --git a/app-emulation/virt-what/virt-what-1.12.ebuild b/app-emulation/virt-what/virt-what-1.12.ebuild
index bda1d5c847c8..23d2d11f100b 100644
--- a/app-emulation/virt-what/virt-what-1.12.ebuild
+++ b/app-emulation/virt-what/virt-what-1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-what/virt-what-1.12.ebuild,v 1.2 2012/11/06 15:18:29 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-what/virt-what-1.12.ebuild,v 1.4 2013/04/23 21:40:09 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://people.redhat.com/~rjones/virt-what/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-i18n/man-pages-ru/man-pages-ru-3.27.2066.1435.20101003.ebuild b/app-i18n/man-pages-ru/man-pages-ru-3.27.2066.1435.20101003.ebuild
index 05de7e80c473..0f570cfb632e 100644
--- a/app-i18n/man-pages-ru/man-pages-ru-3.27.2066.1435.20101003.ebuild
+++ b/app-i18n/man-pages-ru/man-pages-ru-3.27.2066.1435.20101003.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ru/man-pages-ru-3.27.2066.1435.20101003.ebuild,v 1.9 2011/09/27 19:29:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ru/man-pages-ru-3.27.2066.1435.20101003.ebuild,v 1.10 2013/04/23 16:36:08 vapier Exp $
 
 EAPI="2"
 inherit versionator
diff --git a/app-i18n/man-pages-ru/man-pages-ru-3.41.2145.1724.20130102.ebuild b/app-i18n/man-pages-ru/man-pages-ru-3.41.2145.1724.20130102.ebuild
index 73b328f57da1..9ec86f2a4338 100644
--- a/app-i18n/man-pages-ru/man-pages-ru-3.41.2145.1724.20130102.ebuild
+++ b/app-i18n/man-pages-ru/man-pages-ru-3.41.2145.1724.20130102.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ru/man-pages-ru-3.41.2145.1724.20130102.ebuild,v 1.11 2013/03/01 12:46:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ru/man-pages-ru-3.41.2145.1724.20130102.ebuild,v 1.12 2013/04/23 16:36:08 vapier Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.tar.bz2"
 
 LICENSE="FDL-1.3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
diff --git a/app-misc/geneweb/geneweb-6.07.ebuild b/app-misc/geneweb/geneweb-6.07.ebuild
index 2c92f668a8d3..72d3fb36df0e 100644
--- a/app-misc/geneweb/geneweb-6.07.ebuild
+++ b/app-misc/geneweb/geneweb-6.07.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/geneweb-6.07.ebuild,v 1.1 2013/04/22 06:22:20 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/geneweb-6.07.ebuild,v 1.2 2013/04/22 21:15:33 zmedico Exp $
 
 EAPI=4
 inherit eutils user
@@ -11,7 +11,7 @@ MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Genealogy software program with a Web interface."
 HOMEPAGE="http://opensource.geneanet.org/projects/geneweb"
-SRC_URI="http://opensource.geneanet.org/attachments/download/211/${MY_P}-src.tgz
+SRC_URI="http://opensource.geneanet.org/attachments/download/240/${MY_P}-src.tgz
 	http://dev.gentoo.org/~tupone/${P}-reduce-utf8.ml.patch.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/gramps/gramps-3.4.3.ebuild b/app-misc/gramps/gramps-3.4.3.ebuild
index 95543c2140f3..f5fe5df63926 100644
--- a/app-misc/gramps/gramps-3.4.3.ebuild
+++ b/app-misc/gramps/gramps-3.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.4.3.ebuild,v 1.3 2013/04/22 13:46:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.4.3.ebuild,v 1.4 2013/04/23 08:39:50 ago Exp $
 
 EAPI=3
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/gramps/Stable/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="gnome reports spell webkit"
 
 RDEPEND="dev-python/bsddb3
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index e69de29bb2d1..0c006fec4376 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -0,0 +1 @@
+DIST tatt-0.1.tar.gz 20539 SHA256 70e976606e9f4e1c76d67048f0eaa3f0c53e6b8134621d18bc74f5df01ac8a96 SHA512 5ca2daf190eca82ba038f60dab15587616404dc24e022c7154e1546667caaa7a40681b4401b6a3e2843d9bed9553d9e77dc5ff548434c430902329677ac6f5a5 WHIRLPOOL 25a4e519dec28cf7bd9cee53ba87ce895ddfb31038864f7158473923e8de6415ac5709e9fa3763b320241df34385e74b6fc869f8c9aef44b8a0da6a596b5b679
diff --git a/app-portage/tatt/tatt-0.1.ebuild b/app-portage/tatt/tatt-0.1.ebuild
new file mode 100644
index 000000000000..981ac121b5e5
--- /dev/null
+++ b/app-portage/tatt/tatt-0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/tatt/tatt-0.1.ebuild,v 1.1 2013/04/23 12:07:05 tomka Exp $
+
+EAPI=5
+
+#configobj does not support python-3
+PYTHON_COMPAT=( python2_6 python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="tatt is an arch testing tool"
+HOMEPAGE="https://github.com/tom111/tatt"
+SRC_URI="https://github.com/tom111/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+templates"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-portage/eix
+	app-portage/gentoolkit
+	www-client/pybugz
+	dev-python/configobj"
+DEPEND="${RDEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use templates; then
+		insinto "/usr/share/${PN}"
+		doins -r templates || die
+	fi
+}
diff --git a/app-portage/tatt/tatt-9999.ebuild b/app-portage/tatt/tatt-9999.ebuild
index ecb24c7cd394..6bc9301f5ad8 100644
--- a/app-portage/tatt/tatt-9999.ebuild
+++ b/app-portage/tatt/tatt-9999.ebuild
@@ -1,35 +1,35 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/tatt/tatt-9999.ebuild,v 1.4 2011/09/13 13:54:56 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/tatt/tatt-9999.ebuild,v 1.5 2013/04/23 12:07:05 tomka Exp $
 
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.6"
+EAPI=5
 
-inherit distutils git-2
+#configobj does not support python-3
+PYTHON_COMPAT=( python2_6 python2_7 )
+
+inherit distutils-r1 git-2
 
 DESCRIPTION="tatt is an arch testing tool"
 HOMEPAGE="http://github.com/tom111/tatt"
-EGIT_REPO_URI="git://github.com/tom111/tatt.git"
+EGIT_REPO_URI="https://github.com/tom111/tatt.git"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="+templates"
 
-DEPEND="dev-python/setuptools"
-RDEPEND="app-portage/eix
-		app-portage/gentoolkit
-		www-client/pybugz
-		dev-python/configobj"
-
-#configobj does not support python-3
-RESTRICT_PYTHON_ABIS="2.[45] 3.*"
+RDEPEND="
+	${PYTHON_DEPS}
+	app-portage/eix
+	app-portage/gentoolkit
+	www-client/pybugz
+	dev-python/configobj"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}"
 
-src_install() {
-	distutils_src_install
+python_install_all() {
+	distutils-r1_python_install_all
 	if use templates; then
 		insinto "/usr/share/${PN}"
 		doins -r templates || die
diff --git a/app-shells/tcsh/tcsh-6.18.01.ebuild b/app-shells/tcsh/tcsh-6.18.01.ebuild
index 1df7ef91147b..66bc1e4e32d5 100644
--- a/app-shells/tcsh/tcsh-6.18.01.ebuild
+++ b/app-shells/tcsh/tcsh-6.18.01.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.18.01.ebuild,v 1.2 2012/03/08 11:48:40 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.18.01.ebuild,v 1.10 2013/04/23 15:17:05 jer Exp $
 
 EAPI="3"
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls doc"
 RESTRICT="test"
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index c50658d7542a..a2a2d6338aa0 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,3 +1 @@
-DIST calibre-0.9.20.tar.xz 28170112 SHA256 96075f6dbd25bf0bd26378b67d695478bd251a5ab8706cbc5907209aa6b6fcda SHA512 6bfa2e5c3b08d4201a281c3067de47d450474586355ab61fe3e4a70ab4a67164fa22b4baadaf859cc89918cc839500330c82e8501f0d52c63441b8bb1cbd4fda WHIRLPOOL 4c21bbc439ccdf2c1ff1cd6d93506d11e165387f68a9cba10f3263bfe6a70085d1ec98db7f187b51e5cc6879427fba2feb0afa2a2d1f4c570517163549546f73
-DIST calibre-0.9.26.tar.xz 28649776 SHA256 9e38087d814acefc580e701fd73a72b81cfd78dbd2b6a100c037eed4a69bb4ba SHA512 3118f4b44a84d7a2187ce1d249a85400b9c725e0aeb779f764123e364bc9304b5fac5752cd187d51b36e9e0bf06d3e36eb7cbb21d91a28bfe1df717a5ec7a303 WHIRLPOOL c337c604035559fe07607a9239e78ee6c33adc5b836634d87209be2979fb7afa5972de8deb5f112bd8a2405016cd52e374dfaddcc942849cc820cbd4532c2ff0
 DIST calibre-0.9.27.tar.xz 28696180 SHA256 8fd3779c8f878420333f6919f80493bf69d4b64bf427697ebc365497d2450d1f SHA512 91970f7c7349f661fc582eb43b89b81e77350b1cf2237c78e55c9f028a94b803b5d72bdac3ac11722c4fcf93077c1f8042567f8e380ad03423ba6c7f5dec7318 WHIRLPOOL 2313f94ee2417343693e1b48736434d1bf356795eb781abbaf68b858ba9fd57eb2a78e8afe04b9c992a1879a99eb9cf65527ccea7ed1a91d7554a62dcee7822b
diff --git a/app-text/calibre/calibre-0.9.20.ebuild b/app-text/calibre/calibre-0.9.20.ebuild
deleted file mode 100644
index 47842ed1bc6a..000000000000
--- a/app-text/calibre/calibre-0.9.20.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.20.ebuild,v 1.4 2013/04/17 07:41:25 zmedico Exp $
-
-EAPI=5
-PYTHON_DEPEND=2:2.7
-PYTHON_USE_WITH="ssl sqlite"
-
-inherit python eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
-
-DESCRIPTION="Ebook management application."
-HOMEPAGE="http://calibre-ebook.com/"
-SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-
-KEYWORDS="amd64 x86"
-
-SLOT="0"
-
-IUSE="+udisks"
-
-COMMON_DEPEND="
-	>=app-text/podofo-0.8.2:=
-	>=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)]
-	>=dev-libs/chmlib-0.40:=
-	>=dev-libs/icu-4.4:=
-	>=dev-python/beautifulsoup-3.0.5:python-2
-	dev-python/netifaces
-	dev-python/python-dateutil
-	>=dev-python/dnspython-1.6.0
-	>=dev-python/cssselect-0.7.1
-	>=dev-python/cssutils-0.9.9
-	>=dev-python/dbus-python-0.82.2
-	>=dev-python/imaging-1.1.6
-	>=dev-python/lxml-2.2.1
-	>=dev-python/mechanize-0.1.11
-	>=dev-python/python-dateutil-1.4.1
-	>=dev-python/PyQt4-4.9.1[X,svg,webkit]
-	media-fonts/liberation-fonts
-	>=media-gfx/imagemagick-6.5.9[jpeg,png]
-	>=media-libs/freetype-2:=
-	>=media-libs/libwmf-0.2.8
-	>=media-libs/libmtp-1.1.4:=
-	virtual/libusb:1=
-	dev-qt/qtdbus:4=
-	dev-qt/qtsvg:4=
-	>=x11-misc/xdg-utils-1.0.2-r2"
-
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-0.6_rc5"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	python_set_active_version 2.7
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|PreserveMIMEDefaults():||" \
-		-e "s|xdg-icon-resource install|\\0 --mode user|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|xdg-mime install|\\0 --mode user|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^            self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/extensions.py || die "sed failed to patch extensions.py"
-
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	epatch \
-		"${FILESDIR}/${PN}-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database}
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANGUAGE
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_CONFIG_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building calibre-mount-helper
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	dodir "$(python_get_sitedir)" # for init_calibre.py
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	python setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}" || die
-
-	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
-		die "failed to fix harcoded \$D in paths"
-
-	# Remove dummy calibre-mount-helper which is unused since calibre-0.8.25
-	# due to bug #389515 (instead, calibre now calls udisks via dbus).
-	rm "${ED}usr/bin/calibre-mount-helper" || die
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
-
-	dobashcomp "${ED}"usr/etc/bash_completion.d/calibre
-	rm -r "${ED}"usr/etc/bash_completion.d
-	find "${ED}"usr/etc -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	python_convert_shebangs -r $(python_get_version) "${ED}"
-
-	newinitd "${FILESDIR}"/calibre-server.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	python_mod_optimize /usr/$(get_libdir)/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/${PN}
-}
diff --git a/app-text/calibre/calibre-0.9.26.ebuild b/app-text/calibre/calibre-0.9.26.ebuild
deleted file mode 100644
index c9587c78cf4a..000000000000
--- a/app-text/calibre/calibre-0.9.26.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.26.ebuild,v 1.2 2013/04/17 07:41:25 zmedico Exp $
-
-EAPI=5
-PYTHON_DEPEND=2:2.7
-PYTHON_USE_WITH="ssl sqlite"
-
-inherit python eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
-
-DESCRIPTION="Ebook management application."
-HOMEPAGE="http://calibre-ebook.com/"
-SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-
-IUSE="+udisks"
-
-COMMON_DEPEND="
-	>=app-text/podofo-0.8.2:=
-	>=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)]
-	>=dev-libs/chmlib-0.40:=
-	>=dev-libs/icu-4.4:=
-	>=dev-python/beautifulsoup-3.0.5:python-2
-	dev-python/netifaces
-	dev-python/python-dateutil
-	>=dev-python/dnspython-1.6.0
-	>=dev-python/cssselect-0.7.1
-	>=dev-python/cssutils-0.9.9
-	>=dev-python/dbus-python-0.82.2
-	>=dev-python/imaging-1.1.6
-	>=dev-python/lxml-2.2.1
-	>=dev-python/mechanize-0.1.11
-	>=dev-python/python-dateutil-1.4.1
-	>=dev-python/PyQt4-4.9.1[X,svg,webkit]
-	media-fonts/liberation-fonts
-	>=media-gfx/imagemagick-6.5.9[jpeg,png]
-	>=media-libs/freetype-2:=
-	>=media-libs/libwmf-0.2.8
-	>=media-libs/libmtp-1.1.4:=
-	virtual/libusb:1=
-	dev-qt/qtdbus:4=
-	dev-qt/qtsvg:4=
-	>=x11-misc/xdg-utils-1.0.2-r2"
-
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-0.6_rc5"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	python_set_active_version 2.7
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|PreserveMIMEDefaults():||" \
-		-e "s|xdg-icon-resource install|\\0 --mode user|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|xdg-mime install|\\0 --mode user|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^            self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/extensions.py || die "sed failed to patch extensions.py"
-
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	epatch \
-		"${FILESDIR}/${PN}-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database}
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANGUAGE
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_CONFIG_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building calibre-mount-helper
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	dodir "$(python_get_sitedir)" # for init_calibre.py
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	python setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}" || die
-
-	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
-		die "failed to fix harcoded \$D in paths"
-
-	# Remove dummy calibre-mount-helper which is unused since calibre-0.8.25
-	# due to bug #389515 (instead, calibre now calls udisks via dbus).
-	rm "${ED}usr/bin/calibre-mount-helper" || die
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
-
-	dobashcomp "${ED}"usr/etc/bash_completion.d/calibre
-	rm -r "${ED}"usr/etc/bash_completion.d
-	find "${ED}"usr/etc -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	python_convert_shebangs -r $(python_get_version) "${ED}"
-
-	newinitd "${FILESDIR}"/calibre-server.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	python_mod_optimize /usr/$(get_libdir)/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/${PN}
-}
diff --git a/app-text/calibre/calibre-0.9.27.ebuild b/app-text/calibre/calibre-0.9.27.ebuild
index d683343d79b9..128b8c101372 100644
--- a/app-text/calibre/calibre-0.9.27.ebuild
+++ b/app-text/calibre/calibre-0.9.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.27.ebuild,v 1.2 2013/04/17 07:41:25 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.27.ebuild,v 1.3 2013/04/23 19:51:32 scarabeus Exp $
 
 EAPI=5
 PYTHON_DEPEND=2:2.7
@@ -14,7 +14,7 @@ SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 SLOT="0"
 
diff --git a/app-text/gonzui/Manifest b/app-text/gonzui/Manifest
deleted file mode 100644
index 60ea15c67886..000000000000
--- a/app-text/gonzui/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gonzui-1.2.tar.gz 442942 SHA256 326348f181a0f34241bf82faf80220954e719b59161809e33c3117bb6c6336be SHA512 5e1096c82da84dbaacab34a0d6afd6a8a28aedb2cc45ad323b6cec28d764dce25b9894a39cacec5a36d5e01105ed9e4a1465c6962ee93ff6b1144b72f6959e78 WHIRLPOOL 8dd6c2970f00525a25405453fa9a19970940e7c89ae43b36877bbfa09bb4a59e1c66b839a6888b30000077a7d63773751731fc9976cff91b3254816b90486b6c
diff --git a/app-text/gonzui/files/ebuild.rb b/app-text/gonzui/files/ebuild.rb
deleted file mode 100644
index 31676e4e64ec..000000000000
--- a/app-text/gonzui/files/ebuild.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# ebuild.rb - a ebuild module of LangScan
-#
-# Copyright (C) 2005 Kenichi Ishibashi <bashi at dream.ie.ariake-nct.ac.jp>
-#     All rights reserved.
-#     This is free software with ABSOLUTELY NO WARRANTY.
-#
-# You can redistribute it and/or modify it under the terms of 
-# the GNU General Public License version 2.
-#
-
-require 'langscan/sh'
-require 'langscan/_common'
-
-module LangScan
-  module Ebuild
-    module_function
-    def name
-      "ebuild"
-    end
-
-    def abbrev
-      "ebuild"
-    end
-
-    def extnames
-      [".ebuild", ".eclass"]
-    end
-
-    # LangScan::Ebuild.scan iterates over shell scripts.
-    # It yields for each element which is interested by gonzui. 
-    def scan(input, &block)
-      # delegate to LangScan::Shell.scan
-      LangScan::Shell.scan(input, &block)
-    end
-
-    LangScan.register(self)
-  end
-end
diff --git a/app-text/gonzui/files/gonzui b/app-text/gonzui/files/gonzui
deleted file mode 100644
index de1e9c493528..000000000000
--- a/app-text/gonzui/files/gonzui
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gonzui/files/gonzui,v 1.1 2005/04/12 16:07:17 matsuu Exp $
-
-GONZUI_SERVER=/usr/bin/gonzui-server
-GONZUIRC=/etc/gonzuirc
-GONZUI_PIDFILE=/var/run/gonzui.pid
-
-depend() {
-    need net
-}
- 
-checkconfig() {
-    if [ ! -f "$GONZUIRC" ] ; then
-	eerror "Please create $GONZUIRC"
-	return 1
-    fi
-    return 0
-}
-
-start() {
-    checkconfig || return $?
-    ebegin "Starting gonzui"
-    start-stop-daemon --start --quiet --exec $GONZUI_SERVER -- --daemon  --gonzuirc=$GONZUIRC --quiet
-    eend $? "Failed to start gonzui"
-}
- 
-stop() {
-    ebegin "Stopping gonzui"
-    start-stop-daemon --stop --quiet --pidfile $GONZUI_PIDFILE
-    eend $? "Failed to stop gonzui"
-}
diff --git a/app-text/gonzui/files/gonzui-1.2-gentoo.patch b/app-text/gonzui/files/gonzui-1.2-gentoo.patch
deleted file mode 100644
index 3a3949d92177..000000000000
--- a/app-text/gonzui/files/gonzui-1.2-gentoo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Naur gonzui-1.2.orig/Makefile.am gonzui-1.2/Makefile.am
---- gonzui-1.2.orig/Makefile.am	2005-03-25 18:00:20.000000000 +0900
-+++ gonzui-1.2/Makefile.am	2009-01-01 11:28:13.000000000 +0900
-@@ -28,7 +28,7 @@
- 		gonzui.rb.in > gonzui.rb
- 	chmod -w gonzui.rb
- 
--gonzuirc.sample.in: gonzuirc.sample.in.in
-+gonzuirc.sample.in: gonzui.rb gonzuirc.sample.in.in
- 	ruby gonzui-db --gonzuirc gonzuirc.sample.in.in --dump-config \
- 		> gonzuirc.sample.in
- 
-diff -Naur gonzui-1.2.orig/configure.ac gonzui-1.2/configure.ac
---- gonzui-1.2.orig/configure.ac	2005-07-05 00:07:52.000000000 +0900
-+++ gonzui-1.2/configure.ac	2009-01-01 11:28:13.000000000 +0900
-@@ -9,7 +9,6 @@
- AC_PROG_CC
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
--AM_MAINTAINER_MODE
- AM_PATH_RUBY
- AM_RUN_LOG_DIRS
- AM_USER_GROUP
-diff -Naur gonzui-1.2.orig/langscan/Makefile.am gonzui-1.2/langscan/Makefile.am
---- gonzui-1.2.orig/langscan/Makefile.am	2005-07-05 00:07:57.000000000 +0900
-+++ gonzui-1.2/langscan/Makefile.am	2009-01-01 11:28:13.000000000 +0900
-@@ -26,6 +26,7 @@
- 		brainfuck.rb \
- 		c.rb \
- 		css.rb \
-+		ebuild.rb \
- 		elisp.rb \
- 		java.rb \
- 		javascript.rb \
-diff -Naur gonzui-1.2.orig/langscan/python/Makefile.am gonzui-1.2/langscan/python/Makefile.am
---- gonzui-1.2.orig/langscan/python/Makefile.am	2005-03-20 21:08:58.000000000 +0900
-+++ gonzui-1.2/langscan/python/Makefile.am	2009-01-01 11:28:39.000000000 +0900
-@@ -27,7 +27,7 @@
- 
- # We do this to workaround flex 2.5.4 issue because our .l
- # file could not be processed with flex 2.5.4.
--pythontok.c: pythontok.l
-+pythontok.c: python.h pythontok.l
- 	flex -d -opythontok.c pythontok.l || cp pythontok.c.dist pythontok.c
- 	cmp -s pythontok.c pythontok.c.dist || cp pythontok.c pythontok.c.dist
- 
diff --git a/app-text/gonzui/files/gonzui-1.2-parallel.patch b/app-text/gonzui/files/gonzui-1.2-parallel.patch
deleted file mode 100644
index 9ccd1eaf9992..000000000000
--- a/app-text/gonzui/files/gonzui-1.2-parallel.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.am
-+++ Makefile.am
-@@ -28,7 +28,7 @@
- 		gonzui.rb.in > gonzui.rb
- 	chmod -w gonzui.rb
- 
--gonzuirc.sample.in: gonzuirc.sample.in.in
-+gonzuirc.sample.in: gonzui.rb gonzuirc.sample.in.in
- 	ruby gonzui-db --gonzuirc gonzuirc.sample.in.in --dump-config \
- 		> gonzuirc.sample.in
- 
---- Makefile.in
-+++ Makefile.in
-@@ -671,7 +671,7 @@
- 		gonzui.rb.in > gonzui.rb
- 	chmod -w gonzui.rb
- 
--gonzuirc.sample.in: gonzuirc.sample.in.in
-+gonzuirc.sample.in: gonzui.rb gonzuirc.sample.in.in
- 	ruby gonzui-db --gonzuirc gonzuirc.sample.in.in --dump-config \
- 		> gonzuirc.sample.in
- 
diff --git a/app-text/gonzui/files/gonzui-1.2-r2-gentoo.patch b/app-text/gonzui/files/gonzui-1.2-r2-gentoo.patch
deleted file mode 100644
index 46855b6dd5c7..000000000000
--- a/app-text/gonzui/files/gonzui-1.2-r2-gentoo.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-diff -Naur gonzui-1.2.orig/Makefile.am gonzui-1.2/Makefile.am
---- gonzui-1.2.orig/Makefile.am	2005-03-25 18:00:20.000000000 +0900
-+++ gonzui-1.2/Makefile.am	2011-01-14 11:51:36.207687824 +0900
-@@ -28,7 +28,7 @@
- 		gonzui.rb.in > gonzui.rb
- 	chmod -w gonzui.rb
- 
--gonzuirc.sample.in: gonzuirc.sample.in.in
-+gonzuirc.sample.in: gonzui.rb gonzuirc.sample.in.in
- 	ruby gonzui-db --gonzuirc gonzuirc.sample.in.in --dump-config \
- 		> gonzuirc.sample.in
- 
-diff -Naur gonzui-1.2.orig/acinclude.m4 gonzui-1.2/acinclude.m4
---- gonzui-1.2.orig/acinclude.m4	2005-02-16 23:11:11.000000000 +0900
-+++ gonzui-1.2/acinclude.m4	2011-01-14 15:52:41.631014210 +0900
-@@ -54,7 +54,8 @@
-   RUBY_CFLAGS="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["CFLAGS"]'`"
-   RUBY_DLEXT="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["DLEXT"]'`"
-   RUBY_DLDFLAGS="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["DLDFLAGS"]'`"
--  RUBY_LIBS="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["LIBS"]'`"
-+  RUBY_SO_NAME="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["RUBY_SO_NAME"]'`"
-+  RUBY_LIBS="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["LIBRUBYARG_SHARED"]+" "+Config::MAKEFILE_CONFIG["LIBS"]'`"
-   RUBY_HDRHDIR="`ruby -rmkmf -e 'puts Config::CONFIG["archdir"]'`"
-   RUBY_CPPFLAGS='-I. -I$(RUBY_HDRHDIR)'
-   changequote([, ])
-@@ -64,6 +65,7 @@
-   AC_SUBST(RUBY_CFLAGS)
-   AC_SUBST(RUBY_DLEXT)
-   AC_SUBST(RUBY_DLDFLAGS)
-+  AC_SUBST(RUBY_SO_NAME)
-   AC_SUBST(RUBY_LIBS)
-   AC_SUBST(RUBY_HDRHDIR)
-   AC_SUBST(RUBY_CPPFLAGS)
-diff -Naur gonzui-1.2.orig/configure.ac gonzui-1.2/configure.ac
---- gonzui-1.2.orig/configure.ac	2005-07-05 00:07:52.000000000 +0900
-+++ gonzui-1.2/configure.ac	2011-01-14 11:51:36.207687824 +0900
-@@ -9,7 +9,6 @@
- AC_PROG_CC
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
--AM_MAINTAINER_MODE
- AM_PATH_RUBY
- AM_RUN_LOG_DIRS
- AM_USER_GROUP
-diff -Naur gonzui-1.2.orig/gonzui/Makefile.am gonzui-1.2/gonzui/Makefile.am
---- gonzui-1.2.orig/gonzui/Makefile.am	2005-03-17 15:48:44.000000000 +0900
-+++ gonzui-1.2/gonzui/Makefile.am	2011-01-14 17:58:12.112150295 +0900
-@@ -51,16 +51,16 @@
- 
- SUFFIXES = .c .o # for automake 1.4-p6
- .c.o:
--	$(RUBY_CC) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
-+	$(RUBY_CC) $(CFLAGS) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
- 
- $(TEXTTOKENIZER_DLLIB): $(TEXTTOKENIZER_OBJS)
- 	rm -f $@
--	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(TEXTTOKENIZER_OBJS) $(RUBY_LIBS)
-+	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(TEXTTOKENIZER_OBJS) $(RUBY_LIBS)
- 
- $(DELTA_DLLIB): $(DELTA_OBJS)
- 	rm -f $@
--	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(DELTA_OBJS) $(RUBY_LIBS)
-+	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(DELTA_OBJS) $(RUBY_LIBS)
- 
- $(AUTOPACK_DLLIB): $(AUTOPACK_OBJS)
- 	rm -f $@
--	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(AUTOPACK_OBJS) $(RUBY_LIBS)
-+	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(AUTOPACK_OBJS) $(RUBY_LIBS)
-diff -Naur gonzui-1.2.orig/gonzui/webapp/Makefile.am gonzui-1.2/gonzui/webapp/Makefile.am
---- gonzui-1.2.orig/gonzui/webapp/Makefile.am	2005-03-14 18:24:17.000000000 +0900
-+++ gonzui-1.2/gonzui/webapp/Makefile.am	2011-01-14 17:58:36.352009521 +0900
-@@ -24,8 +24,8 @@
- 
- SUFFIXES = .c .o # for automake 1.4-p6
- .c.o:
--	$(RUBY_CC) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
-+	$(RUBY_CC) $(CFLAGS) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
- 
- $(XMLFORMATTER_DLLIB): $(XMLFORMATTER_OBJS)
- 	rm -f $@
--	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(XMLFORMATTER_OBJS) $(RUBY_LIBS)
-+	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(XMLFORMATTER_OBJS) $(RUBY_LIBS)
-diff -Naur gonzui-1.2.orig/langscan/Makefile.am gonzui-1.2/langscan/Makefile.am
---- gonzui-1.2.orig/langscan/Makefile.am	2005-07-05 00:07:57.000000000 +0900
-+++ gonzui-1.2/langscan/Makefile.am	2011-01-14 11:51:36.207687824 +0900
-@@ -26,6 +26,7 @@
- 		brainfuck.rb \
- 		c.rb \
- 		css.rb \
-+		ebuild.rb \
- 		elisp.rb \
- 		java.rb \
- 		javascript.rb \
-diff -Naur gonzui-1.2.orig/langscan/c/Makefile.am gonzui-1.2/langscan/c/Makefile.am
---- gonzui-1.2.orig/langscan/c/Makefile.am	2005-03-20 21:08:25.000000000 +0900
-+++ gonzui-1.2/langscan/c/Makefile.am	2011-01-14 18:00:08.163475904 +0900
-@@ -35,9 +35,9 @@
- 
- SUFFIXES = .c .o # for automake 1.4-p6
- .c.o:
--	$(RUBY_CC) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
-+	$(RUBY_CC) $(CFLAGS) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
- 
- $(LANGSCAN_C_DLLIB): $(LANGSCAN_C_OBJS)
- 	rm -f $@
--	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_C_OBJS) $(RUBY_LIBS)
-+	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_C_OBJS) $(RUBY_LIBS)
- 
-diff -Naur gonzui-1.2.orig/langscan/java/Makefile.am gonzui-1.2/langscan/java/Makefile.am
---- gonzui-1.2.orig/langscan/java/Makefile.am	2005-03-20 21:08:39.000000000 +0900
-+++ gonzui-1.2/langscan/java/Makefile.am	2011-01-14 18:00:22.287393757 +0900
-@@ -27,7 +27,7 @@
- 
- # We do this to workaround flex 2.5.4 issue because our .l
- # file could not be processed with flex 2.5.4.
--javatok.c: javatok.l
-+javatok.c: javatok.l java.h
- 	flex -d -ojavatok.c javatok.l || cp javatok.c.dist javatok.c
- 	cmp -s javatok.c javatok.c.dist || cp javatok.c javatok.c.dist
- 
-@@ -35,8 +35,8 @@
- 
- SUFFIXES = .c .o # for automake 1.4-p6
- .c.o:
--	$(RUBY_CC) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
-+	$(RUBY_CC) $(CFLAGS) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
- 
- $(LANGSCAN_JAVA_DLLIB): $(LANGSCAN_JAVA_OBJS)
- 	rm -f $@
--	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_JAVA_OBJS) $(RUBY_LIBS)
-+	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_JAVA_OBJS) $(RUBY_LIBS)
-diff -Naur gonzui-1.2.orig/langscan/javascript/Makefile.am gonzui-1.2/langscan/javascript/Makefile.am
---- gonzui-1.2.orig/langscan/javascript/Makefile.am	2005-03-22 01:09:55.000000000 +0900
-+++ gonzui-1.2/langscan/javascript/Makefile.am	2011-01-14 18:00:41.683280922 +0900
-@@ -27,7 +27,7 @@
- 
- # We do this to workaround flex 2.5.4 issue because our .l
- # file could not be processed with flex 2.5.4.
--javascripttok.c: javascripttok.l
-+javascripttok.c: javascripttok.l javascript.h
- 	flex -d -ojavascripttok.c javascripttok.l || cp javascripttok.c.dist javascripttok.c
- 	cmp -s javascripttok.c javascripttok.c.dist || cp javascripttok.c javascripttok.c.dist
- 
-@@ -35,8 +35,8 @@
- 
- SUFFIXES = .c .o # for automake 1.4-p6
- .c.o:
--	$(RUBY_CC) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
-+	$(RUBY_CC) $(CFLAGS) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
- 
- $(LANGSCAN_JAVASCRIPT_DLLIB): $(LANGSCAN_JAVASCRIPT_OBJS)
- 	rm -f $@
--	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_JAVASCRIPT_OBJS) $(RUBY_LIBS)
-+	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_JAVASCRIPT_OBJS) $(RUBY_LIBS)
-diff -Naur gonzui-1.2.orig/langscan/pairmatcher/Makefile.am gonzui-1.2/langscan/pairmatcher/Makefile.am
---- gonzui-1.2.orig/langscan/pairmatcher/Makefile.am	2005-03-20 20:42:22.000000000 +0900
-+++ gonzui-1.2/langscan/pairmatcher/Makefile.am	2011-01-14 18:01:22.883041149 +0900
-@@ -21,9 +21,9 @@
- 
- SUFFIXES = .c .o # for automake 1.4-p6
- .c.o:
--	$(RUBY_CC) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
-+	$(RUBY_CC) $(CFLAGS) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
- 
- $(PAIRMATCHER_C_DLLIB): $(PAIRMATCHER_C_OBJS)
- 	rm -f $@
--	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(PAIRMATCHER_C_OBJS) $(RUBY_LIBS)
-+	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(PAIRMATCHER_C_OBJS) $(RUBY_LIBS)
- 
-diff -Naur gonzui-1.2.orig/langscan/php/Makefile.am gonzui-1.2/langscan/php/Makefile.am
---- gonzui-1.2.orig/langscan/php/Makefile.am	2005-03-20 21:08:45.000000000 +0900
-+++ gonzui-1.2/langscan/php/Makefile.am	2011-01-14 18:01:41.290933978 +0900
-@@ -27,7 +27,7 @@
- 
- # We do this to workaround flex 2.5.4 issue because our .l
- # file could not be processed with flex 2.5.4.
--phptok.c: phptok.l
-+phptok.c: phptok.l php.h
- 	flex -F -8 -d -ophptok.c phptok.l || cp phptok.c.dist phptok.c
- 	cmp -s phptok.c phptok.c.dist || cp phptok.c phptok.c.dist
- 
-@@ -35,8 +35,8 @@
- 
- SUFFIXES = .c .o # for automake 1.4-p6
- .c.o:
--	$(RUBY_CC) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
-+	$(RUBY_CC) $(CFLAGS) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
- 
- $(LANGSCAN_PHP_DLLIB): $(LANGSCAN_PHP_OBJS)
- 	rm -f $@
--	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_PHP_OBJS) $(RUBY_LIBS)
-+	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_PHP_OBJS) $(RUBY_LIBS)
-diff -Naur gonzui-1.2.orig/langscan/python/Makefile.am gonzui-1.2/langscan/python/Makefile.am
---- gonzui-1.2.orig/langscan/python/Makefile.am	2005-03-20 21:08:58.000000000 +0900
-+++ gonzui-1.2/langscan/python/Makefile.am	2011-01-14 18:01:57.318840641 +0900
-@@ -27,7 +27,7 @@
- 
- # We do this to workaround flex 2.5.4 issue because our .l
- # file could not be processed with flex 2.5.4.
--pythontok.c: pythontok.l
-+pythontok.c: pythontok.l python.h
- 	flex -d -opythontok.c pythontok.l || cp pythontok.c.dist pythontok.c
- 	cmp -s pythontok.c pythontok.c.dist || cp pythontok.c pythontok.c.dist
- 
-@@ -35,8 +35,8 @@
- 
- SUFFIXES = .c .o # for automake 1.4-p6
- .c.o:
--	$(RUBY_CC) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
-+	$(RUBY_CC) $(CFLAGS) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
- 
- $(LANGSCAN_PYTHON_DLLIB): $(LANGSCAN_PYTHON_OBJS)
- 	rm -f $@
--	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_PYTHON_OBJS) $(RUBY_LIBS)
-+	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_PYTHON_OBJS) $(RUBY_LIBS)
-diff -Naur gonzui-1.2.orig/langscan/sh/Makefile.am gonzui-1.2/langscan/sh/Makefile.am
---- gonzui-1.2.orig/langscan/sh/Makefile.am	2005-04-08 21:42:40.000000000 +0900
-+++ gonzui-1.2/langscan/sh/Makefile.am	2011-01-14 17:59:52.227568573 +0900
-@@ -27,7 +27,7 @@
- 
- # We do this to workaround flex 2.5.4 issue because our .l
- # file could not be processed with flex 2.5.4.
--shtok.c: shtok.l
-+shtok.c: shtok.l sh.h
- 	flex -d -oshtok.c shtok.l || cp shtok.c.dist shtok.c
- 	cmp -s shtok.c shtok.c.dist || cp shtok.c shtok.c.dist
- 
-@@ -35,8 +35,8 @@
- 
- SUFFIXES = .c .o # for automake 1.4-p6
- .c.o:
--	$(RUBY_CC) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
-+	$(RUBY_CC) $(CFLAGS) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
- 
- $(LANGSCAN_SH_DLLIB): $(LANGSCAN_SH_OBJS)
- 	rm -f $@
--	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_SH_OBJS) $(RUBY_LIBS)
-+	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_SH_OBJS) $(RUBY_LIBS)
diff --git a/app-text/gonzui/files/gonzui.initd b/app-text/gonzui/files/gonzui.initd
deleted file mode 100644
index fc141f7e8c5e..000000000000
--- a/app-text/gonzui/files/gonzui.initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gonzui/files/gonzui.initd,v 1.1 2011/01/15 01:55:39 matsuu Exp $
-
-GONZUI_SERVER="/usr/bin/gonzui-server"
-GONZUIRC="/etc/gonzuirc"
-GONZUI_PIDFILE="/var/run/gonzui.pid"
-
-depend() {
-	need net
-}
- 
-checkconfig() {
-	if [ ! -f "$GONZUIRC" ] ; then
-		eerror "Please create $GONZUIRC"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-	ebegin "Starting gonzui"
-	start-stop-daemon --start --quiet --pidfile "${GONZUI_PIDFILE}" \
-		--exec /usr/bin/ruby "${GONZUI_SERVER}" -- --daemon \
-		--gonzuirc="${GONZUIRC}" --quiet
-	eend $? "Failed to start gonzui"
-}
- 
-stop() {
-	ebegin "Stopping gonzui"
-	start-stop-daemon --signal INT --quiet --pidfile "${GONZUI_PIDFILE}"
-	eend $? "Failed to stop gonzui"
-}
diff --git a/app-text/gonzui/gonzui-1.2-r2.ebuild b/app-text/gonzui/gonzui-1.2-r2.ebuild
deleted file mode 100644
index aad95f22de23..000000000000
--- a/app-text/gonzui/gonzui-1.2-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gonzui/gonzui-1.2-r2.ebuild,v 1.1 2011/01/15 01:55:39 matsuu Exp $
-
-EAPI="2"
-#USE_RUBY="ruby18 ruby19 ree18"
-USE_RUBY="ruby18"
-inherit autotools eutils ruby-ng
-
-DESCRIPTION="source code search engine"
-HOMEPAGE="http://gonzui.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gonzui/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="bzip2 cvs gzip lha ocaml perl rpm subversion zip"
-
-RESTRICT="test"
-
-ruby_add_rdepend ">=dev-ruby/ruby-bdb-0.5.2 dev-ruby/ruby-progressbar"
-
-COMMON_DEPEND=">=sys-libs/db-4.2 ocaml? ( dev-lang/ocaml )"
-DEPEND="${DEPEND} ${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}
-	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 )"
-
-all_ruby_prepare() {
-	epatch "${FILESDIR}/${PF}-gentoo.patch"
-	cp "${FILESDIR}"/ebuild.rb "${S}"/langscan/ || die
-	eautoreconf
-}
-
-each_ruby_configure() {
-	econf || die
-}
-
-each_ruby_compile() {
-	emake || die
-}
-
-each_ruby_test() {
-	emake check || die
-}
-
-each_ruby_install() {
-	emake DESTDIR="${D}" install || die
-}
-
-all_ruby_install() {
-	mv "${D}"/etc/gonzuirc.sample "${D}"/etc/gonzuirc || die
-	newinitd "${FILESDIR}"/gonzui.initd gonzui || die
-	keepdir /var/{lib,log}/gonzui || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-pkg_postinst() {
-	elog "First, You need to import source codes into an index. For example, if"
-	elog "you want to import the source codes of wget-1.9.1.tar.gz, run the"
-	elog "following command."
-	elog
-	elog "# gonzui-import wget-1.9.1.tar.gz"
-	elog
-	elog "Then, you can run gonzui-server that works as a web-based search engine."
-	elog
-	elog "# gonzui-server"
-	elog
-	elog "Finally, you can access the search engine with your browser. The URL"
-	elog "is http://localhost:46984/."
-	elog
-	elog "The database (gonzui.db) format has become incompatible with"
-	elog "older versions."
-	elog "Please restructure the database if you already have it."
-}
diff --git a/app-text/gonzui/gonzui-1.2.ebuild b/app-text/gonzui/gonzui-1.2.ebuild
deleted file mode 100644
index 9faee817f7ed..000000000000
--- a/app-text/gonzui/gonzui-1.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gonzui/gonzui-1.2.ebuild,v 1.10 2010/08/06 17:25:50 flameeyes Exp $
-
-inherit eutils ruby
-
-USE_RUBY="ruby18"
-
-DESCRIPTION="source code search engine"
-HOMEPAGE="http://gonzui.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gonzui/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="ocaml"
-
-DEPEND="=dev-lang/ruby-1.8*
-	>=sys-libs/db-4.2
-	>=dev-ruby/ruby-bdb-0.5.2
-	dev-ruby/ruby-progressbar
-	ocaml? ( dev-lang/ocaml )"
-#	perl? ( dev-perl/PPI ) # g-cpan.pl PPI
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-parallel.patch
-	cp "${FILESDIR}"/ebuild.rb "${S}"/langscan
-	sed -i \
-		-e "s/rubylib_DATA = /rubylib_DATA = ebuild.rb /" \
-		"${S}"/langscan/Makefile.in || die
-}
-
-src_install() {
-	ruby_src_install
-	mv "${D}"/etc/gonzuirc.sample "${D}"/etc/gonzuirc
-	doinitd "${FILESDIR}"/gonzui || die
-	keepdir /var/lib/gonzui
-	keepdir /var/log/gonzui
-}
-
-pkg_postinst() {
-	elog "The database (gonzui.db) format has become incompatible with"
-	elog "older versions."
-	elog "Please restructure the database if you already have it."
-}
diff --git a/app-text/gonzui/metadata.xml b/app-text/gonzui/metadata.xml
deleted file mode 100644
index ebcb9e1e979b..000000000000
--- a/app-text/gonzui/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
-<use>
-  <flag name='lha'>Enable LHA archive support</flag>
-  <flag name='rpm'>Enable rpm support</flag>
-  <flag name='zip'>Enable ZIP archive support</flag>
-</use>
-</pkgmetadata>
-
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index 9c43003ac340..b89802707ecb 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -1,3 +1,4 @@
 DIST qpdfview-0.3.4.tar.gz 120255 SHA256 1b695becabf16e357097d255a0d1ba39fa490c49a19ab0741c51359946448add SHA512 72adadcf6c8078886c75e6ddcb5dd28196a081b232148253ceb0a3e684d7d4175f988f615dc1d5a1af6c8731ea7676bafbf2c4b17a1fd4308db53452914a8e2b WHIRLPOOL 35339de1a2afdd695c6ab07a3e077e02be23f96ae7910238e8469af67e3b359f083c0a62260666c45679a80b17945a09c19175cffe1bd56b0e55f644229075b9
 DIST qpdfview-0.3.7.tar.gz 385833 SHA256 6e1a91743ca429d7d354ca5ecb5f1af73e498f9ff490e07adba29f86fe92763d SHA512 c1fe0e1a0b6db890b71003f74027e66c9daae528c444453a7280fb669ab798cbf87fbc40c9e719f1b15ad2cc06edd921e34f9b4d37b2cfd05ce4e92f120d632a WHIRLPOOL ffde6fb0dd85fe4c41e0dd9b2b6f39e3f99f5384089802baaeb174e649e100e5cdbb2bc5ef6aabbc1f7fe3d5fabbec7d42bf5a68622e7f6af011768ecd231c04
+DIST qpdfview-0.4.2.tar.gz 341878 SHA256 ab5de31300394834c0540bde9c78ed481ea57832c72b478452cda25c787bb7a9 SHA512 5d1d6acd95a3bdf42aa4b63630fefe614951da222070e277759a65d562428380f7719702951921df85cdb64315a854c59512133877c990ecece998df20943ef9 WHIRLPOOL 05b9d28cd59ed904c50910f709d34670796d90f7a0354791d1d30f40ac4b016209fa3912bfd56947f332e2c4474a1fc9ccfcda7bd9c1bd2f6d90d817164e4de7
 DIST qpdfview-0.4.tar.gz 396479 SHA256 6191e6ae15f228bce9ac0c58dd5032122fa2986d50f7585859cd64a7fd2b5499 SHA512 da25a10e6e76a6334d403b65b066fc5749fc8430761d90979efe091557097375216b823fe2e6703cc59abd5ae397d9e86b6ccb5a24aaa860cca661d5de65f72d WHIRLPOOL 3bfe3531850e8b41d372ad344203494660f4782887f665837746ed4b03dab647643a053b01b72ce6558800ef19fb36363bc7a7b1f54a4a920dc77b5d4edf1263
diff --git a/app-text/qpdfview/qpdfview-0.4.2.ebuild b/app-text/qpdfview/qpdfview-0.4.2.ebuild
new file mode 100644
index 000000000000..68e677bc28ee
--- /dev/null
+++ b/app-text/qpdfview/qpdfview-0.4.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.2.ebuild,v 1.1 2013/04/23 11:18:08 pinkbyte Exp $
+
+EAPI=5
+
+PLOCALES="ast az bg bs ca cs da de el en_GB eo es eu fi fr he hr id it ky ms my pl pt_BR ro ru sk tr ug uk zh_CN"
+inherit l10n multilib qt4-r2
+
+DESCRIPTION="A tabbed document viewer"
+HOMEPAGE="http://launchpad.net/qpdfview"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cups dbus djvu +pdf postscript sqlite +svg synctex"
+
+RDEPEND="app-text/poppler[qt4]
+	dev-qt/qtcore:4[iconv]
+	dev-qt/qtgui:4
+	cups? ( net-print/cups )
+	dbus? ( dev-qt/qtdbus:4 )
+	djvu? ( app-text/djvu )
+	postscript? ( app-text/libspectre )
+	sqlite? ( dev-qt/qtsql:4[sqlite] )
+	svg? ( dev-qt/qtsvg:4 )
+	!svg? ( virtual/freedesktop-icon-theme )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( CHANGES CONTRIBUTORS README TODO )
+
+rm_loc() {
+	sed -e "/translations\/${PN}_${1}.ts/d" \
+		-i ${PN}.pro || die "sed translations failed"
+	rm translations/${PN}_${1}.ts || die "rm translations failed"
+}
+
+src_prepare() {
+	l10n_find_plocales_changes "translations" "${PN}_" '.ts'
+	l10n_for_each_disabled_locale_do rm_loc
+
+	qt4-r2_src_prepare
+}
+
+src_configure() {
+	local config i
+
+	for i in cups dbus pdf djvu svg synctex ; do
+		if ! use ${i} ; then
+			config+=" without_${i}"
+		fi
+	done
+
+	if ! use sqlite ; then
+		config+=" without_sql"
+	fi
+
+	if ! use postscript ; then
+		config+=" without_ps"
+	fi
+
+	eqmake4 CONFIG+="${config}" PLUGIN_INSTALL_PATH="/usr/$(get_libdir)/${PN}"
+}
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index a38e6b5f4455..a5ec17299f16 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,2 +1,3 @@
 DIST glibmm-2.32.1.tar.xz 5208592 SHA256 d6ed4d38e8739813941a0f0fec471c00ea93c5ed46179543340821c7ca798a2f SHA512 a8ce281de374defbe75ac5f84e2c6b4facb2ae571d686c103c92dc51253111c600c64bcec54ea28f6aeeb3490172cbae97fa9283af9fab55f7f763ee13467104 WHIRLPOOL e79c0b521f190f8c43ed73f91f36eba27770c7fa0372d7060abc0fe1e4dafd5084b56a8ad001576b3a04d1795f69487c9e217b5e3e09d328d80b0707377fab01
 DIST glibmm-2.34.1.tar.xz 5670736 SHA256 b425a52c7e178aeaaaffd02c5497bfd68d0cb8be56cef3620558a80dd5d692c4 SHA512 c1cdba5b39172a49ff51d3cb7173cffd22822028c3ee10dca60e2bd3f09ea87d971018e47de78a763ad2ffca53bdb86a69ab156f9de30d66995698fb74f75f99 WHIRLPOOL 3397eae8bd658112fe918d7c1feec1a35e639d4fc12f580628b2f6088a8b85e0db6e9b9017f551e5b9407ec7f11372d9d5da205745b9acafb407d6ce6adbcd0d
+DIST glibmm-2.36.0.tar.xz 2312740 SHA256 59c54996cccc527f3a257964e7226151175c423f6fb22166e81d65a652f483f3 SHA512 f9e05e0851d2a9b522f97fa60f912009eb55ee42f1d7a115261ce921dcb23fb260753f3216fc55f1a0989ad6a732bc4a7106f3ec589d098d5a1a51bd695b130f WHIRLPOOL 01dbd94ad7c1298d9e21b4077c100042ae1f1039a4e5d2863b81c5eaba2a7499395485feb4baf5a5281a46be2554563b1dc6f4153aaa606b6a8cb9af9411c254
diff --git a/dev-cpp/glibmm/glibmm-2.36.0.ebuild b/dev-cpp/glibmm/glibmm-2.36.0.ebuild
new file mode 100644
index 000000000000..db9cf7a64f6e
--- /dev/null
+++ b/dev-cpp/glibmm/glibmm-2.36.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.36.0.ebuild,v 1.1 2013/04/23 19:20:03 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="C++ interface for glib2"
+HOMEPAGE="http://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc debug examples test"
+
+RDEPEND="
+	>=dev-libs/libsigc++-2.2.10:2
+	>=dev-libs/glib-2.36.1:2
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+# dev-cpp/mm-common needed for eautoreconf
+
+src_prepare() {
+	if ! use test; then
+		# don't waste time building tests
+		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
+			-i Makefile.am Makefile.in || die "sed 1 failed"
+	fi
+
+	if ! use examples; then
+		# don't waste time building examples
+		sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
+			-i Makefile.am Makefile.in || die "sed 2 failed"
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable debug debug-refcounting) \
+		$(use_enable doc documentation) \
+		--enable-deprecated-api
+}
+
+src_test() {
+	cd "${S}/tests/"
+	default
+
+	for i in */test; do
+		${i} || die "Running tests failed at ${i}"
+	done
+}
+
+src_install() {
+	gnome2_src_install
+
+	if ! use doc && ! use examples; then
+		rm -fr "${ED}usr/share/doc/glibmm*"
+	fi
+
+	if use examples; then
+		find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
+		dodoc -r examples
+	fi
+}
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index f91a05c9715e..d76e63129fea 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,6 +1,5 @@
 DIST gtkmm-2.24.2.tar.xz 10776640 SHA256 c90c7a29c20dd6d795925bd66ad1ff40be07cea0e4c03f4d6105a8c07448953d SHA512 9f48138641815a40f9c22f6b8785cbcd9e92473c405577dcc6ae29559835d51a17d87fd75518d8043eeec8ce0f643aeb8cfcd68a6df382d0b392da33f6c6f8b7 WHIRLPOOL 2c0408f4b3f5f6296e23a8782a386b80dd70fcb1247309f700bd03c0468c1f9226b501793c4dbc13ba8304be5429d38c4dc4dd8b64cbfcc290f5c23bf3d814e7
 DIST gtkmm-2.24.3.tar.xz 10475704 SHA256 c564a438677174b97d69dd70467cb03c933481006398dc9377417aa6abe02a39 SHA512 7b4686f4ebc0aefa459d557799521381f6f9008e268b7ac433be5d0c155c7ca4650ea527bd54d0ce70eb61c51f1a990cb8c63d30d5417b7c6e5549baf1500206 WHIRLPOOL e8eb3d35975b19a5c51cef33d27e2f9537dddf0a1e2beab01d91e0e4092ef8be8f63da489e5e8ba76e74735225a44fea967065fe676508675c7b6c5c1fb56735
-DIST gtkmm-3.4.0.tar.xz 9188956 SHA256 42ea4e9acdd37fc3fe7026f8249a5427927b51048adff827bc1312900d6b12e9 SHA512 f98264fe9b4bcd7d926f52408f4a51d7d3191668e95fb9f49c29f88f9a63ef5330ee4d14d021eb4351f3a69646019d9c0963e7065140c5b776e0a7abf9ac62d1 WHIRLPOOL 04ac7aa36198ef4a71b64bd1d750559c499c7970e2e1012a8bb05f7bff6e95f961fa44322904b31af5f17519319a4bf83f1ca302445b9c1cbd3026d73c1ee851
 DIST gtkmm-3.4.2.tar.xz 10304460 SHA256 760c01bca693d26558eb5eae0cf6c743a6bb453258a633f78de506e3c98262b4 SHA512 b5eeb41c9193a14a968794c0a92c685df45f727f1af6744734d9e30e3a3d0220da9dad6eaf60318024d45aca7eb4d6398ddce1c14b6987310a7838e7d030bda1 WHIRLPOOL ad21ca94022c403ff67c59212002d7346dcb47cc08784b0016be49b286e7ccbf3add84d569850717aa1c66509a04a753fe231b577aaa7801b24717f4fb29d74c
 DIST gtkmm-3.6.0.tar.xz 10111820 SHA256 888154d5c8acec083aa15e8dab68d977a393ade7257f0630becfa9a223fa2359 SHA512 a8549be07d48bde75d1ac87210236dcfdfb97b6ef783396aedac0c4c731a4b6fce8d599eb9f3617c381356751d717e63154fb0ec618c51fa7190a7c3509d3cb7 WHIRLPOOL 308a21a0b8e5a7c0ba98ce79afa257358501443cf872fba8f78ad8b4fc2a5f3cced1e604716d6b1854e0efc7fcd5cb1a3d4b90262c25e728221c8c8d37e01adb
-DIST gtkmm-3.7.12.tar.xz 4289332 SHA256 e9a6bf2feac43fd8367e38e4b585cd5790745a6330014cf13c2d3e322a8dd916 SHA512 e5cd1e280da9fecfa96c47c0c026256b60b072ea3071a274af3535f92945f1e12b1f9df341eabfbb1092dfc3f25c499e1ffaaa48286424aa18cf368655e0af30 WHIRLPOOL 4f9a5bf086a3838e274a3de4280ff38461c234d732f4266b8126081c20599f16788f5455a747e08a8d1b42a839eb8764d031bd9b465ff3d1bd22a63d82ca2d2b
+DIST gtkmm-3.8.0.tar.xz 4311736 SHA256 dbddb143fe671ee321d19de2dbae00c0f67e78ce90447227b23062137b1828bd SHA512 3608de6674fb29a4a1de0600c5de392d84b4d24860aba27b7f6496810f70defa0737b49aebdeeefd47642b22a94212c2d423645ea7ca76a882a036e50214ddfd WHIRLPOOL ee4fbd23cb6219a03056de7cb0891c6e75b7458c8c7987e09f2f33b65cb57fc6a156078f790c51c650c171c78e5a1458baca2d71f15e26b6271436bcb8265874
diff --git a/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild b/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild
deleted file mode 100644
index ce26d09c0201..000000000000
--- a/dev-cpp/gtkmm/gtkmm-3.4.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/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild,v 1.11 2012/12/09 22:23:58 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="C++ interface for GTK+"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="3.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="aqua doc examples test wayland +X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.32.0:2
-	>=x11-libs/gtk+-3.4.0:3[aqua?,wayland?,X?]
-	>=x11-libs/gdk-pixbuf-2.22.1:2
-	>=dev-cpp/atkmm-2.22.2
-	>=dev-cpp/cairomm-1.9.2.2
-	>=dev-cpp/pangomm-2.27.1:1.4
-	dev-libs/libsigc++:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		media-gfx/graphviz
-		dev-libs/libxslt
-		app-doc/doxygen )
-
-	dev-cpp/mm-common"
-# eautoreconf needs mm-common
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog PORTING NEWS README"
-	targets=
-	use X && targets="x11"
-	use aqua && targets="${targets},quartz"
-	use wayland && targets="${targets},wayland"
-	G2CONF="${G2CONF}
-		--enable-api-atkmm
-		--with-gdk-targets=${targets/#,/}
-		$(use_enable doc documentation)"
-}
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 1 failed"
-	fi
-
-	if ! use examples; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 2 failed"
-	fi
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=673963
-	epatch "${FILESDIR}/${PN}-3.4.0-automagic-gdk-targets.patch"
-
-	eautoreconf
-	gnome2_src_prepare
-}
diff --git a/dev-cpp/gtkmm/gtkmm-3.7.12.ebuild b/dev-cpp/gtkmm/gtkmm-3.8.0.ebuild
similarity index 88%
rename from dev-cpp/gtkmm/gtkmm-3.7.12.ebuild
rename to dev-cpp/gtkmm/gtkmm-3.8.0.ebuild
index 788da1915159..af48215f17db 100644
--- a/dev-cpp/gtkmm/gtkmm-3.7.12.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.7.12.ebuild,v 1.2 2013/04/07 10:53:22 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.8.0.ebuild,v 1.1 2013/04/23 19:26:36 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -17,8 +17,8 @@ IUSE="aqua doc examples test wayland +X"
 REQUIRED_USE="|| ( aqua wayland X )"
 
 RDEPEND="
-	>=dev-cpp/glibmm-2.34:2
-	>=x11-libs/gtk+-3.7.10:3[aqua?,wayland?,X?]
+	>=dev-cpp/glibmm-2.36.0:2
+	>=x11-libs/gtk+-3.8.0:3[aqua?,wayland?,X?]
 	>=x11-libs/gdk-pixbuf-2.22.1:2
 	>=dev-cpp/atkmm-2.22.2
 	>=dev-cpp/cairomm-1.9.2.2
diff --git a/dev-embedded/lpc21isp/Manifest b/dev-embedded/lpc21isp/Manifest
new file mode 100644
index 000000000000..7308bd072b0c
--- /dev/null
+++ b/dev-embedded/lpc21isp/Manifest
@@ -0,0 +1 @@
+DIST lpc21isp_185.tar.gz 54735 SHA256 b85f10265fa83cdaab5b975e7bd53bb47289f1207b45e99cd753ea7a75fb7088 SHA512 585c8f02771fc68719c8a5e6cc4253854dce4f4e0047df8a1d57db273cb51c9d4fcbe1066b079aaec54d7ca189e90710647b95fdb320729753967c265b1ac954 WHIRLPOOL 2fe84d48d355b64939e291f0557f6d8023df5b1a1c8f4152659eb25a9341b809cddcd1d9ff97fa52d6f459ddd4b80972b894421495d8a9705b7bec211c55375a
diff --git a/dev-embedded/lpc21isp/lpc21isp-1.85.ebuild b/dev-embedded/lpc21isp/lpc21isp-1.85.ebuild
new file mode 100644
index 000000000000..8b67865291b4
--- /dev/null
+++ b/dev-embedded/lpc21isp/lpc21isp-1.85.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/lpc21isp/lpc21isp-1.85.ebuild,v 1.1 2013/04/23 19:53:22 slis Exp $
+
+EAPI=5
+
+inherit versionator
+
+MY_PN="${PN}_$(delete_all_version_separators)"
+
+DESCRIPTION="In-circuit programming (ISP) tool for the NXP microcontrollers"
+HOMEPAGE="http://sourceforge.net/projects/lpc21isp/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S=${WORKDIR}
+
+src_install() {
+	dobin lpc21isp
+}
diff --git a/dev-embedded/lpc21isp/metadata.xml b/dev-embedded/lpc21isp/metadata.xml
new file mode 100644
index 000000000000..4c8f6a8e35bb
--- /dev/null
+++ b/dev-embedded/lpc21isp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>slis@gentoo.org</email>
+	</maintainer>
+	<longdescription>In-circuit programming (ISP) tool for the NXP (Philips) LPC1100 / LPC1300 / LPC1700 / LPC2000 series ARM7 / Cortex-M0 / Cortex-M3 microcontrollers</longdescription>
+</pkgmetadata>
diff --git a/dev-embedded/openocd/openocd-0.6.1.ebuild b/dev-embedded/openocd/openocd-0.6.1.ebuild
index 50fa3f2565ab..b00340dd9176 100644
--- a/dev-embedded/openocd/openocd-0.6.1.ebuild
+++ b/dev-embedded/openocd/openocd-0.6.1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.6.1.ebuild,v 1.1 2012/11/09 20:28:21 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.6.1.ebuild,v 1.2 2013/04/23 03:16:09 vapier Exp $
 
 EAPI="4"
 
-inherit eutils multilib
+inherit eutils multilib flag-o-matic toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-2
 	KEYWORDS=""
 	EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${P/_/-}.tar.bz2"
+	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
 fi
 
 DESCRIPTION="OpenOCD - Open On-Chip Debugger"
@@ -32,33 +32,58 @@ RDEPEND="${DEPEND}"
 
 REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )"
 
-S="${WORKDIR}"/${P/_/-}
-
 src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
 		sed -i -e "/@include version.texi/d" doc/${PN}.texi || die
 		AT_NO_RECURSIVE=yes eautoreconf
 	fi
+
+	# Disable craptastic build settings.
+	sed -i \
+		-e 's:if test "[$]OCDxprefix" != "[$]ac_default_prefix":if false:' \
+		configure || die
+
+	if use ftdi ; then
+		local pc="libftdi$(has_version '=dev-embedded/libftdi-1*' && echo 1)"
+		# Use libftdi-1 paths #460916
+		local libs=$($(tc-getPKG_CONFIG) --libs ${pc})
+		sed -i \
+			-e "s:-lftdi -lusb:${libs}:" \
+			configure src/Makefile.in || die
+		append-cppflags $($(tc-getPKG_CONFIG) --cflags ${pc})
+	fi
 }
 
 src_configure() {
 	# Here are some defaults
-	myconf="--enable-buspirate --enable-ioutil --disable-werror
-	--disable-internal-jimtcl --enable-amtjtagaccel
-	--enable-ep93xx --enable-at91rm9200 --enable-gw16012
-	--enable-oocd_trace"
+	local myconf=(
+		--enable-buspirate
+		--enable-ioutil
+		--disable-werror
+		--disable-internal-jimtcl
+		--enable-amtjtagaccel
+		--enable-ep93xx
+		--enable-at91rm9200
+		--enable-gw16012
+		--enable-oocd_trace
+	)
 
 	if use usb; then
-		myconf="${myconf} --enable-usbprog --enable-jlink --enable-rlink \
-			--enable-vsllink --enable-arm-jtag-ew"
+		myconf+=(
+			--enable-usbprog
+			--enable-jlink
+			--enable-rlink
+			--enable-vsllink
+			--enable-arm-jtag-ew
+		)
 	fi
 
 	# add explicitely the path to libftd2xx
-	use ftd2xx && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)"
+	use ftd2xx && append-ldflags -L/opt/$(get_libdir)
 
 	if use blaster; then
-		use ftdi && myconf="${myconf} --enable-usb_blaster_libftdi"
-		use ftd2xx && myconf="${myconf} --enable-usb_blaster_ftd2xx"
+		use ftdi && myconf+=( --enable-usb_blaster_libftdi )
+		use ftd2xx && myconf+=( --enable-usb_blaster_ftd2xx )
 	fi
 	econf \
 		$(use_enable dummy) \
@@ -69,11 +94,10 @@ src_configure() {
 		$(use_enable presto presto_ftd2xx) \
 		$(use_enable segger jlink) \
 		$(use_enable versaloon vsllink) \
-		${myconf}
+		"${myconf[@]}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO || die
-	prepstrip "${D}"/usr/bin
+	default
+	env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir)
 }
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index 3995ddc73b08..e9820bbb5f1c 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.25 2012/08/29 17:51:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.26 2013/04/23 03:16:09 vapier Exp $
 
 EAPI="4"
 
-inherit eutils multilib
+inherit eutils multilib flag-o-matic toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-2
 	KEYWORDS=""
@@ -37,26 +37,53 @@ src_prepare() {
 		sed -i -e "/@include version.texi/d" doc/${PN}.texi || die
 		AT_NO_RECURSIVE=yes eautoreconf
 	fi
+
+	# Disable craptastic build settings.
+	sed -i \
+		-e 's:if test "[$]OCDxprefix" != "[$]ac_default_prefix":if false:' \
+		configure || die
+
+	if use ftdi ; then
+		local pc="libftdi$(has_version '=dev-embedded/libftdi-1*' && echo 1)"
+		# Use libftdi-1 paths #460916
+		local libs=$($(tc-getPKG_CONFIG) --libs ${pc})
+		sed -i \
+			-e "s:-lftdi -lusb:${libs}:" \
+			configure src/Makefile.in || die
+		append-cppflags $($(tc-getPKG_CONFIG) --cflags ${pc})
+	fi
 }
 
 src_configure() {
 	# Here are some defaults
-	myconf="--enable-buspirate --enable-ioutil --disable-werror
-	--disable-internal-jimtcl --enable-amtjtagaccel
-	--enable-ep93xx --enable-at91rm9200 --enable-gw16012
-	--enable-oocd_trace"
+	local myconf=(
+		--enable-buspirate
+		--enable-ioutil
+		--disable-werror
+		--disable-internal-jimtcl
+		--enable-amtjtagaccel
+		--enable-ep93xx
+		--enable-at91rm9200
+		--enable-gw16012
+		--enable-oocd_trace
+	)
 
 	if use usb; then
-		myconf="${myconf} --enable-usbprog --enable-jlink --enable-rlink \
-			--enable-vsllink --enable-arm-jtag-ew"
+		myconf+=(
+			--enable-usbprog
+			--enable-jlink
+			--enable-rlink
+			--enable-vsllink
+			--enable-arm-jtag-ew
+		)
 	fi
 
 	# add explicitely the path to libftd2xx
-	use ftd2xx && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)"
+	use ftd2xx && append-ldflags -L/opt/$(get_libdir)
 
 	if use blaster; then
-		use ftdi && myconf="${myconf} --enable-usb_blaster_libftdi"
-		use ftd2xx && myconf="${myconf} --enable-usb_blaster_ftd2xx"
+		use ftdi && myconf+=( --enable-usb_blaster_libftdi )
+		use ftd2xx && myconf+=( --enable-usb_blaster_ftd2xx )
 	fi
 	econf \
 		$(use_enable dummy) \
@@ -67,11 +94,10 @@ src_configure() {
 		$(use_enable presto presto_ftd2xx) \
 		$(use_enable segger jlink) \
 		$(use_enable versaloon vsllink) \
-		${myconf}
+		"${myconf[@]}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO || die
-	prepstrip "${D}"/usr/bin
+	default
+	env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir)
 }
diff --git a/dev-haskell/language-c/language-c-0.4.2.ebuild b/dev-haskell/language-c/language-c-0.4.2.ebuild
index d20126481712..8b5b9d9b4339 100644
--- a/dev-haskell/language-c/language-c-0.4.2.ebuild
+++ b/dev-haskell/language-c/language-c-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/language-c/language-c-0.4.2.ebuild,v 1.8 2013/04/19 07:05:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/language-c/language-c-0.4.2.ebuild,v 1.9 2013/04/23 08:21:47 ago Exp $
 
 # ebuild generated by hackport 0.2.17.9999
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="dev-haskell/syb[profile?]
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.21.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.21.ebuild
index bf5e6d5dd3a8..792d89083894 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.21.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.21.ebuild,v 1.1 2013/04/17 13:26:24 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.21.ebuild,v 1.2 2013/04/23 09:10:38 ago Exp $
 
 EAPI="5"
 
@@ -56,7 +56,7 @@ SRC_URI+=" jce? ( ${JCE_FILE} )"
 
 LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
 SLOT="1.7"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+X alsa derby doc examples +fontconfig jce nsplugin pax_kernel source"
 
 RESTRICT="fetch strip"
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.21.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.21.ebuild
index d1d9af289185..5355de9c0ca4 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.21.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.21.ebuild,v 1.1 2013/04/17 13:29:37 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.21.ebuild,v 1.2 2013/04/23 09:10:46 ago Exp $
 
 EAPI="5"
 
@@ -28,7 +28,7 @@ SRC_URI="
 
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="1.7"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="X alsa fontconfig jce nsplugin pax_kernel"
 
 RESTRICT="fetch strip"
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.45.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.45.ebuild
index 182346f5e7f1..af8591b53fcb 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.45.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.45.ebuild,v 1.1 2013/04/17 12:37:45 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.45.ebuild,v 1.3 2013/04/23 09:10:23 ago Exp $
 
 EAPI="5"
 
@@ -50,7 +50,7 @@ SRC_URI+=" jce? ( ${JCE_FILE} )"
 
 LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
 SLOT="1.6"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+X alsa derby doc examples jce kernel_SunOS nsplugin pax_kernel source"
 
 RESTRICT="fetch strip"
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.45.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.45.ebuild
index b1c6c804ee44..8b919abc3658 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.45.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.45.ebuild,v 1.1 2013/04/17 11:55:00 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.45.ebuild,v 1.3 2013/04/23 09:10:31 ago Exp $
 
 EAPI="5"
 
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="1.6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X alsa jce nsplugin pax_kernel"
 
 RESTRICT="fetch strip"
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index d0dede528774..1c249ca1281d 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -3,6 +3,6 @@ DIST mercury-extras-11.01.tar.gz 777185 SHA256 52eb6758e2136eb288329917d4c352da9
 DIST mercury-extras-11.07-gentoo-patchset-0.tar.gz 4886 SHA256 25452b2489ac260084735d738972c5d286c63e54ecd1a14cc26890f902714966 SHA512 dca2ae9ebae05f49ca79bd6fba510fdea25d94974d40835588174dac30667fffc5f982864888180434b7b35f6e545fbf3295caae2543f4f637a84e6ddf79a7c8 WHIRLPOOL 789fa90f8fcb75603290fb693335000f643cf6b3405242dc833e73baf53f82f5836f00c5fa4b92dfaeb076c36b853a02835e224c708d98e66012c8f8d332fa60
 DIST mercury-extras-11.07.1-gentoo-patchset-0.tar.gz 5114 SHA256 8236342a8e9fc36794401ccbe30c58d351fa6f3663cb5febbcb45742b978b49a SHA512 b9d0774466e68b9aa4b3e8a22347f8d41b8ea4cc0b328fcb794b158563dac448f46e5dc1638dae3d1345a71534debcf7bfcfe4a1597b235851bf77b58e7ed23c WHIRLPOOL de588622eefec04cce6d610defcba37bb95a2e0f7e0527d68c412c1d55529686fab3e801f2f81805ddb621d3ec2c1cbd9db16c5a736682a7ae142287f3054f00
 DIST mercury-extras-11.07.1.tar.gz 776828 SHA256 cda5891e6143f34ec0639f296c0080e252bc18e59c663143750945a033eaa54c SHA512 cfa7690f4399bff98c0b56705f6b85af7409a7770e3af8b3f7dbf622300b756b0878b9b1bf46bf3953d6318c6e9f8ba6c57b125d180619c1e98e92d225a7351f WHIRLPOOL 9eb64278188ab9cd0bf37ef32be639cb3c71b2aa24c4929dcd6f9b1f2045de4ee79045b8344716cc89ac1c2d174b852ee411a538c49f77e846ee0b0b970fe751
-DIST mercury-extras-11.07.2-gentoo-patchset-1.tar.gz 5125 SHA256 4ed30e91aed07239b87c64c840d574fc39794910e2dc21a944928fbc9975ed74 SHA512 1d283390b6ab01a80ceb4bc381cd773266488e0bedad5a58ac590a05f1f2f09898f7ba76c27abfb08a623a69fa2cb327753759cef0f4ae5dea21cb89bdf8b315 WHIRLPOOL 9fa9e3dcc1f0752b36361e54964f48cbc951127eefba11e6e7d1432067a7a436058f72edb5636e1976f006c8dca3a896f8dc55d21fb68b8f8b61410cccb33624
+DIST mercury-extras-11.07.2-gentoo-patchset-2.tar.gz 5149 SHA256 cffe00e9396e1294112af960b2f23c9cfa1bcd6b7b96a839ea1462d4f1a5df94 SHA512 5e8f0a69470ae45244e47b74cd71eb127446dcbb805e45a97759da672072670dfb22fe78f8a77c6dd5119371a9ee9e91d069b3f0b52614df15a5f3822e37c737 WHIRLPOOL 6b11ebe4e8866ae66fab637e13a159cb22e997e101ba32f5a7de2e6d2e567c3255cfa2269835674319fb2319ced775e7de606c77588c2a8d2d16a47a20521aee
 DIST mercury-extras-11.07.2.tar.gz 774067 SHA256 424cd1e642a49f4c463e20851ba185ce60186c7c46aed96c7f32f55e41ae482b SHA512 162358a22f020f61310c29aa61c480fee0a02aff2749a89956493bed43aafe89e92427578697eb1e8e43e73acde1d19f1b9bc85705ff448e5fa8cdaf92b749c5 WHIRLPOOL 24b7093a2ed72441aafd3a1ffa84c5b9458d5fddaedb1eb46dcb66e52cc21dc0dd5ded14067c0b0be040ae5de0a14ebf5341b5c87720390b5892a872f32e9d11
 DIST mercury-extras-11.07.tar.gz 776589 SHA256 25eaf999666ceb4217cfe0f9fbcb38b892c57fb36efaa16099a471287a7a9019 SHA512 ea2c3231cbb32dc91f36d1d09a5bdac65b468bff64f79aab46baa0e7e9460f75fa5239c96b5b2a616aebb499954b62d8ac7acea93fa971df1e7d81955ca0c5ea WHIRLPOOL 9617163e15b44bf373d5e9204dd8882c4921ed56a38ec41aabd7a81eda1aebedade70e7cfa0eeb21d46349e64fc9ed565cb1eb12dd49c98b8d5dfacdb49fd229
diff --git a/dev-lang/mercury-extras/mercury-extras-11.07.2.ebuild b/dev-lang/mercury-extras/mercury-extras-11.07.2.ebuild
index 9760e27b617f..57664596f58e 100644
--- a/dev-lang/mercury-extras/mercury-extras-11.07.2.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-11.07.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-11.07.2.ebuild,v 1.2 2013/04/22 11:53:09 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-11.07.2.ebuild,v 1.3 2013/04/23 09:18:27 keri Exp $
 
 EAPI=2
 
 inherit eutils multilib
 
-PATCHSET_VER="1"
+PATCHSET_VER="2"
 MY_P=${PN}-${PV}
 
 DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
diff --git a/dev-lang/v8/Manifest b/dev-lang/v8/Manifest
index f0d55b98cd9c..7b0f23a6e571 100644
--- a/dev-lang/v8/Manifest
+++ b/dev-lang/v8/Manifest
@@ -1,3 +1,4 @@
 DIST v8-3.16.14.9.tar.bz2 10461483 SHA256 a2a69c4915bf2e36d327b4b1edb3d398d4967da31eaa1ae0058b6b6615cd66aa SHA512 424b3d8285244acbb8872fddb90a1e269a35bc8f57c0dba66758d6a853cf75e90a52e4e2d7db4095fe798271c794ac4f99cc40a1dbb99eb1b43d3b5b1878da94 WHIRLPOOL fd7beb7fdb661aa2a04591e7a25fe1c5b39af9bfe9b6e1ab8ed1f4cb6238bb740f3c26d12202c972cdb5552fb02ea31c207304394c095a0839b90b368c436ffc
 DIST v8-3.17.15.3.tar.bz2 10516836 SHA256 bfca163e9e90d9aeaaebe89309245be2fcf697258c273e54c087406ea9dc3ed7 SHA512 8ab664b9801ac0d111cc0af6ada8bf42d458ea7fd951c40d1e7599991d813dc96957c07777ed2f2ad48c4fcf84955293de2e4e1138d4d3ec186e58bc0d2e4c73 WHIRLPOOL 6fca6906330a4e47fa155f7ac61531c5f0f156f7e8b74dafaec1ba8d44e1cc4f72ee77d6f32257c7d23edcc689853d80d5e782b6928e6989f3a08ffd908de009
 DIST v8-3.17.16.2.tar.bz2 10519702 SHA256 c0695dd9d36f6a8e0b5fb110baf8d174c76eb7f0d26acc00d4f42179e26c4058 SHA512 97da0af9cca0ca47340dba2d088506563d7b66688f60fbca9dd76b8fc294af0b9d99ab2930679959e5931305dd4ed657e7dc9e47a31f04c56267f3f6cb5938e8 WHIRLPOOL 985013f35bcb9e50f7b4dadc55ecaeadbacf05bfdc934c86bb584a1d108b2cdfc411041b978244ac119f1a81139668aeb0ac3146c68ce05b50e25af22eaa241e
+DIST v8-3.18.1.tar.bz2 10504056 SHA256 5b051b1475dca9e87017d1d92d29082a63631d939fcb3f6386364afce4d6bc52 SHA512 f2c670560b8e8161f4a0ea8b25d7b226e743245371f2c2e9d5a339f827560c618af7d5a5f73309020d87a01d8ccf9ae8fdf1808171a1de7cb57227e1f4f2a8aa WHIRLPOOL a797ab51ccec8cb9c948bc946f738417c9badd99aa4b6bc7e147ab11211ef9024004c20bee4e3ac7548772502023b71ecab1cddc71e8571a07248e3e76c534d3
diff --git a/dev-lang/v8/v8-3.18.1.ebuild b/dev-lang/v8/v8-3.18.1.ebuild
new file mode 100644
index 000000000000..114eeb4d4fea
--- /dev/null
+++ b/dev-lang/v8/v8-3.18.1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.18.1.ebuild,v 1.1 2013/04/23 00:23:55 phajdan.jr Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit chromium eutils multilib multiprocessing pax-utils python-any-r1 \
+	toolchain-funcs versionator
+
+DESCRIPTION="Google's open source JavaScript engine"
+HOMEPAGE="http://code.google.com/p/v8"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
+LICENSE="BSD"
+
+soname_version="${PV}"
+SLOT="0/${soname_version}"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x64-macos ~x86-macos"
+IUSE="neon readline"
+
+RDEPEND="readline? ( sys-libs/readline:0 )"
+DEPEND="${PYTHON_DEPS}
+	${RDEPEND}"
+
+src_configure() {
+	tc-export AR CC CXX RANLIB
+	export LINK=${CXX}
+
+	local myconf=""
+
+	# Always build v8 as a shared library with proper SONAME.
+	myconf+=" -Dcomponent=shared_library -Dsoname_version=${soname_version}"
+
+	# Use target arch detection logic from bug #354601.
+	case ${CHOST} in
+		i?86-*)
+			myarch="ia32"
+			myconf+=" -Dv8_target_arch=ia32" ;;
+		x86_64-*)
+			if [[ $ABI = x86 ]] ; then
+				myarch="ia32"
+				myconf+=" -Dv8_target_arch=ia32"
+			else
+				myarch="x64"
+				myconf+=" -Dv8_target_arch=x64"
+			fi ;;
+		arm*-*)
+			myarch="arm"
+			myconf+=" -Dv8_target_arch=arm -Darm_fpu="
+			if [[ ${CHOST} == *-hardfloat-* ]] ; then
+				myconf+=" -Dv8_use_arm_eabi_hardfloat=true"
+			else
+				myconf+=" -Dv8_use_arm_eabi_hardfloat=false"
+			fi
+			if [[ ${CHOST} == armv7*-* ]] ; then
+				myconf+=" -Darmv7=1"
+			else
+				myconf+=" -Darmv7=0"
+			fi
+			myconf+=" $(gyp_use neon arm_neon)" ;;
+		*) die "Unrecognized CHOST: ${CHOST}"
+	esac
+
+	myconf+=" $(gyp_use readline console readline dumb)"
+
+	# 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="
+
+	EGYP_CHROMIUM_COMMAND=build/gyp_v8 egyp_chromium ${myconf} || die
+}
+
+src_compile() {
+	local makeargs=(
+		-C out
+		builddir="${S}/out/Release"
+		V=1
+		BUILDTYPE=Release
+	)
+
+	# Build mksnapshot so we can pax-mark it.
+	emake "${makeargs[@]}" mksnapshot.${myarch}
+	pax-mark m out/Release/mksnapshot
+
+	# Build everything else.
+	emake "${makeargs[@]}"
+	pax-mark m out/Release/{cctest,d8}
+}
+
+src_test() {
+	LD_LIBRARY_PATH=out/Release/lib.target tools/run-tests.py \
+		-j$(makeopts_jobs) \
+		--no-presubmit \
+		--outdir=out \
+		--buildbot \
+		--arch=native \
+		--mode=Release \
+		--progress=dots || die
+}
+
+src_install() {
+	insinto /usr
+	doins -r include
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# buildsystem is too horrific to get this built correctly
+		mkdir -p out/Release/lib.target || die
+		mv out/Release/libv8.so.${soname_version} \
+			out/Release/lib.target/libv8$(get_libname ${soname_version}) || die
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
+			out/Release/lib.target/libv8$(get_libname ${soname_version}) \
+			|| die
+		install_name_tool \
+			-change \
+			/usr/local/lib/libv8.so.${soname_version} \
+			"${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
+			out/Release/d8 || die
+	fi
+
+	dobin out/Release/d8
+	pax-mark m "${ED}usr/bin/d8"
+
+	dolib out/Release/lib.target/libv8$(get_libname ${soname_version})
+	dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname)
+
+	dodoc AUTHORS ChangeLog || die
+}
+
+# TODO: remove functions below after they are removed from chromium.eclass'
+# EXPORT_FUNCTIONS .
+
+pkg_preinst() {
+	return
+}
+
+pkg_postinst() {
+	return
+}
+
+pkg_postrm() {
+	return
+}
diff --git a/dev-lang/v8/v8-9999.ebuild b/dev-lang/v8/v8-9999.ebuild
index 1aaae02d2d86..5da17c993e9d 100644
--- a/dev-lang/v8/v8-9999.ebuild
+++ b/dev-lang/v8/v8-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-9999.ebuild,v 1.43 2013/04/18 03:58:18 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-9999.ebuild,v 1.44 2013/04/23 00:23:55 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
@@ -41,14 +41,19 @@ src_configure() {
 
 	# Use target arch detection logic from bug #354601.
 	case ${CHOST} in
-		i?86-*) myconf+=" -Dv8_target_arch=ia32" ;;
+		i?86-*)
+			myarch="ia32"
+			myconf+=" -Dv8_target_arch=ia32" ;;
 		x86_64-*)
 			if [[ $ABI = x86 ]] ; then
+				myarch="ia32"
 				myconf+=" -Dv8_target_arch=ia32"
 			else
+				myarch="x64"
 				myconf+=" -Dv8_target_arch=x64"
 			fi ;;
 		arm*-*)
+			myarch="arm"
 			myconf+=" -Dv8_target_arch=arm -Darm_fpu="
 			if [[ ${CHOST} == *-hardfloat-* ]] ; then
 				myconf+=" -Dv8_use_arm_eabi_hardfloat=true"
@@ -83,7 +88,7 @@ src_compile() {
 	)
 
 	# Build mksnapshot so we can pax-mark it.
-	emake "${makeargs[@]}" mksnapshot
+	emake "${makeargs[@]}" mksnapshot.${myarch}
 	pax-mark m out/Release/mksnapshot
 
 	# Build everything else.
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index b0f30bfc2cd7..d408043e1ce5 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -3,5 +3,4 @@ DIST vala-0.12.1.tar.xz 2286024 SHA256 f102bb64549ebe88955bb9fa0f502d974413aec71
 DIST vala-0.14.2.tar.xz 2640560 SHA256 807e6978484f66cab3cf4fefd72f37a4293d2831d7a5fd29119bdf9d38a5b3d0 SHA512 e6cfe7b22a351d54980402f899fcb4aa3e81eef252d20da1b748c5845211cdb5e09c0976d69b1d3971cb817871db734cbfac6dffb969c8661c58ee77f515abe5 WHIRLPOOL b36b37fd5b5de1e1d9ad4cd5907d01f64a31a6b8d48f9bf4d59f097aa7e7038c8f04bbf50091e33bb114cf8186cbf7c55c6e99bf1e9a763ac2abbd4e21d8eeb7
 DIST vala-0.16.1.tar.xz 2636952 SHA256 8be28ff6347feecb391220ceb4e2209d32b697278e87ed7fc6c9fb1e9345e0d8 SHA512 caf4a58a72b146611e59c7a65f8b0fba9412002a3aa3039ef20f47b05a527da7d46f3eafa24ff6b8e8ac0ce48b72e6b038135106aad4519df8a88c26351c0987 WHIRLPOOL ce99be65e8749cc53c17bc25d5344e1572474d77c0118347759f7de960ec438a99421f040ba17e6b040fb5bd937e1b235f85401b05153db367f4cb6072f47a58
 DIST vala-0.18.1.tar.xz 2584924 SHA256 7f5e2e8ca03f9fa2cf13acaf93bfdc3a7ad0a10b000a337ba9c6bdc021bdca32 SHA512 e4459738b916d6b70c633844db3e0b0fed0f186d3f44cd3e4cac3c486a7d8b7a4bb0f58620b8b0c367f61bf6358a6b511edf924533eb8bb2ee49ac36069ee4db WHIRLPOOL 5d2907f175e3460def1f271be4db099d0d8d92e34739f893210302af7cc059cbcfb58d735b1fceaea2e905cda107d0a627b9071df285b768a5d7c9c7334a020e
-DIST vala-0.20.0.tar.xz 2626728 SHA256 2c464ff5b567861b3116602891ff83439e570ce42d7c9b3b76e36adc17f2848c SHA512 4b107b7fb962d1f31cd797f7b6c44162c43876d85e318aa99dae9ca772f0ac2ceabd1b071c96d2e45ceb383b00e0b917ea3eb45b98e98a6e8d7b3b1a7c29edaa WHIRLPOOL 4afd140f625896f248d17f5f8b19c5f68106ec22eed66e75dce01b2536d566ac3feb50a4466cb3b764a3063e6bfc50e9eee347544cbfa3cb7073d601a1c85015
 DIST vala-0.20.1.tar.xz 2627808 SHA256 9cb7ecd18a23525e401c204d4d08341c7d911cd5d78078eee10b747ecb45e481 SHA512 6246228815bcc042de0aeea3f4593c95b0d81fdfec8a4336a8e9178dd8a4a7013694a2cec543c3c49aad026d5d3597e194884b6cfecb10040db886afba9e72e1 WHIRLPOOL 91a7017c1801ebe29f5f9704b98e9bc65d26bb66122ef25f684da43dee116a2da5c9d7a91a1f73c5a7a580c9c8e5515f024a2b8ad615ae367faf37bef022f905
diff --git a/dev-lang/vala/vala-0.20.0.ebuild b/dev-lang/vala/vala-0.20.0.ebuild
deleted file mode 100644
index e89b4d162896..000000000000
--- a/dev-lang/vala/vala-0.20.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.20.0.ebuild,v 1.3 2013/03/30 22:32:13 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Vala - Compiler for the GObject type system"
-HOMEPAGE="http://live.gnome.org/Vala"
-
-LICENSE="LGPL-2.1"
-SLOT="0.20"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="test +vapigen"
-
-RDEPEND=">=dev-libs/glib-2.18:2
-	>=dev-libs/vala-common-${PV}"
-DEPEND="${RDEPEND}
-	!${CATEGORY}/${PN}:0
-	dev-libs/libxslt
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc
-	test? (
-		dev-libs/dbus-glib
-		>=dev-libs/glib-2.26:2 )"
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-	gnome2_src_configure \
-		--disable-unversioned \
-		$(use_enable vapigen)
-}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index ea463a7ce5b8..8d99ff0e4d72 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,9 +1,8 @@
 DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731 SHA512 e65c7f66254eae22deaa67bf621ebd1d7af897b93d93ba6cffaa4ce9894cf14c140e6888d877b6b36fcea8be1b8d1ef4fcc7ec1719bd23b1cc6fd662876c70ae WHIRLPOOL 20254678a86595353058ee8dc81a02e4ae7bb16ba9ba34e036fe2e99d3fffa25c825f8961bdeb5fa50c49582ce37e65684e414631c74653c4523c2baee34c341
 DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f SHA512 4452b741382194d4ca425f084fa60e1a9e30040ac2e839c9136047d0461cf4b1ebcc16aac4e65998d1b9329ead8f617966b3d09317a83634f14d556a7e14b7a8 WHIRLPOOL 478957ce8e49228d022bae50b042cdfc6d522d0d4880a0328b5695471295450c81c5e186e1760e56e317a4c4c95aabc5f2010d7a9b912fc451d04e14610e7dca
-DIST glib-2.30.3.tar.xz 5642448 SHA256 e6cbb27c71c445993346e785e8609cc75cea2941e32312e544872feba572dd27 SHA512 9f212b2c94c8c76ed619a1a97515ffc4c71dd39a982852cc9db600ca3034be1fb646d657dd39831f2fe80a81972400b977ea59fa81923dfe646158c9f1ab8843 WHIRLPOOL 145e20955b0ce2b44e05833bd508ac03a0399fc4d4c1c551c6a05809e6922cd57c37c5b32ebbe80f7ba0a21660059d7cb4837fa233de37af6c12cd0bc3a7afeb
 DIST glib-2.32.4-AS_IF-patches.tar.xz 8584 SHA256 c61a87bbed8b09148f70f2651696430ab262d8ee905ebe2e0e963bb9038c5545 SHA512 cea825c379ea9014014f8a6f3a9fcf228e6b4245c649df4d86f6d86d1d655fd927ef1115fd66521cc48b2929d8cd504a284c7a8fb5ff38dc2b83ac4140655049 WHIRLPOOL e778094ad8ebe6fdc236942c21ee8ce2266712a08672b521f931159dd81d3452fcb8b6556c98c82b60548b1d9703a3ff332d02970a01565b6f5c4bcd02e74b46
 DIST glib-2.32.4.tar.xz 6178556 SHA256 a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2 SHA512 bc8b2d6afae7635f940065eca3e854ee171812c7b582d55313db11d28875495dbf41fc0a260347b30f7490daa65ccc377d8a2d60bb3a26d07997606d8e3d989f WHIRLPOOL 35aec94088acff460685c0b1bb2e6fcffadb0f9f0044b93f3fa042ed82dd52efb5e56022575c0ebcfda4230d38edc26a916623f0bfcbfc8e1c6b76a3133d43bc
-DIST glib-2.34.2.tar.xz 6367740 SHA256 2d99a8309cdd0c584bd5386a49265fb19ac64575fe108fd901d6f26c8d73c708 SHA512 986a064968bd6681e8166704c7caa8e467a99ba24b035874fbd21e1374a56f24fc78325ab5776e60ffe6f5555e9104fcc89ddf2e3d3c9ec31906cbaaf1f7a827 WHIRLPOOL 81556274b0ab62ba1bc4846f857566971f3fca305ab75ca4163a5071505d7223d24743c629cc53383ffb329ba401721abcb7ade57d42bf9c2ef4debb23b16660
 DIST glib-2.34.3.tar.xz 6334872 SHA256 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7 SHA512 2382e09159da2ef47384a3e52622f139577af69d6aba86ea1636f2b6b23b9f6bf89967f29394fd7f93d0528e2c58ae015864aa58a3e3e4f504c7a268b2ef4a75 WHIRLPOOL 296f29666bdd38faae41a1b0b7875dd5fb6ac23d5d27282658e73bbb614db944b3a92d5334ddcca19f959e4c5ef2bf20a5b0f19390558645f986afc2f84edd4d
 DIST glib-2.36.0.tar.xz 6508276 SHA256 455a8abe8692c5174bcc7ffa15b96a7521a2f2f9fb47594405927c35cb9bb227 SHA512 86402c22b3df419112aab82bfe2c2a598992c6eadf941375b6f4f1840f9004491fafcbd95dc372262cddb29064abba54c640b1dbf281ff75c0ea209683876530 WHIRLPOOL 9db755e0a6070a63b78ebc71b6c54279faeffec57f9392c329fdbd105bfe5f74caff134c0aef7c93a542eed71e0465f7c1a42c4277ad7a8d42cf837fdc1f434c
+DIST glib-2.36.1.tar.xz 6524408 SHA256 7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24 SHA512 e738ef537fc8b05f535a42a46c3e5cf8d7c9c3aed788adea1bfd924e6031e6f3e8366850a3a1a0ea2c2a4c5e54f08eacf6cccbf32fb8a361b62a6caf9c4b7852 WHIRLPOOL 05298f71ff63b458ddc7e67c7ce0ab800109068c6bb2b0bff5ccfd76d8ed29cb5568d8a2953b71947bb0385033c3564467f9adfa377fc65c27eb765f71f71ef3
 DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4 WHIRLPOOL f535946a02192a9bffc7be0fae454e25aa86af8bac7f47622d52ed13f77f1ba05ff9b5693b2a501981e3991e4e1595eced22dee4ab748b310baa7d57267a62a7
diff --git a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch b/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch
deleted file mode 100644
index 0859e3310a17..000000000000
--- a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From Debian, this one is needed for gcc < 4.1...
-
---- glib-2.10.0/glib/gatomic.c	2006-02-24 14:02:51.000000000 +0000
-+++ glib-2.10.0/glib/gatomic.c	2006-03-06 18:12:06.000000000 +0000
-@@ -414,14 +414,14 @@
- g_atomic_int_exchange_and_add (volatile gint *atomic,
- 			       gint           val)
- {
--  return __sync_fetch_and_add (atomic, val);
-+  return __sync_fetch_and_add_si (atomic, val);
- }
-  
- void
- g_atomic_int_add (volatile gint *atomic, 
- 		  gint val)
- {
--  __sync_fetch_and_add (atomic, val);
-+  __sync_fetch_and_add_si (atomic, val);
- }
- 
- gboolean
-@@ -429,7 +429,7 @@
- 				   gint           oldval, 
- 				   gint           newval)
- {
--  return __sync_bool_compare_and_swap (atomic, oldval, newval);
-+  return __sync_bool_compare_and_swap_si (atomic, oldval, newval);
- }
- 
- gboolean
-@@ -437,7 +437,7 @@
- 				       gpointer           oldval, 
- 				       gpointer           newval)
- {
--  return __sync_bool_compare_and_swap ((long *)atomic, 
-+  return __sync_bool_compare_and_swap_di ((long *)atomic, 
- 				       (long)oldval, (long)newval);
- }
- 
diff --git a/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch b/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch
deleted file mode 100644
index cabe56f567d0..000000000000
--- a/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Temporary workaround for gio tests failure when ran without FEATURES=userpriv
-until upstream bug #552912 is fixed
-
---- gio/tests/live-g-file.c.orig	2008-09-25 05:44:12.848556034 +0300
-+++ gio/tests/live-g-file.c	2008-09-25 06:12:34.248726237 +0300
-@@ -769,11 +769,14 @@
- 	      if (posix_compat)
- 		{
- 		  /*  target directory is not accessible (no execute flag)  */
-+#if 0
-+/* Fails when ran as root */
- 		  do_copy_move (root, item, TEST_DIR_NO_ACCESS,
- 				TEST_NO_ACCESS);
- 		  /*  target directory is readonly  */
- 		  do_copy_move (root, item, TEST_DIR_NO_WRITE,
- 				TEST_NO_ACCESS);
-+#endif
- 		}
- 	    }
- 	}
diff --git a/dev-libs/glib/files/glib-2.30.1-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.30.1-external-gdbus-codegen.patch
deleted file mode 100644
index 916b291d2060..000000000000
--- a/dev-libs/glib/files/glib-2.30.1-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Use an external gdbus-codegen package
-
---- configure.ac
-+++ configure.ac
-@@ -367,7 +367,7 @@
- AC_SUBST(PERL_PATH)
- 
- # Need suitable python path for greport
--AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
- 
- 
- dnl ***********************
-@@ -3857,8 +3857,6 @@
- gthread/Makefile
- gthread/tests/Makefile
- gio/Makefile
--gio/gdbus-2.0/codegen/Makefile
--gio/gdbus-2.0/codegen/config.py
- gio/xdgmime/Makefile
- gio/inotify/Makefile
- gio/libasyncns/Makefile
---- docs/reference/gio/Makefile.am
-+++ docs/reference/gio/Makefile.am
-@@ -138,8 +138,7 @@
- 	gio-querymodules.1	\
- 	glib-compile-schemas.1	\
- 	gsettings.1		\
--	gdbus.1			\
--	gdbus-codegen.1
-+	gdbus.1
- 
- if ENABLE_MAN
- 
---- gio/Makefile.am
-+++ gio/Makefile.am
-@@ -2,7 +2,7 @@
- 
- NULL =
- 
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
- 
- if OS_UNIX
- SUBDIRS += libasyncns xdgmime
---- gio/tests/gdbus-object-manager-example/Makefile.am
-+++ gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -21,10 +21,8 @@
- 	gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml 	\
- 	$(NULL)
- 
--$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
--	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
--		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
-+	$(AM_V_GEN) gdbus-codegen \
- 		--interface-prefix org.gtk.GDBus.Example.ObjectManager. \
- 		--c-namespace Example \
- 		--c-generate-object-manager \
---- gio/tests/Makefile.am
-+++ gio/tests/Makefile.am
-@@ -266,10 +266,8 @@
- gdbus_close_pending_LDADD = $(progs_ldadd)
- 
- if OS_UNIX
--gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
--	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
--		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile
-+	$(AM_V_GEN) gdbus-codegen \
- 		--interface-prefix org.project. \
- 		--generate-c-code gdbus-test-codegen-generated \
- 		--c-generate-object-manager \
diff --git a/dev-libs/glib/files/glib-2.30.1-homedir-env.patch b/dev-libs/glib/files/glib-2.30.1-homedir-env.patch
deleted file mode 100644
index 30d44997c591..000000000000
--- a/dev-libs/glib/files/glib-2.30.1-homedir-env.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: Handle the G_HOME environment variable to override the passwd entry
- This will allow to fix various kinds of build failures due to restricted
- build environments.
-Author: Josselin Mouette <joss@debian.org>
-Origin: vendor
-
---- a/docs/reference/glib/running.sgml
-+++ b/docs/reference/glib/running.sgml
-@@ -213,6 +213,22 @@
-   </para>
- </formalpara>
- 
-+<formalpara id="G_HOME">
-+  <title><envar>G_HOME</envar></title>
-+
-+  <para>
-+    For various reasons, GLib applications ignore the <envar>HOME</envar>
-+    environment variable on Unix systems and will use the user directory
-+    as specified by the <filename>passwd</filename> entry, which is more
-+    reliable.
-+  </para>
-+  <para>
-+    The <envar>G_HOME</envar> environment variable will override any
-+    other setting for the home directory. It is not meant for daily usage,
-+    but it is useful in testing or building environments.
-+  </para>
-+</formalpara>
-+
- </refsect2>
- 
- <refsect2 id="setlocale">
---- a/glib/gutils.c
-+++ b/glib/gutils.c
-@@ -1626,11 +1626,14 @@
-     }
- #endif	/* !G_OS_WIN32 */
-   
-+  g_home_dir = g_strdup (g_getenv ("G_HOME"));
-+  
- #ifdef G_OS_WIN32
-   /* We check $HOME first for Win32, though it is a last resort for Unix
-    * where we prefer the results of getpwuid().
-    */
--  g_home_dir = g_strdup (g_getenv ("HOME"));
-+  if (!g_home_dir)
-+    g_home_dir = g_strdup (g_getenv ("HOME"));
- 
-   /* Only believe HOME if it is an absolute path and exists */
-   if (g_home_dir)
-@@ -1926,6 +1929,11 @@
-  *      homedir = g_get_home_dir (<!-- -->);
-  * ]|
-  *
-+ * However, to allow changing this value for testing and development
-+ * purposes, the value of the <envar>G_HOME</envar> environment 
-+ * variable, if set, will override the <filename>passwd</filename>
-+ * entry.
-+ *
-  * Returns: the current user's home directory
-  */
- G_CONST_RETURN gchar*
diff --git a/dev-libs/glib/files/glib-2.30.2-machine-id.patch b/dev-libs/glib/files/glib-2.30.2-machine-id.patch
deleted file mode 100644
index 863b3b448630..000000000000
--- a/dev-libs/glib/files/glib-2.30.2-machine-id.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1c9eceaccb6e6c4339cd6951cf53fbd60ae80b8b Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 14 Nov 2011 01:43:22 -0500
-Subject: [PATCH] _g_dbus_get_machine_id(): check /etc/machine-id too
-
-machine-id can be in /etc or in /var/lib/dbus.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=663928
----
- gio/gdbusprivate.c |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
-index 55ac883..68c3ddf 100644
---- a/gio/gdbusprivate.c
-+++ b/gio/gdbusprivate.c
-@@ -1985,7 +1985,11 @@ _g_dbus_get_machine_id (GError **error)
-   gchar *ret;
-   /* TODO: use PACKAGE_LOCALSTATEDIR ? */
-   ret = NULL;
--  if (!g_file_get_contents ("/var/lib/dbus/machine-id",
-+  if (!g_file_get_contents ("/etc/machine-id",
-+                            &ret,
-+                            NULL,
-+                            NULL) &&
-+      !g_file_get_contents ("/var/lib/dbus/machine-id",
-                             &ret,
-                             NULL,
-                             error))
--- 
-1.7.8.rc1
-
diff --git a/dev-libs/glib/files/glib-2.30.2-missing-decls.patch b/dev-libs/glib/files/glib-2.30.2-missing-decls.patch
deleted file mode 100644
index 3641f8850408..000000000000
--- a/dev-libs/glib/files/glib-2.30.2-missing-decls.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix from upstream for building with C++ compilers:
-https://bugzilla.gnome.org/show_bug.cgi?id=663880
-
-From 5d9f05eef147f17d71e38c9fba2e3f622c9ed21b Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sat, 12 Nov 2011 10:26:31 -0500
-Subject: [PATCH] glib-unix.h: Add G_BEGIN/END_DECLS
-
-The omission was pointed out in bug 663880.
----
- glib/glib-unix.h |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/glib/glib-unix.h b/glib/glib-unix.h
-index 9642b5c..7be37f0 100644
---- a/glib/glib-unix.h
-+++ b/glib/glib-unix.h
-@@ -38,6 +38,8 @@
- #error "This header may only be used on UNIX"
- #endif
- 
-+G_BEGIN_DECLS
-+
- /**
-  * G_UNIX_ERROR:
-  *
-@@ -77,4 +79,6 @@ guint    g_unix_signal_add         (gint        signum,
-                                     GSourceFunc handler,
-                                     gpointer    user_data);
- 
--#endif
-+G_END_DECLS
-+
-+#endif  /* __G_UNIX_H__ */
--- 
-1.7.7.1
diff --git a/dev-libs/glib/files/glib-2.30.3-assert-test-failure.patch b/dev-libs/glib/files/glib-2.30.3-assert-test-failure.patch
deleted file mode 100644
index 20a12c43ff9c..000000000000
--- a/dev-libs/glib/files/glib-2.30.3-assert-test-failure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Tests fail when upgrading glib from 2.22 to 2.24 if sys-devel/gdb is installed
-because gdb is run on .libs/assert-msg-test before LD_LIBRARY_PATH is set. This
-causes gdb to use the system-wide glib instead, and fail on the test.
-
-This patch exports LD_LIBRARY_PATH before running gdb
-
-https://bugzilla.gnome.org/621368
-
----
---- tests/run-assert-msg-test.sh
-+++ tests/run-assert-msg-test.sh
-@@ -34,6 +34,7 @@ if [ -e ".libs/lt-$msg_test" ]; then
-        msg_test="lt-$msg_test"
- fi
- echo_v "Running gdb on assert-msg-test"
-+export LD_LIBRARY_PATH="`dirname $PWD`/glib/.libs:$LD_LIBRARY_PATH"
- OUT=$(gdb --batch --ex run --ex "set print elements 0" --ex "print (char*) __glib_assert_msg" .libs/$msg_test 2> $error_out) || \
-   fail "failed to run gdb"
- 
diff --git a/dev-libs/glib/files/glib-2.30.3-closure-64bit-be.patch b/dev-libs/glib/files/glib-2.30.3-closure-64bit-be.patch
deleted file mode 100644
index 9ec9f1aa1775..000000000000
--- a/dev-libs/glib/files/glib-2.30.3-closure-64bit-be.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-From 0782edcb44110c8a3ba921258eb8d4e452f2470e Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Fri, 23 Sep 2011 12:32:23 -0500
-Subject: [PATCH] closure: fix handling of ENUMs and integral return types on
- 64-bit BE platforms
-
-enums are stored in v_long but need to be marshalled as signed
-integers.  On platforms where int is 32 bits, taking the
-address of v_long resulted in the wrong 32 bits being marshalled.
-So we need to stuff the enum's int-sized value to a temporary
-int-sized variable and marshall that instead.
-
-Second, on return, libffi actually returns a pointer to a value
-that's sized according to platform conventions, not according to
-what the caller requested.  ie if ffi_type_sint was requested, the
-value can still be a 64-bit sign-extended long on a 64-bit
-architecture like PPC64, thus the caller cannot simply cast
-the return value as a pointer to the desired type, but must cast
-as a pointer to an integral type and then cast to the desired
-type to remove any sign extension complications.
-
-For more information on how to correctly handle libffi return
-values, see the following bug, specifically comment 35:
-
-https://bugzilla.redhat.com/show_bug.cgi?id=736489
-
-"For 64-bit ABIs that extend integral returns types to 64-bits, libffi always
-returns full 64-bit values that you can truncate in the calling code.   It's
-just the way it is has always been.  Please don't change libffi.  I'll document
-this clearly for the next version (perhaps there is a mention of this, I
-haven't looked yet).
-
-The same is true for returning 8-bit values, for instance, on 32-bit systems.
-All ABIs extend those results to the full 32-bits so you need to provide a
-properly aligned buffer that's big enough to hold the result."
-
-https://bugzilla.gnome.org/show_bug.cgi?id=659881
-
-[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to glib-2.30.x]
----
- gobject/gclosure.c |   76 ++++++++++++++++++++++++++++++++++++++++-----------
- 1 files changed, 59 insertions(+), 17 deletions(-)
-
-diff --git a/gobject/gclosure.c b/gobject/gclosure.c
-index 5fd928b..fc4f99a 100644
---- a/gobject/gclosure.c
-+++ b/gobject/gclosure.c
-@@ -944,21 +944,42 @@ g_signal_type_cclosure_new (GType    itype,
- 
- #include <ffi.h>
- static ffi_type *
--value_to_ffi_type (const GValue *gvalue, gpointer *value)
-+value_to_ffi_type (const GValue *gvalue,
-+                   gpointer *value,
-+                   gint *enum_tmpval,
-+                   gboolean *tmpval_used)
- {
-   ffi_type *rettype = NULL;
-   GType type = g_type_fundamental (G_VALUE_TYPE (gvalue));
-   g_assert (type != G_TYPE_INVALID);
- 
-+  if (enum_tmpval)
-+    {
-+      g_assert (tmpval_used != NULL);
-+      *tmpval_used = FALSE;
-+    }
-+
-   switch (type)
-     {
-     case G_TYPE_BOOLEAN:
-     case G_TYPE_CHAR:
-     case G_TYPE_INT:
--    case G_TYPE_ENUM:
-       rettype = &ffi_type_sint;
-       *value = (gpointer)&(gvalue->data[0].v_int);
-       break;
-+    case G_TYPE_ENUM:
-+      /* enums are stored in v_long even though they are integers, which makes
-+       * marshalling through libffi somewhat complicated.  They need to be
-+       * marshalled as signed ints, but we need to use a temporary int sized
-+       * value to pass to libffi otherwise it'll pull the wrong value on
-+       * BE machines with 32-bit integers when treating v_long as 32-bit int.
-+       */
-+      g_assert (enum_tmpval != NULL);
-+      rettype = &ffi_type_sint;
-+      *enum_tmpval = g_value_get_enum (gvalue);
-+      *value = enum_tmpval;
-+      *tmpval_used = TRUE;
-+      break;
-     case G_TYPE_UCHAR:
-     case G_TYPE_UINT:
-     case G_TYPE_FLAGS:
-@@ -1011,10 +1032,12 @@ value_to_ffi_type (const GValue *gvalue, gpointer *value)
- static void
- value_from_ffi_type (GValue *gvalue, gpointer *value)
- {
-+  ffi_arg *int_val = value;
-+
-   switch (g_type_fundamental (G_VALUE_TYPE (gvalue)))
-     {
-     case G_TYPE_INT:
--      g_value_set_int (gvalue, *(gint*)value);
-+      g_value_set_int (gvalue, (gint) *int_val);
-       break;
-     case G_TYPE_FLOAT:
-       g_value_set_float (gvalue, *(gfloat*)value);
-@@ -1023,43 +1046,43 @@ value_from_ffi_type (GValue *gvalue, gpointer *value)
-       g_value_set_double (gvalue, *(gdouble*)value);
-       break;
-     case G_TYPE_BOOLEAN:
--      g_value_set_boolean (gvalue, *(gboolean*)value);
-+      g_value_set_boolean (gvalue, (gboolean) *int_val);
-       break;
-     case G_TYPE_STRING:
-       g_value_set_string (gvalue, *(gchar**)value);
-       break;
-     case G_TYPE_CHAR:
--      g_value_set_char (gvalue, *(gchar*)value);
-+      g_value_set_char (gvalue, (gchar) *int_val);
-       break;
-     case G_TYPE_UCHAR:
--      g_value_set_uchar (gvalue, *(guchar*)value);
-+      g_value_set_uchar (gvalue, (guchar) *int_val);
-       break;
-     case G_TYPE_UINT:
--      g_value_set_uint (gvalue, *(guint*)value);
-+      g_value_set_uint (gvalue, (guint) *int_val);
-       break;
-     case G_TYPE_POINTER:
-       g_value_set_pointer (gvalue, *(gpointer*)value);
-       break;
-     case G_TYPE_LONG:
--      g_value_set_long (gvalue, *(glong*)value);
-+      g_value_set_long (gvalue, (glong) *int_val);
-       break;
-     case G_TYPE_ULONG:
--      g_value_set_ulong (gvalue, *(gulong*)value);
-+      g_value_set_ulong (gvalue, (gulong) *int_val);
-       break;
-     case G_TYPE_INT64:
--      g_value_set_int64 (gvalue, *(gint64*)value);
-+      g_value_set_int64 (gvalue, (gint64) *int_val);
-       break;
-     case G_TYPE_UINT64:
--      g_value_set_uint64 (gvalue, *(guint64*)value);
-+      g_value_set_uint64 (gvalue, (guint64) *int_val);
-       break;
-     case G_TYPE_BOXED:
-       g_value_set_boxed (gvalue, *(gpointer*)value);
-       break;
-     case G_TYPE_ENUM:
--      g_value_set_enum (gvalue, *(gint*)value);
-+      g_value_set_enum (gvalue, (gint) *int_val);
-       break;
-     case G_TYPE_FLAGS:
--      g_value_set_flags (gvalue, *(guint*)value);
-+      g_value_set_flags (gvalue, (guint) *int_val);
-       break;
-     case G_TYPE_PARAM:
-       g_value_set_param (gvalue, *(gpointer*)value);
-@@ -1108,10 +1131,13 @@ g_cclosure_marshal_generic (GClosure     *closure,
-   int i;
-   ffi_cif cif;
-   GCClosure *cc = (GCClosure*) closure;
-+  gint *enum_tmpval;
-+  gboolean tmpval_used = FALSE;
- 
-+  enum_tmpval = g_alloca (sizeof (gint));
-   if (return_gvalue && G_VALUE_TYPE (return_gvalue))
-     {
--      rtype = value_to_ffi_type (return_gvalue, &rvalue);
-+      rtype = value_to_ffi_type (return_gvalue, &rvalue, enum_tmpval, &tmpval_used);
-     }
-   else
-     {
-@@ -1124,22 +1150,38 @@ g_cclosure_marshal_generic (GClosure     *closure,
-   atypes = g_alloca (sizeof (ffi_type *) * n_args);
-   args =  g_alloca (sizeof (gpointer) * n_args);
- 
-+  if (tmpval_used)
-+    enum_tmpval = g_alloca (sizeof (gint));
-+
-   if (G_CCLOSURE_SWAP_DATA (closure))
-     {
-       atypes[n_args-1] = value_to_ffi_type (param_values + 0,
--                                            &args[n_args-1]);
-+                                            &args[n_args-1],
-+                                            enum_tmpval,
-+                                            &tmpval_used);
-       atypes[0] = &ffi_type_pointer;
-       args[0] = &closure->data;
-     }
-   else
-     {
--      atypes[0] = value_to_ffi_type (param_values + 0, &args[0]);
-+      atypes[0] = value_to_ffi_type (param_values + 0,
-+                                     &args[0],
-+                                     enum_tmpval,
-+                                     &tmpval_used);
-       atypes[n_args-1] = &ffi_type_pointer;
-       args[n_args-1] = &closure->data;
-     }
- 
-   for (i = 1; i < n_args - 1; i++)
--    atypes[i] = value_to_ffi_type (param_values + i, &args[i]);
-+    {
-+      if (tmpval_used)
-+        enum_tmpval = g_alloca (sizeof (gint));
-+
-+      atypes[i] = value_to_ffi_type (param_values + i,
-+                                     &args[i],
-+                                     enum_tmpval,
-+                                     &tmpval_used);
-+    }
- 
-   if (ffi_prep_cif (&cif, FFI_DEFAULT_ABI, n_args, rtype, atypes) != FFI_OK)
-     return;
--- 
-1.7.8.5
-
diff --git a/dev-libs/glib/glib-2.30.3.ebuild b/dev-libs/glib/glib-2.30.3.ebuild
deleted file mode 100644
index bc0ad9016f0e..000000000000
--- a/dev-libs/glib/glib-2.30.3.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.3.ebuild,v 1.15 2013/02/19 00:08:33 tetromino Exp $
-
-EAPI="4"
-PYTHON_DEPEND="utils? 2"
-# Avoid runtime dependency on python when USE=test
-
-inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="debug fam selinux +static-libs systemtap test utils xattr"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
-
-RDEPEND="virtual/libiconv
-	virtual/libffi
-	sys-libs/zlib
-	xattr? ( sys-apps/attr )
-	fam? ( virtual/fam )
-	utils? ( >=dev-util/gdbus-codegen-${PV} )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.11
-	>=dev-util/gtk-doc-am-1.15
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	test? (
-		sys-devel/gdb
-		=dev-lang/python-2*
-		>=dev-util/gdbus-codegen-${PV}
-		>=sys-apps/dbus-1.2.14 )
-	!<dev-util/gtk-doc-1.15-r2"
-PDEPEND="x11-misc/shared-mime-info
-	!<gnome-base/gvfs-1.6.4-r990"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# Earlier versions of gvfs do not work with glib
-
-pkg_setup() {
-	# Needed for gio/tests/gdbus-testserver.py
-	if use test ; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
-
-	if use ia64 ; then
-		# Only apply for < 4.1
-		local major=$(gcc-major-version)
-		local minor=$(gcc-minor-version)
-		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
-			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
-		fi
-	fi
-
-	# Fix from upstream for building with C++ compilers.
-	epatch "${FILESDIR}/${PN}-2.30.2-missing-decls.patch"
-
-	# Don't fail gio tests when ran without userpriv, upstream bug 552912
-	# This is only a temporary workaround, remove as soon as possible
-#	epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
-
-	# Fix gmodule issues on fbsd; bug #184301
-	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
-	# Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368
-	epatch "${FILESDIR}/${PN}-2.30.3-assert-test-failure.patch"
-
-	# Do not try to remove files on live filesystem, upstream bug #619274
-	sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-		-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
-
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die
-	else
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
-		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:2' ; then
-			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:2"
-			ewarn "not being present on your system, think on installing them to get these tests run."
-			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
-			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
-			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
-			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
-			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
-			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
-			# needed to prevent gdbus-threading from asserting
-			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
-		fi
-	fi
-
-	# gdbus-codegen is a separate package
-	epatch "${FILESDIR}/${PN}-2.30.1-external-gdbus-codegen.patch"
-
-	# Handle the G_HOME environment variable to override the passwd entry, upstream bug #142568
-	epatch "${FILESDIR}/${PN}-2.30.1-homedir-env.patch"
-
-	# Fix hardcoded path to machine-id wrt #390143
-	epatch "${FILESDIR}/${PN}-2.30.2-machine-id.patch"
-
-	# Fix from glib-2.31 for ppc64
-	epatch "${FILESDIR}/${PN}-2.30.3-closure-64bit-be.patch"
-
-	epatch_user
-
-	# disable pyc compiling
-	use test && python_clean_py-compile_files
-
-	# Needed for the punt-python-check patch, disabling timeout test
-	# Also needed to prevent croscompile failures, see bug #267603
-	# Also needed for the no-gdbus-codegen patch
-	AT_M4DIR="${WORKDIR}" eautoreconf
-
-	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
-
-	epunt_cxx
-}
-
-src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig and
-	# native builds (cross-compiles won't need pkg-config
-	# in the target ROOT to work here)
-	if ! tc-is-cross-compiler && ! has_version virtual/pkgconfig; then
-		if has_version sys-apps/dbus; then
-			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
-			export DBUS1_LIBS="-ldbus-1"
-		fi
-		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
-		export LIBFFI_LIBS="-lffi"
-	fi
-
-	local myconf
-
-	# Building with --disable-debug highly unrecommended.  It will build glib in
-	# an unusable form as it disables some commonly used API.  Please do not
-	# convert this to the use_enable form, as it results in a broken build.
-	# -- compnerd (3/27/06)
-	use debug && myconf="--enable-debug"
-
-	# Always use internal libpcre, bug #254659
-	econf ${myconf} \
-		$(use_enable xattr) \
-		$(use_enable fam) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable systemtap systemtap) \
-		--enable-regex \
-		--with-pcre=internal \
-		--with-threads=posix
-}
-
-src_install() {
-	local f
-
-	# install-exec-hook substitutes ${PYTHON} in glib/gtester-report
-	emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install
-
-	if ! use utils; then
-		rm "${ED}usr/bin/gtester-report"
-	fi
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${ED}/usr/lib/charset.alias"
-
-	# Don't install gdb python macros, bug 291328
-	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-
-	dodoc AUTHORS ChangeLog* NEWS* README
-
-	insinto /usr/share/bash-completion
-	for f in gdbus gsettings; do
-		newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f}
-	done
-	rm -rf "${ED}/etc"
-
-	# Completely useless with or without USE static-libs, people need to use
-	# pkg-config
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
-
-src_test() {
-	gnome2_environment_reset
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	unset GSETTINGS_BACKEND # bug 352451
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	# Hardened: gdb needs this, bug #338891
-	if host-is-pax ; then
-		pax-mark -mr "${S}"/tests/.libs/assert-msg-test \
-			|| die "Hardened adjustment failed"
-	fi
-
-	# Need X for dbus-launch session X11 initialization
-	Xemake check
-}
-
-pkg_preinst() {
-	# Only give the introspection message if:
-	# * The user has gobject-introspection
-	# * Has glib already installed
-	# * Previous version was different from new version
-	if has_version "dev-libs/gobject-introspection" && ! has_version "=${CATEGORY}/${PF}"; then
-		ewarn "You must rebuild gobject-introspection so that the installed"
-		ewarn "typelibs and girs are regenerated for the new APIs in glib"
-	fi
-}
-
-pkg_postinst() {
-	# Inform users about possible breakage when updating glib and not dbus-glib, bug #297483
-	if has_version dev-libs/dbus-glib; then
-		ewarn "If you experience a breakage after updating dev-libs/glib try"
-		ewarn "rebuilding dev-libs/dbus-glib"
-	fi
-
-	if has_version '<x11-libs/gtk+-3.0.12:3'; then
-		# To have a clear upgrade path for gtk+-3.0.x users, have to resort to
-		# a warning instead of a blocker
-		ewarn
-		ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
-		ewarn "You should upgrade to a newer version of gtk+:3 immediately."
-	fi
-}
diff --git a/dev-libs/glib/glib-2.34.2.ebuild b/dev-libs/glib/glib-2.36.1.ebuild
similarity index 74%
rename from dev-libs/glib/glib-2.34.2.ebuild
rename to dev-libs/glib/glib-2.36.1.ebuild
index 3b9661093ae1..24fca1e6f22f 100644
--- a/dev-libs/glib/glib-2.34.2.ebuild
+++ b/dev-libs/glib/glib-2.36.1.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.34.2.ebuild,v 1.2 2013/02/19 00:08:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.1.ebuild,v 1.1 2013/04/23 19:02:39 pacho Exp $
 
-EAPI="4"
-PYTHON_DEPEND="utils? 2"
+EAPI="5"
+PYTHON_COMPAT=( python2_{5,6,7} )
 # Avoid runtime dependency on python when USE=test
 
-inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx linux-info
+inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs virtualx linux-info
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
 
 LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="debug fam kernel_linux selinux static-libs systemtap test utils xattr"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
-RDEPEND="virtual/libiconv
+RDEPEND="
+	virtual/libiconv
 	virtual/libffi
 	sys-libs/zlib
 	|| (
@@ -26,7 +25,10 @@ RDEPEND="virtual/libiconv
 		>=dev-libs/libelf-0.8.12 )
 	xattr? ( sys-apps/attr )
 	fam? ( virtual/fam )
-	utils? ( >=dev-util/gdbus-codegen-${PV} )"
+	utils? (
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
+"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	>=dev-libs/libxslt-1.0
@@ -35,31 +37,29 @@ DEPEND="${RDEPEND}
 	systemtap? ( >=dev-util/systemtap-1.3 )
 	test? (
 		sys-devel/gdb
-		=dev-lang/python-2*
-		>=dev-util/gdbus-codegen-${PV}
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
 		>=sys-apps/dbus-1.2.14 )
-	!<dev-util/gtk-doc-1.15-r2"
+	!<dev-util/gtk-doc-1.15-r2
+"
 PDEPEND="x11-misc/shared-mime-info
 	!<gnome-base/gvfs-1.6.4-r990"
 # shared-mime-info needed for gio/xdgmime, bug #409481
 # Earlier versions of gvfs do not work with glib
 
 pkg_setup() {
-	# Needed for gio/tests/gdbus-testserver.py
-	if use test; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-
 	if use kernel_linux ; then
 		CONFIG_CHECK="~INOTIFY_USER"
+		if use test; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+			export IPV6_DISABLED="yes"
+		fi
 		linux-info_pkg_setup
 	fi
 }
 
 src_prepare() {
-	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
-
 	# Fix gmodule issues on fbsd; bug #184301
 	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
 
@@ -68,7 +68,7 @@ src_prepare() {
 		sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
 			-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
 
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
 		if ! has_version dev-util/desktop-file-utils ; then
 			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
 			ewarn "think on installing it to get these tests run."
@@ -78,6 +78,13 @@ src_prepare() {
 			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
 		fi
 
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+			ewarn "Some tests will be skipped due to missing terminal program"
+			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		fi
+
 		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
 		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
 			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
@@ -92,29 +99,39 @@ src_prepare() {
 			# needed to prevent gdbus-threading from asserting
 			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
 		fi
+
+		# Some tests need ipv6, upstream bug #667468
+		if [[ -n "${IPV6_DISABLED}" ]]; then
+			sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die
+			sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die
+			sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die
+		fi
+
+		# Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655
+		sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die
+
+		# thread test fails, upstream bug #679306
+		epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
 	fi
 
 	# gdbus-codegen is a separate package
-	epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch"
+	epatch "${FILESDIR}/${PN}-2.35.x-external-gdbus-codegen.patch"
 
 	# bashcomp goes in /usr/share/bash-completion
 	epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch"
 
-	# https://bugzilla.gnome.org/show_bug.cgi?id=679306
-	epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
-	# https://bugzilla.gnome.org/show_bug.cgi?id=679308
-	epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-gdbus-auth-tests.patch"
+	# leave python shebang alone
+	sed -e '/${PYTHON}/d' \
+		-i glib/Makefile.{am,in} || die
 
 	epatch_user
 
-	# disable pyc compiling
-	use test && python_clean_py-compile_files
-
 	# Needed for the punt-python-check patch, disabling timeout test
 	# Also needed to prevent croscompile failures, see bug #267603
 	# Also needed for the no-gdbus-codegen patch
-	AT_M4DIR="${WORKDIR}" eautoreconf
+	eautoreconf
 
+	# FIXME: Really needed when running eautoreconf before? bug#????
 	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
 
 	epunt_cxx
@@ -141,17 +158,6 @@ src_configure() {
 	# -- compnerd (3/27/06)
 	use debug && myconf="--enable-debug"
 
-	if use test; then
-		myconf="${myconf} --enable-modular-tests"
-	else
-		if [[ ${PV} = 9999 ]] && use doc; then
-			# need to build tests if USE=doc for bug #387385
-			myconf="${myconf} --enable-modular-tests"
-		else
-			myconf="${myconf} --disable-modular-tests"
-		fi
-	fi
-
 	# Always use internal libpcre, bug #254659
 	econf ${myconf} \
 		$(use_enable xattr) \
@@ -160,19 +166,21 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_enable systemtap dtrace) \
 		$(use_enable systemtap systemtap) \
+		$(use_enable test modular-tests) \
 		--enable-man \
 		--with-pcre=internal \
-		--with-threads=posix
+		--with-threads=posix \
+		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
 }
 
 src_install() {
-	local f
+	emake install DESTDIR="${D}"
 
-	# install-exec-hook substitutes ${PYTHON} in glib/gtester-report
-	emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install
-
-	if ! use utils; then
+	if use utils ; then
+		python_replicate_script "${ED}"/usr/bin/gtester-report
+	else
 		rm "${ED}usr/bin/gtester-report"
+		rm "${ED}usr/share/man/man1/gtester-report.1"
 	fi
 
 	# Do not install charset.alias even if generated, leave it to libiconv
@@ -185,7 +193,7 @@ src_install() {
 
 	# Completely useless with or without USE static-libs, people need to use
 	# pkg-config
-	find "${D}" -name '*.la' -exec rm -f {} +
+	prune_libtool_files --modules
 }
 
 src_test() {
@@ -197,6 +205,7 @@ src_test() {
 	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
 	unset GSETTINGS_BACKEND # bug 352451
 	export LC_TIME=C # bug #411967
+	python_export_best
 
 	# Related test is a bit nitpicking
 	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
@@ -217,6 +226,7 @@ pkg_preinst() {
 	# * The user has gobject-introspection
 	# * Has glib already installed
 	# * Previous version was different from new version
+	# TODO: add a subslotted virtual to trigger this automatically
 	if has_version "dev-libs/gobject-introspection" && ! has_version "=${CATEGORY}/${PF}"; then
 		ewarn "You must rebuild gobject-introspection so that the installed"
 		ewarn "typelibs and girs are regenerated for the new APIs in glib"
@@ -225,6 +235,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	# Inform users about possible breakage when updating glib and not dbus-glib, bug #297483
+	# TODO: add a subslotted virtual to trigger this automatically
 	if has_version dev-libs/dbus-glib; then
 		ewarn "If you experience a breakage after updating dev-libs/glib try"
 		ewarn "rebuilding dev-libs/dbus-glib"
diff --git a/dev-libs/jansson/jansson-2.3.1.ebuild b/dev-libs/jansson/jansson-2.3.1.ebuild
index 3d2a11090218..cbd060387b5c 100644
--- a/dev-libs/jansson/jansson-2.3.1.ebuild
+++ b/dev-libs/jansson/jansson-2.3.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jansson/jansson-2.3.1.ebuild,v 1.3 2012/08/14 10:07:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jansson/jansson-2.3.1.ebuild,v 1.4 2013/04/23 23:29:35 radhermit Exp $
 
 EAPI="3"
+AUTOTOOLS_AUTORECONF=1
 
 inherit autotools-utils
 
@@ -22,7 +23,6 @@ DOCS=(CHANGES README.rst)
 
 src_prepare() {
 	sed -ie 's/-Werror//' src/Makefile.am || die
-	eautoreconf
 	autotools-utils_src_prepare
 }
 
diff --git a/dev-libs/jansson/jansson-2.4.ebuild b/dev-libs/jansson/jansson-2.4.ebuild
index 6cea53f98c4d..3df740a4ce54 100644
--- a/dev-libs/jansson/jansson-2.4.ebuild
+++ b/dev-libs/jansson/jansson-2.4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jansson/jansson-2.4.ebuild,v 1.1 2012/09/28 17:31:32 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jansson/jansson-2.4.ebuild,v 1.2 2013/04/23 23:29:35 radhermit Exp $
 
 EAPI="4"
+AUTOTOOLS_AUTORECONF=1
 
 inherit autotools-utils
 
@@ -22,7 +23,6 @@ DOCS=(CHANGES README.rst)
 
 src_prepare() {
 	sed -ie 's/-Werror//' src/Makefile.am || die
-	eautoreconf
 	autotools-utils_src_prepare
 }
 
diff --git a/dev-libs/libmemcached/libmemcached-0.50.ebuild b/dev-libs/libmemcached/libmemcached-0.50.ebuild
index e97e05479b05..5e3b4dd263c0 100644
--- a/dev-libs/libmemcached/libmemcached-0.50.ebuild
+++ b/dev-libs/libmemcached/libmemcached-0.50.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcached/libmemcached-0.50.ebuild,v 1.1 2011/09/04 04:00:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcached/libmemcached-0.50.ebuild,v 1.6 2013/04/23 14:02:07 jer Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ SRC_URI="http://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug doc hsieh +libevent sasl static-libs tcmalloc"
 
 DEPEND="net-misc/memcached
diff --git a/dev-libs/liborcus/files/liborcus-0.5.1-linking.patch b/dev-libs/liborcus/files/liborcus-0.5.1-linking.patch
new file mode 100644
index 000000000000..f9cb64d9b7a8
--- /dev/null
+++ b/dev-libs/liborcus/files/liborcus-0.5.1-linking.patch
@@ -0,0 +1,13 @@
+diff -urN liborcus-0.5.1/src/parser/Makefile.am liborcus-0.5.1.new/src/parser/Makefile.am
+--- liborcus-0.5.1/src/parser/Makefile.am	2013-04-12 16:25:03.000000000 +0200
++++ liborcus-0.5.1.new/src/parser/Makefile.am	2013-04-23 19:45:47.794480191 +0200
+@@ -20,7 +20,8 @@
+ 
+ liborcus_parser_@ORCUS_API_VERSION@_la_LDFLAGS = -no-undefined
+ liborcus_parser_@ORCUS_API_VERSION@_la_LIBADD = \
+-	 $(ZLIB_LIBS)
++	$(BOOST_SYSTEM_LIB) \
++	$(ZLIB_LIBS)
+ 
+ EXTRA_PROGRAMS = \
+ 	parser-test-string-pool \
diff --git a/dev-libs/liborcus/liborcus-0.5.1.ebuild b/dev-libs/liborcus/liborcus-0.5.1.ebuild
index 3f3cb619552f..f809d1b6e613 100644
--- a/dev-libs/liborcus/liborcus-0.5.1.ebuild
+++ b/dev-libs/liborcus/liborcus-0.5.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-0.5.1.ebuild,v 1.1 2013/04/19 10:48:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-0.5.1.ebuild,v 1.2 2013/04/23 17:59:24 scarabeus Exp $
 
 EAPI=5
 
 EGIT_REPO_URI="git://gitorious.org/orcus/orcus.git"
 
 [[ ${PV} == 9999 ]] && GITECLASS="git-2 autotools"
-inherit eutils ${GITECLASS}
+inherit eutils autotools ${GITECLASS}
 unset GITECLASS
 
 DESCRIPTION="Standalone file import filter library for spreadsheet documents"
@@ -23,13 +23,16 @@ IUSE="static-libs"
 RDEPEND="
 	>=dev-libs/boost-1.51.0
 	>=dev-libs/libixion-0.5.0:=
+	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
 	>=dev-util/mdds-0.7.1
 "
 
 src_prepare() {
-	[[ ${PV} == 9999 ]] && eautoreconf
+	epatch \
+		"${FILESDIR}"/${P}-linking.patch
+	eautoreconf
 }
 
 src_configure() {
diff --git a/dev-libs/libtommath/files/libtommath-0.42.0-makefile.patch b/dev-libs/libtommath/files/libtommath-0.42.0-makefile.patch
index af0b37b9dac2..b3f1ed6252c8 100644
--- a/dev-libs/libtommath/files/libtommath-0.42.0-makefile.patch
+++ b/dev-libs/libtommath/files/libtommath-0.42.0-makefile.patch
@@ -1,44 +1,47 @@
---- libtommath-0.42.0/makefile.shared.orig
-+++ libtommath-0.42.0/makefile.shared
-@@ -3,7 +3,7 @@
+--- makefile.shared
++++ makefile.shared
+@@ -3,7 +3,8 @@
  #Tom St Denis
  VERSION=0:41
  
 -CC = libtool --mode=compile --tag=CC gcc
-+LTCOMPILE = libtool --mode=compile --tag=CC $(CC)
++LT	?= libtool
++LTCOMPILE = $(LT) --mode=compile --tag=CC $(CC)
  
  CFLAGS  +=  -I./ -Wall -W -Wshadow -Wsign-compare
  
-@@ -82,21 +82,24 @@
+@@ -82,21 +83,24 @@
  
  objs: $(OBJECTS)
  
-+.c.o:
-+	$(LTCOMPILE) $(CFLAGS) $(LDFLAGS) -o $@ -c $<
++%.lo: %.c
++	$(LTCOMPILE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
 +
- $(LIBNAME):  $(OBJECTS)
+-$(LIBNAME):  $(OBJECTS)
 -	libtool --mode=link gcc *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
-+	libtool --mode=link --tag=CC $(CC) $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
++$(LIBNAME):  $(OBJECTS:.o=.lo)
++	$(LT) --mode=link --tag=CC $(CC) $(CFLAGS) $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
  
  install: $(LIBNAME)
 -	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)
-+	install -d $(DESTDIR)$(LIBPATH)
- 	libtool --mode=install install -c $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME)
+-	libtool --mode=install install -c $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME)
 -	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH)
 -	install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
++	install -d $(DESTDIR)$(LIBPATH)
++	$(LT) --mode=install install -c $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME)
 +	install -d $(DESTDIR)$(INCPATH)
 +	install -m 644 $(HEADERS) $(DESTDIR)$(INCPATH)
  
  test: $(LIBNAME) demo/demo.o
 -	gcc $(CFLAGS) -c demo/demo.c -o demo/demo.o
 -	libtool --mode=link gcc -o test demo/demo.o $(LIBNAME_S)
-+	$(CC) $(CFLAGS) -c demo/demo.c -o demo/demo.o
-+	libtool --mode=link $(CC) $(LDFLAGS) -o test demo/demo.o $(LIBNAME_S)
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c demo/demo.c -o demo/demo.o
++	$(LT) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o test demo/demo.o $(LIBNAME_S)
  	
  mtest: test	
 -	cd mtest ; gcc $(CFLAGS) mtest.c -o mtest
-+	cd mtest ; $(CC) $(CFLAGS) $(LDFLAGS) mtest.c -o mtest
++	cd mtest ; $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) mtest.c -o mtest
          
  timing: $(LIBNAME)
 -	gcc $(CFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest
-+	libtool --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest
++	$(LT) --mode=link $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest
diff --git a/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild b/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild
index d58330334815..97925f351f18 100644
--- a/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild
+++ b/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild,v 1.5 2013/03/28 15:43:01 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild,v 1.7 2013/04/24 01:10:55 vapier Exp $
 
 EAPI=4
 
-inherit eutils multilib toolchain-funcs
+inherit autotools eutils multilib toolchain-funcs
 
 DESCRIPTION="highly optimized and portable routines for integer based number theoretic applications"
 HOMEPAGE="http://www.libtom.org/"
@@ -16,24 +16,44 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="doc examples static-libs"
 
 DEPEND="sys-devel/libtool"
+RDEPEND=""
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-makefile.patch
 
-	[[ ${CHOST} == *-darwin* ]] && \
-		sed -i -e 's/libtool/glibtool/g' makefile.shared
+	# need libtool for cross compilation. Bug #376643
+	cat <<-EOF > configure.ac
+	AC_INIT(libtommath, 0)
+	AM_INIT_AUTOMAKE
+	LT_INIT
+	AC_CONFIG_FILES(Makefile)
+	AC_OUTPUT
+	EOF
+	touch NEWS README AUTHORS ChangeLog Makefile.am
+	eautoreconf
+	export LT="${S}"/libtool
 }
 
-src_compile() {
-	emake CC=$(tc-getCC) -f makefile.shared IGNORE_SPEED=1 LIBPATH="${EPREFIX}/usr/$(get_libdir)"
+src_configure() {
+	econf $(use_enable static-libs static)
 }
 
-src_install() {
-	emake -f makefile.shared \
-		DESTDIR="${ED}" \
+_emake() {
+	emake CC="$(tc-getCC)" -f makefile.shared \
+		IGNORE_SPEED=1 \
 		LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
 		INCPATH="${EPREFIX}/usr/include" \
-		install
+		"$@"
+}
+
+src_compile() {
+	_emake
+}
+
+src_install() {
+	_emake DESTDIR="${ED}" install
+	# We only link against -lc, so drop the .la file.
+	find "${ED}" -name '*.la' -delete
 
 	dodoc changes.txt
 
@@ -43,6 +63,4 @@ src_install() {
 		docinto demo
 		dodoc demo/*.c
 	fi
-
-	use static-libs || find "${ED}" \( -name '*.a' -or -name '*.la' \) -delete
 }
diff --git a/dev-php/pecl-svn/Manifest b/dev-php/pecl-svn/Manifest
index def48d4fe1dc..f680ca7eb7f4 100644
--- a/dev-php/pecl-svn/Manifest
+++ b/dev-php/pecl-svn/Manifest
@@ -1 +1,2 @@
 DIST svn-1.0.1.tgz 24716 SHA256 022341599f28272a22df322e67e07af30abd9343d72a77e01a7b904edc4ba3c0 SHA512 59143d928f7716ba239e4d43aef26bddce054634964987e6abbba244025a6b7994f814783bf3610676b287450ec1c470eda515bf931e6a4c7194edb341510427 WHIRLPOOL 08386d913e2ea516d79646db002ebdb1327f0a634c9960a8d59c001ef4188445cad505a54c6f3b23981d9e42b32d43526fc3a6859a76bf6368c175b7dd243110
+DIST svn-1.0.2.tgz 25226 SHA256 ca0ea834e745a1aae65b456800bb5c5cfd7c4eceff281f7a8e317d30726e48cd SHA512 32baa9d7becabde30d4454326ffeab7c815d2112b6e6554ed2eed3cdf01fe0be73917f5794e0b812daf4d733402e64beb2705daffa7c9895bab5782961f7fc5b WHIRLPOOL 52022d8ec414cb8e95ed8cca523a3cb392ddf27fc38ee7a2d028599b605ec4750b1d8e2e194710881a32e30bafdc1aa234abbdd89e97963bf42b691b65675688
diff --git a/dev-php/pecl-svn/pecl-svn-1.0.2.ebuild b/dev-php/pecl-svn/pecl-svn-1.0.2.ebuild
new file mode 100644
index 000000000000..7b7c7ecd7efa
--- /dev/null
+++ b/dev-php/pecl-svn/pecl-svn-1.0.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-svn/pecl-svn-1.0.2.ebuild,v 1.1 2013/04/23 16:08:18 olemarkus Exp $
+
+EAPI=5
+
+PHP_EXT_NAME="svn"
+
+USE_PHP="php5-3 php5-4 php5-5"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP Bindings for the Subversion Revision control system."
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-vcs/subversion"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/astropy/Manifest b/dev-python/astropy/Manifest
index 2852e244855b..8a0c2c000c2d 100644
--- a/dev-python/astropy/Manifest
+++ b/dev-python/astropy/Manifest
@@ -1 +1,2 @@
 DIST astropy-0.1.tar.gz 3109566 SHA256 205f4576b6267a362d96f7b9e913e1f21efd3d7c58b9d58ebc0d2ed69382c540 SHA512 e2519dec6b90a2a7eab26479ec18fc1934f118d7b3c3d0b279f42d11cb94f85fca49ff0f0fe52c7aabe25f2d241ba09b4fc4f3c699f5de88f8f0bacf387529f2 WHIRLPOOL 1b326cbc7a12d23a6be67efa9771ff62b546c6808cbd27d60d78cbe7c3c2effaa01ea4b150699698ff32dc41a5d5f6cf8e95dc5569c7c3c303f2b06cc0fa331b
+DIST astropy-0.2.1.tar.gz 4736810 SHA256 ffd8e8b6cf71f34d55e926b845ea348eb0066a61d07f9f205ca32efff79b8424 SHA512 78b88ab4dfcafe5a9cd401a4e99a344f968c031b941728197fb11c51b8738cc37f3e6e45821217705e5ab3c080411a6ad2798f1f833fb50083f787e4129398aa WHIRLPOOL 9f6b70700a327255cff9f0322ca9551625ec937a025439fdbb376666fc63f7ca2e16f44d0be18170a9d5806200b9ab544b77471b476e8b8abbfdfbf09f016412
diff --git a/dev-python/astropy/astropy-0.2.1.ebuild b/dev-python/astropy/astropy-0.2.1.ebuild
new file mode 100644
index 000000000000..9d6bc629d10f
--- /dev/null
+++ b/dev-python/astropy/astropy-0.2.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/astropy/astropy-0.2.1.ebuild,v 1.1 2013/04/23 22:53:01 bicatali Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core functionality for performing astrophysics with Python"
+HOMEPAGE="http://astropy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-libs/expat
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-astronomy/sofa_c
+	sci-astronomy/wcslib
+	sci-libs/cfitsio
+	sys-libs/zlib
+	!dev-python/pyfits
+	!dev-python/pywcs
+	!dev-python/vo"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? ( dev-python/matplotlib
+		   dev-python/sphinx
+		   media-gfx/graphviz )
+	test? (	dev-libs/libxml2
+			dev-python/h5py[${PYTHON_USEDEP}]
+			dev-python/matplotlib[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			sci-libs/scipy[${PYTHON_USEDEP}] )"
+
+python_compile() {
+	distutils-r1_python_compile build \
+		--enable-legacy --use-system-libraries
+}
+
+python_compile_all() {
+	if use doc; then
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			emake -C docs html
+	fi
+}
+
+python_test() {
+	distutils-r1_python_compile build \
+		--enable-legacy --use-system-libraries test
+}
+
+python_install_all() {
+	use doc && dohtml -r doc/_build/html
+}
diff --git a/dev-python/astropy/metadata.xml b/dev-python/astropy/metadata.xml
index 5039e8b1fec0..f82f421cc634 100644
--- a/dev-python/astropy/metadata.xml
+++ b/dev-python/astropy/metadata.xml
@@ -7,4 +7,7 @@
   the core functionality and some common tools needed for performing
   astronomy and astrophysics with Python.
 </longdescription>
+<upstream>
+  <remote-id type="pypi">astropy</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-python/git-python/git-python-0.3.2_rc1.ebuild b/dev-python/git-python/git-python-0.3.2_rc1.ebuild
index 67df264bb467..b3565a4b91fa 100644
--- a/dev-python/git-python/git-python-0.3.2_rc1.ebuild
+++ b/dev-python/git-python/git-python-0.3.2_rc1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/git-python/git-python-0.3.2_rc1.ebuild,v 1.2 2011/08/27 21:00:30 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/git-python/git-python-0.3.2_rc1.ebuild,v 1.3 2013/04/24 01:07:32 zx2c4 Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -23,9 +23,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND="dev-vcs/git"
+RDEPEND="dev-vcs/git
+	 >=dev-python/gitdb-0.5.4"
 DEPEND="${RDEPEND}
-	>=dev-python/gitdb-0.5.4
 	dev-python/setuptools"
 RESTRICT_PYTHON_ABIS="3.*"
 
diff --git a/dev-python/gitdb/gitdb-0.5.4.ebuild b/dev-python/gitdb/gitdb-0.5.4.ebuild
index 5d88b0e60af2..2cf1c9b59d3d 100644
--- a/dev-python/gitdb/gitdb-0.5.4.ebuild
+++ b/dev-python/gitdb/gitdb-0.5.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gitdb/gitdb-0.5.4.ebuild,v 1.2 2011/08/27 20:57:27 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gitdb/gitdb-0.5.4.ebuild,v 1.3 2013/04/24 01:10:57 zx2c4 Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -18,9 +18,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-vcs/git"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
+RDEPEND="dev-vcs/git
 	>=dev-python/async-0.6
 	>=dev-python/smmap-0.8"
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
+
 RESTRICT_PYTHON_ABIS="3.*"
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index 42a0502f9140..6c88ead95169 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1 +1,2 @@
 DIST h5py-2.1.2.tar.gz 985537 SHA256 26679852da555db57478b3c65f0ba3e60e2e6c642e6952481e5af85cf59ec5bd SHA512 15ca0209e8d8f172cb0708a2de946fbbde8551d9bebc4a95fa7ae31558457a7f43249d5289d7675490c577deb4e0153698fd2407644078bf30bd5ab10135fce3 WHIRLPOOL dd4bbb3f3ac8a6dd9fcf51b2de53fa1d575ff29a67c2c5b9d9a6cc07267f12c0e36d03db0e29e206306d550ae9f56c6e562b29def3d797f553165edc04a9a374
+DIST h5py-2.1.3.tar.gz 988478 SHA256 bf5ea7c8758bb64cd9db8d2736cb84ccc93e5bfbf4133650d7adf4b05726ca83 SHA512 2eb7030f8559ff5cb06333223d98fda5b3a663b6f4a026949d1c423aa9a869d824e612ed5e1851f3bf830d645eea1a768414f73731c23ab4d406da26014fe202 WHIRLPOOL d6400ac987c26877419231c1623a520f77e81b28858423ba95ef7b2036be60214cbc69fac4645744137dc911526349e941d4229ed5ab0eba89c9c79723db36c5
diff --git a/dev-python/h5py/h5py-2.1.3.ebuild b/dev-python/h5py/h5py-2.1.3.ebuild
new file mode 100644
index 000000000000..79a8aeacadbd
--- /dev/null
+++ b/dev-python/h5py/h5py-2.1.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/h5py-2.1.3.ebuild,v 1.1 2013/04/23 17:42:59 bicatali Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Simple Python interface to HDF5 files"
+HOMEPAGE="http://www.h5py.org/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test examples"
+
+RDEPEND="
+	sci-libs/hdf5:=
+	dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( virtual/python-unittest2[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	append-cflags -fno-strict-aliasing
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib/ && nosetests ./${PN}/lowtest || die
+}
+
+python_install_all() {
+	dodoc README.txt
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/h5py/metadata.xml b/dev-python/h5py/metadata.xml
index 2d8aaf2ee743..f7b07dc6d8a1 100644
--- a/dev-python/h5py/metadata.xml
+++ b/dev-python/h5py/metadata.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <herd>sci</herd>
-  <longdescription lang="en">HDF5 for Python (h5py) is a general-purpose simple Python interface to the
+<herd>python</herd>
+<herd>sci</herd>
+<longdescription lang="en">
+  HDF5 for Python (h5py) is a general-purpose simple Python interface to the
   Hierarchical Data Format library, version 5. Existing Python and
   Numpy concepts are used for the interface. Almost all HDF5 features
   are available from Python, including things like compound datatypes
   (as used with Numpy recarray types), HDF5 attributes, hyperslab and
   point-based I/O, and more recent features in HDF 1.8 like resizable
-  datasets and recursive iteration over entire files. </longdescription>
-  <upstream>
-    <remote-id type="google-code">h5py</remote-id>
-  </upstream>
+  datasets and recursive iteration over entire files.
+</longdescription>
+<upstream>
+  <remote-id type="google-code">h5py</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-python/matplotlib/metadata.xml b/dev-python/matplotlib/metadata.xml
index d5fb8ef9b284..1ed9b79a5ed3 100644
--- a/dev-python/matplotlib/metadata.xml
+++ b/dev-python/matplotlib/metadata.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <longdescription lang="en">
+<herd>python</herd>
+<longdescription lang="en">
   matplotlib is an interactive library for plotting and doing basic
   data analysis in python with a syntax similar to matlab. It provides a
-  variety of backends and hard copy formats for almost ready publication plots.
+  variety of backends and hard copy formats for almost ready
+  publication plots.
 </longdescription>
-  <use>
-    <flag name="excel">Pull <pkg>dev-python/xlwt</pkg> for the exceltools toolkit</flag>
-    <flag name="traits">Pull <pkg>dev-python/traits</pkg> for the 
+<use>
+  <flag name="excel">Pull <pkg>dev-python/xlwt</pkg> for the exceltools toolkit</flag>
+  <flag name="traits">Pull <pkg>dev-python/traits</pkg> for the 
   experimental enthought traits support</flag>
-    <flag name="gtk3">Use <pkg>x11-libs/gtk+:3</pkg> instead of <pkg>x11-libs/gtk+:2</pkg></flag>
-  </use>
+  <flag name="gtk3">Use <pkg>x11-libs/gtk+:3</pkg> instead of <pkg>x11-libs/gtk+:2</pkg></flag>
+</use>
+<upstream>
+  <remote-id type="pypi">matplotlib</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-python/py/py-1.4.13.ebuild b/dev-python/py/py-1.4.13.ebuild
index 3dc453b69f8f..d5bbc8d0a5db 100644
--- a/dev-python/py/py-1.4.13.ebuild
+++ b/dev-python/py/py-1.4.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.13.ebuild,v 1.2 2013/03/24 02:07:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.13.ebuild,v 1.3 2013/04/23 05:39:38 patrick Exp $
 
 EAPI="5"
 
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9,2_0} )
 inherit distutils-r1
 
 DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="http://pylib.org/ http://pypi.python.org/pypi/py"
+HOMEPAGE="http://pylib.readthedocs.org/ http://pypi.python.org/pypi/py"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pyds9/Manifest b/dev-python/pyds9/Manifest
index e0161e6b6993..66b6b3673baa 100644
--- a/dev-python/pyds9/Manifest
+++ b/dev-python/pyds9/Manifest
@@ -1 +1,2 @@
 DIST pyds9-1.5.tar.gz 2001781 SHA256 8f68a3b5a20a94d674553f2d9724d9c53a1ca1611a66dfb5665054c2091dd76d SHA512 cb3f7e8093d30746d8dce9619a7b4878542d85a327667a8a01b7f32775348116f97e9cb04fddc91366683251d94a045c96636c62a58f54cf25e458b5752bdb7f WHIRLPOOL 4ff41938fb9e3690cf65e287240eca319d35db7e2c33695377da6472d5493c9f743017ecabf7b045494b2a6a8faaa229bd45934d9f19548d303c42ce883bbbd8
+DIST pyds9-1.6.tar.gz 2016740 SHA256 649cb52b9dfa8492f7409733d143562dd0396f6e50d5bdabe9e944ff10956bd7 SHA512 d074a7ff2aace3b8d7eb6c3b720850013f77164b697e227771350c6be641ef54d0990b9a934dd7c18c860fec88066e30171afaa8c53e4c328e8d0a33fd1fc22f WHIRLPOOL 3266b5a48d89ca5d585fb5e1d55c05df256e32685aff44b733e6d43d6f95692db4ac9204d2c3b0d300ca309df26a1a1a47fea0e5a867888adb86da0499eb49ad
diff --git a/dev-python/pyds9/pyds9-1.6.ebuild b/dev-python/pyds9/pyds9-1.6.ebuild
new file mode 100644
index 000000000000..26eb7a5884fe
--- /dev/null
+++ b/dev-python/pyds9/pyds9-1.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyds9/pyds9-1.6.ebuild,v 1.1 2013/04/22 21:52:53 bicatali Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+inherit distutils-r1 multilib
+
+XPAPV=2.1.14
+
+DESCRIPTION="Python interface to XPA to communicate with DS9"
+HOMEPAGE="http://hea-www.harvard.edu/RD/ds9/pyds9/"
+SRC_URI="http://hea-www.harvard.edu/RD/download/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=">=x11-libs/xpa-${XPAPV}"
+RDEPEND="${DEPEND}
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pyfits[${PYTHON_USEDEP}]"
+
+DOCS=(changelog README)
+
+src_prepare() {
+	rm -r xpa-${XPAPV} || die
+	sed -i \
+		-e "/py_modules/s|\],|\])|" \
+		-e '/data_files/,$ d' \
+		setup.py || die
+	sed -i \
+		-e "s|./xpa-${XPAPV}|${EROOT}/usr/$(get_libdir)|" \
+		xpa.py || die
+	sed -i \
+		-e "s|sys.path|${EROOT}/usr/bin|" \
+		ds9.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
index 08916e0428d8..58e469177ba0 100644
--- a/dev-python/pyelftools/Manifest
+++ b/dev-python/pyelftools/Manifest
@@ -1,2 +1 @@
-DIST pyelftools-0.20.tar.gz 278640 SHA256 d02e40a841a8cc38d78cdea8e497f601969e7270ebe00c7e671a3ce73f1cdf45 SHA512 41ca795c0dc84afb4bc6d58ccafc19690bc76ad0aeeb72d3d4edb8a4647ffccfd0b904ceb406f4db8d360f5d701c5f2c5a85ea0a0c6e507de28560dab9837071 WHIRLPOOL 8667f67080530222953e2fb485e418a52c61a49b5e4a0c74e957d7b61844b462b8e2976cc06d773a2ee86826c4c33574b71e82b617c7c274240dc199cc5db7fa
 DIST pyelftools-0.21.tar.gz 283250 SHA256 a9a10d894c698ab3a2d909c3df1c3d88d0ab03811351c278b3f520204f33d834 SHA512 adddfe10756a26d694bb4a048104b04958337dc7a1ab023e4bb50b7fbf5d66fc5b6c4a077699757adb26bd6ffd8885a1908f3daae3d0acd65a704a11499308d3 WHIRLPOOL 1607c311e7b3ec463afe53b239f84f7b47878a613365c2f8809a15df4e5096d7d702a8dcbc91c357b3d5f28297106abaa16540842ad09a4dc2bdd1a648589389
diff --git a/dev-python/pyelftools/files/pyelftools-0.20-dyntags-1.patch b/dev-python/pyelftools/files/pyelftools-0.20-dyntags-1.patch
deleted file mode 100644
index 482fbe90f991..000000000000
--- a/dev-python/pyelftools/files/pyelftools-0.20-dyntags-1.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-# HG changeset patch
-# User Mike Frysinger <vapier@gentoo.org>
-# Date 1352755639 18000
-# Node ID a9c9b2f9ec964e6750dd6f9a96767fe2e9201d85
-# Parent  f3408c7b954910aa3a58e88196efba4954c0cc55
-add support for parsing of the dynamic section/segment and its tags
-
-diff -r f3408c7b9549 -r a9c9b2f9ec96 elftools/elf/dynamic.py
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/elftools/elf/dynamic.py	Mon Nov 12 16:27:19 2012 -0500
-@@ -0,0 +1,115 @@
-+#-------------------------------------------------------------------------------
-+# elftools: elf/dynamic.py
-+#
-+# ELF Dynamic Tags
-+#
-+# Mike Frysinger (vapier@gentoo.org)
-+# This code is in the public domain
-+#-------------------------------------------------------------------------------
-+from .sections import Section
-+from .segments import Segment
-+from ..common.utils import struct_parse
-+
-+from .enums import ENUM_D_TAG
-+
-+
-+class DynamicTag(object):
-+    """ Dynamic Tag object - representing a single dynamic tag entry from a
-+        dynamic section.
-+
-+        Similarly to Section objects, allows dictionary-like access to the
-+        dynamic tag.
-+    """
-+    def __init__(self, entry, elffile):
-+        self.entry = entry
-+        if entry.d_tag == 'DT_NEEDED' or \
-+           entry.d_tag == 'DT_RPATH' or \
-+           entry.d_tag == 'DT_RUNPATH':
-+            dynstr = elffile.get_section_by_name('.dynstr')
-+            setattr(self, entry.d_tag[3:].lower(), dynstr.get_string(self.entry.d_val))
-+
-+    def __getitem__(self, name):
-+        """ Implement dict-like access to entries
-+        """
-+        return self.entry[name]
-+
-+    def __repr__(self):
-+        return '<DynamicTag (%s): %r>' % (self.entry.d_tag, self.entry)
-+
-+    def __str__(self):
-+        if self.entry.d_tag == 'DT_NEEDED' or \
-+           self.entry.d_tag == 'DT_RPATH' or \
-+           self.entry.d_tag == 'DT_RUNPATH':
-+            s = '"%s"' % getattr(self, self.entry.d_tag[3:].lower())
-+        else:
-+            s = '%#x' % self.entry.d_ptr
-+        return '<DynamicTag (%s) %s>' % (self.entry.d_tag, s)
-+
-+
-+class Dynamic(object):
-+    def __init__(self, stream, elffile, position):
-+        self._stream = stream
-+        self._elffile = elffile
-+        self._elfstructs = elffile.structs
-+        self._num_tags = -1;
-+        self._offset = position
-+        self._tagsize = self._elfstructs.Elf_Dyn.sizeof()
-+
-+    def iter_tags(self, type=None):
-+        """ Yield all tags (limit to |type| if specified)
-+        """
-+        offset = self._offset - self._tagsize
-+        for i in range(self.num_tags):
-+            offset += self._tagsize
-+            entry = struct_parse(
-+                self._elfstructs.Elf_Dyn,
-+                self._stream,
-+                stream_pos=offset)
-+            if type is not None and entry.d_tag != type:
-+                continue
-+            yield DynamicTag(entry, self._elffile)
-+
-+    def get_tag(self, n):
-+        """ Get the tag at index #n from the file (DynamicTag object)
-+        """
-+        offset = self._offset + n * self._tagsize
-+        entry = struct_parse(
-+            self._elfstructs.Elf_Dyn,
-+            self._stream,
-+            stream_pos=offset)
-+        return DynamicTag(entry, self._elffile)
-+
-+    @property
-+    def num_tags(self):
-+        """ Number of dynamic tags in the file
-+        """
-+        if self._num_tags != -1:
-+            return self._num_tags
-+
-+        offset = self._offset
-+        while True:
-+            entry = struct_parse(
-+                self._elfstructs.Elf_Dyn,
-+                self._stream,
-+                stream_pos=offset)
-+            if entry.d_tag == 'DT_NULL':
-+                self._num_tags = ((offset - self._offset) // self._tagsize) + 1
-+                break
-+            offset += self._tagsize
-+        return self._num_tags
-+
-+
-+class DynamicSection(Section, Dynamic):
-+    """ ELF dynamic table section.  Knows how to process the list of tags.
-+    """
-+    def __init__(self, header, name, stream, elffile):
-+        Section.__init__(self, header, name, stream)
-+        Dynamic.__init__(self, stream, elffile, self['sh_offset'])
-+
-+
-+class DynamicSegment(Segment, Dynamic):
-+    """ ELF dynamic table segment.  Knows how to process the list of tags.
-+    """
-+    def __init__(self, header, stream, elffile):
-+        Segment.__init__(self, header, stream)
-+        Dynamic.__init__(self, stream, elffile, self['p_offset'])
-diff -r f3408c7b9549 -r a9c9b2f9ec96 elftools/elf/elffile.py
---- a/elftools/elf/elffile.py	Thu Jul 05 06:32:09 2012 +0300
-+++ b/elftools/elf/elffile.py	Mon Nov 12 16:27:19 2012 -0500
-@@ -13,6 +13,7 @@
- from .structs import ELFStructs
- from .sections import (
-         Section, StringTableSection, SymbolTableSection, NullSection)
-+from .dynamic import DynamicSection, DynamicSegment
- from .relocation import RelocationSection, RelocationHandler
- from .segments import Segment, InterpSegment
- from .enums import ENUM_RELOC_TYPE_i386, ENUM_RELOC_TYPE_x64
-@@ -208,6 +209,8 @@
-         segtype = segment_header['p_type']
-         if segtype == 'PT_INTERP':
-             return InterpSegment(segment_header, self.stream)
-+        elif segtype == 'PT_DYNAMIC':
-+            return DynamicSegment(segment_header, self.stream, self)
-         else:
-             return Segment(segment_header, self.stream)
- 
-@@ -241,6 +244,8 @@
-         elif sectype in ('SHT_REL', 'SHT_RELA'):
-             return RelocationSection(
-                 section_header, name, self.stream, self)
-+        elif sectype == 'SHT_DYNAMIC':
-+            return DynamicSection(section_header, name, self.stream, self)
-         else:
-             return Section(section_header, name, self.stream)
- 
-diff -r f3408c7b9549 -r a9c9b2f9ec96 elftools/elf/enums.py
---- a/elftools/elf/enums.py	Thu Jul 05 06:32:09 2012 +0300
-+++ b/elftools/elf/enums.py	Mon Nov 12 16:27:19 2012 -0500
-@@ -186,6 +186,82 @@
-     _default_=Pass,
- )
- 
-+# d_tag
-+ENUM_D_TAG = dict(
-+    DT_NULL=0,
-+    DT_NEEDED=1,
-+    DT_PLTRELSZ=2,
-+    DT_PLTGOT=3,
-+    DT_HASH=4,
-+    DT_STRTAB=5,
-+    DT_SYMTAB=6,
-+    DT_RELA=7,
-+    DT_RELASZ=8,
-+    DT_RELAENT=9,
-+    DT_STRSZ=10,
-+    DT_SYMENT=11,
-+    DT_INIT=12,
-+    DT_FINI=13,
-+    DT_SONAME=14,
-+    DT_RPATH=15,
-+    DT_SYMBOLIC=16,
-+    DT_REL=17,
-+    DT_RELSZ=18,
-+    DT_RELENT=19,
-+    DT_PLTREL=20,
-+    DT_DEBUG=21,
-+    DT_TEXTREL=22,
-+    DT_JMPREL=23,
-+    DT_BIND_NOW=24,
-+    DT_INIT_ARRAY=25,
-+    DT_FINI_ARRAY=26,
-+    DT_INIT_ARRAYSZ=27,
-+    DT_FINI_ARRAYSZ=28,
-+    DT_RUNPATH=29,
-+    DT_FLAGS=30,
-+    DT_ENCODING=32,
-+    DT_PREINIT_ARRAY=32,
-+    DT_PREINIT_ARRAYSZ=33,
-+    DT_NUM=34,
-+    DT_LOOS=0x6000000d,
-+    DT_HIOS=0x6ffff000,
-+    DT_LOPROC=0x70000000,
-+    DT_HIPROC=0x7fffffff,
-+    DT_PROCNUM=0x35,
-+    DT_VALRNGLO=0x6ffffd00,
-+    DT_GNU_PRELINKED=0x6ffffdf5,
-+    DT_GNU_CONFLICTSZ=0x6ffffdf6,
-+    DT_GNU_LIBLISTSZ=0x6ffffdf7,
-+    DT_CHECKSUM=0x6ffffdf8,
-+    DT_PLTPADSZ=0x6ffffdf9,
-+    DT_MOVEENT=0x6ffffdfa,
-+    DT_MOVESZ=0x6ffffdfb,
-+    DT_SYMINSZ=0x6ffffdfe,
-+    DT_SYMINENT=0x6ffffdff,
-+    DT_GNU_HASH=0x6ffffef5,
-+    DT_TLSDESC_PLT=0x6ffffef6,
-+    DT_TLSDESC_GOT=0x6ffffef7,
-+    DT_GNU_CONFLICT=0x6ffffef8,
-+    DT_GNU_LIBLIST=0x6ffffef9,
-+    DT_CONFIG=0x6ffffefa,
-+    DT_DEPAUDIT=0x6ffffefb,
-+    DT_AUDIT=0x6ffffefc,
-+    DT_PLTPAD=0x6ffffefd,
-+    DT_MOVETAB=0x6ffffefe,
-+    DT_SYMINFO=0x6ffffeff,
-+    DT_VERSYM=0x6ffffff0,
-+    DT_RELACOUNT=0x6ffffff9,
-+    DT_RELCOUNT=0x6ffffffa,
-+    DT_FLAGS_1=0x6ffffffb,
-+    DT_VERDEF=0x6ffffffc,
-+    DT_VERDEFNUM=0x6ffffffd,
-+    DT_VERNEED=0x6ffffffe,
-+    DT_VERNEEDNUM=0x6fffffff,
-+    DT_AUXILIARY=0x7ffffffd,
-+    DT_FILTER=0x7fffffff,
-+    _default_=Pass,
-+)
-+
- ENUM_RELOC_TYPE_i386 = dict(
-     R_386_NONE=0,
-     R_386_32=1,
-diff -r f3408c7b9549 -r a9c9b2f9ec96 elftools/elf/structs.py
---- a/elftools/elf/structs.py	Thu Jul 05 06:32:09 2012 +0300
-+++ b/elftools/elf/structs.py	Mon Nov 12 16:27:19 2012 -0500
-@@ -72,6 +72,7 @@
-         self._create_shdr()
-         self._create_sym()
-         self._create_rel()
-+        self._create_dyn()
-     
-     def _create_ehdr(self):
-         self.Elf_Ehdr = Struct('Elf_Ehdr',
-@@ -165,6 +166,13 @@
-             self.Elf_sxword('r_addend'),
-         )
- 
-+    def _create_dyn(self):
-+        self.Elf_Dyn = Struct('Elf_Dyn',
-+            Enum(self.Elf_sxword('d_tag'), **ENUM_D_TAG),
-+            self.Elf_xword('d_val'),
-+            Value('d_ptr', lambda ctx: ctx['d_val']),
-+        )
-+
-     def _create_sym(self):
-         # st_info is hierarchical. To access the type, use
-         # container['st_info']['type']
diff --git a/dev-python/pyelftools/files/pyelftools-0.20-dyntags-2.patch b/dev-python/pyelftools/files/pyelftools-0.20-dyntags-2.patch
deleted file mode 100644
index 02528a907df0..000000000000
--- a/dev-python/pyelftools/files/pyelftools-0.20-dyntags-2.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-# HG changeset patch
-# User Mike Frysinger <vapier@gentoo.org>
-# Date 1354166686 18000
-# Node ID 94901c23fe58ca227aacadcdc5d7ad3045171b24
-# Parent  a9c9b2f9ec964e6750dd6f9a96767fe2e9201d85
-rework dynamic tag walking to avoid doing it twice on the first call to iter_tags
-
-Based on suggestions from David James
-
-diff -r a9c9b2f9ec96 -r 94901c23fe58 elftools/elf/dynamic.py
---- a/elftools/elf/dynamic.py	Mon Nov 12 16:27:19 2012 -0500
-+++ b/elftools/elf/dynamic.py	Thu Nov 29 00:24:46 2012 -0500
-@@ -6,6 +6,8 @@
- # Mike Frysinger (vapier@gentoo.org)
- # This code is in the public domain
- #-------------------------------------------------------------------------------
-+import itertools
-+
- from .sections import Section
- from .segments import Segment
- from ..common.utils import struct_parse
-@@ -20,11 +22,12 @@
-         Similarly to Section objects, allows dictionary-like access to the
-         dynamic tag.
-     """
-+
-+    _HANDLED_TAGS = frozenset(['DT_NEEDED', 'DT_RPATH', 'DT_RUNPATH'])
-+
-     def __init__(self, entry, elffile):
-         self.entry = entry
--        if entry.d_tag == 'DT_NEEDED' or \
--           entry.d_tag == 'DT_RPATH' or \
--           entry.d_tag == 'DT_RUNPATH':
-+        if entry.d_tag in self._HANDLED_TAGS:
-             dynstr = elffile.get_section_by_name('.dynstr')
-             setattr(self, entry.d_tag[3:].lower(), dynstr.get_string(self.entry.d_val))
- 
-@@ -37,9 +40,7 @@
-         return '<DynamicTag (%s): %r>' % (self.entry.d_tag, self.entry)
- 
-     def __str__(self):
--        if self.entry.d_tag == 'DT_NEEDED' or \
--           self.entry.d_tag == 'DT_RPATH' or \
--           self.entry.d_tag == 'DT_RUNPATH':
-+        if self.entry.d_tag in self._HANDLED_TAGS:
-             s = '"%s"' % getattr(self, self.entry.d_tag[3:].lower())
-         else:
-             s = '%#x' % self.entry.d_ptr
-@@ -58,16 +59,12 @@
-     def iter_tags(self, type=None):
-         """ Yield all tags (limit to |type| if specified)
-         """
--        offset = self._offset - self._tagsize
--        for i in range(self.num_tags):
--            offset += self._tagsize
--            entry = struct_parse(
--                self._elfstructs.Elf_Dyn,
--                self._stream,
--                stream_pos=offset)
--            if type is not None and entry.d_tag != type:
--                continue
--            yield DynamicTag(entry, self._elffile)
-+        for n in itertools.count():
-+            tag = self.get_tag(n)
-+            if type is None or tag.entry.d_tag == type:
-+                yield tag
-+            if tag.entry.d_tag == 'DT_NULL':
-+                break
- 
-     def get_tag(self, n):
-         """ Get the tag at index #n from the file (DynamicTag object)
-@@ -86,17 +83,11 @@
-         if self._num_tags != -1:
-             return self._num_tags
- 
--        offset = self._offset
--        while True:
--            entry = struct_parse(
--                self._elfstructs.Elf_Dyn,
--                self._stream,
--                stream_pos=offset)
--            if entry.d_tag == 'DT_NULL':
--                self._num_tags = ((offset - self._offset) // self._tagsize) + 1
--                break
--            offset += self._tagsize
--        return self._num_tags
-+        for n in itertools.count():
-+            tag = self.get_tag(n)
-+            if tag.entry.d_tag == 'DT_NULL':
-+                self._num_tags = n
-+                return n
- 
- 
- class DynamicSection(Section, Dynamic):
diff --git a/dev-python/pyelftools/files/pyelftools-0.21-dyntable.patch b/dev-python/pyelftools/files/pyelftools-0.21-dyntable.patch
new file mode 100644
index 000000000000..e43e6cb0a4db
--- /dev/null
+++ b/dev-python/pyelftools/files/pyelftools-0.21-dyntable.patch
@@ -0,0 +1,143 @@
+changeset:   207:92736c403d53
+tag:         tip
+user:        Mike Frysinger <vapier@gentoo.org>
+date:        Mon Apr 22 19:02:21 2013 -0400
+summary:     support parsing of dynamic ELFs w/out section headers
+
+At runtime, ELFs do not use the section headers at all. Instead, only
+the program segments and dynamic tags get used. This means you can
+strip the section table completely from an ELF and have it still work.
+
+In practice, people rarely do this, but it's not unheard of. Make the
+Dynamic tags work even in these cases by loading the strings table the
+same way the runtime loader does:
+- parse the symtab address from DT_STRTAB
+- locate the file offset via the program segments
+
+In order to avoid circular deps (parsing a dyntag requires walking parsed
+dyntags), add a set of internal funcs for returning the raw values.
+
+diff --git a/elftools/elf/dynamic.py b/elftools/elf/dynamic.py
+--- a/elftools/elf/dynamic.py
++++ b/elftools/elf/dynamic.py
+@@ -10,11 +10,26 @@
+ 
+ from .sections import Section
+ from .segments import Segment
+-from ..common.utils import struct_parse
++from ..common.utils import struct_parse, parse_cstring_from_stream
+ 
+ from .enums import ENUM_D_TAG
+ 
+ 
++class _DynamicStringTable(object):
++    """ Bare string table based on values found via ELF dynamic tags and
++        loadable segments only.  Good enough for get_string() only.
++    """
++    def __init__(self, stream, table_offset):
++        self._stream = stream
++        self._table_offset = table_offset
++
++    def get_string(self, offset):
++        """ Get the string stored at the given offset in this string table.
++        """
++        return parse_cstring_from_stream(self._stream,
++                                         self._table_offset + offset)
++
++
+ class DynamicTag(object):
+     """ Dynamic Tag object - representing a single dynamic tag entry from a
+         dynamic section.
+@@ -27,10 +42,9 @@
+     _HANDLED_TAGS = frozenset(
+         ['DT_NEEDED', 'DT_RPATH', 'DT_RUNPATH', 'DT_SONAME'])
+ 
+-    def __init__(self, entry, elffile):
++    def __init__(self, entry, dynstr):
+         self.entry = entry
+-        if entry.d_tag in self._HANDLED_TAGS:
+-            dynstr = elffile.get_section_by_name(b'.dynstr')
++        if entry.d_tag in self._HANDLED_TAGS and dynstr:
+             setattr(self, entry.d_tag[3:].lower(),
+                     dynstr.get_string(self.entry.d_val))
+ 
+@@ -60,26 +74,66 @@
+         self._num_tags = -1
+         self._offset = position
+         self._tagsize = self._elfstructs.Elf_Dyn.sizeof()
++        self.__string_table = None
++
++    @property
++    def _string_table(self):
++        if self.__string_table:
++            return self.__string_table
++
++        # If the ELF has stripped its section table (which is unusual, but
++        # perfectly valid), we need to use the dynamic tags to locate the
++        # dynamic string table.
++        strtab = None
++        for tag in self._iter_tags(type='DT_STRTAB'):
++            strtab = tag['d_val']
++            break
++        # If we found a dynamic string table, locate the offset in the file
++        # by using the program headers.
++        if strtab:
++            for segment in self._elffile.iter_segments():
++                if (strtab >= segment['p_vaddr'] and
++                    strtab < segment['p_vaddr'] + segment['p_filesz']):
++                    self.__string_table = _DynamicStringTable(
++                        self._stream,
++                        segment['p_offset'] + (strtab - segment['p_vaddr']))
++                    return self.__string_table
++
++        # That didn't work for some reason.  Let's use the section header
++        # even though this ELF is super weird.
++        self.__string_table = self._elffile.get_section_by_name(b'.dynstr')
++
++        return self.__string_table
++
++    def _iter_tags(self, type=None):
++        """ Yield all raw tags (limit to |type| if specified)
++        """
++        for n in itertools.count():
++            tag = self._get_tag(n)
++            if type is None or tag['d_tag'] == type:
++                yield tag
++            if tag['d_tag'] == 'DT_NULL':
++                break
+ 
+     def iter_tags(self, type=None):
+         """ Yield all tags (limit to |type| if specified)
+         """
+-        for n in itertools.count():
+-            tag = self.get_tag(n)
+-            if type is None or tag.entry.d_tag == type:
+-                yield tag
+-            if tag.entry.d_tag == 'DT_NULL':
+-                break
++        for tag in self._iter_tags(type=type):
++            yield DynamicTag(tag, self._string_table)
++
++    def _get_tag(self, n):
++        """ Get the raw tag at index #n from the file
++        """
++        offset = self._offset + n * self._tagsize
++        return struct_parse(
++            self._elfstructs.Elf_Dyn,
++            self._stream,
++            stream_pos=offset)
+ 
+     def get_tag(self, n):
+         """ Get the tag at index #n from the file (DynamicTag object)
+         """
+-        offset = self._offset + n * self._tagsize
+-        entry = struct_parse(
+-            self._elfstructs.Elf_Dyn,
+-            self._stream,
+-            stream_pos=offset)
+-        return DynamicTag(entry, self._elffile)
++        return DynamicTag(self._get_tag(n), self._string_table)
+ 
+     def num_tags(self):
+         """ Number of dynamic tags in the file
+
diff --git a/dev-python/pyelftools/metadata.xml b/dev-python/pyelftools/metadata.xml
index 2fa32ac12edd..252878b94ad6 100644
--- a/dev-python/pyelftools/metadata.xml
+++ b/dev-python/pyelftools/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
+	<maintainer>
+		<email>vapier@gentoo.org</email>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyelftools</remote-id>
 		<remote-id type="bitbucket">eliben/pyelftools</remote-id>
diff --git a/dev-python/pyelftools/pyelftools-0.20-r2.ebuild b/dev-python/pyelftools/pyelftools-0.20-r2.ebuild
deleted file mode 100644
index f6a37408f1fc..000000000000
--- a/dev-python/pyelftools/pyelftools-0.20-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyelftools/pyelftools-0.20-r2.ebuild,v 1.1 2013/01/21 02:39:53 idella4 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_2} )
-inherit distutils-r1 eutils
-
-DESCRIPTION="pure-Python library for parsing and analyzing ELF files and DWARF debugging information"
-HOMEPAGE="http://pypi.python.org/pypi/pyelftools https://bitbucket.org/eliben/pyelftools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-src_prepare() {
-	distutils-r1_src_prepare
-	epatch "${FILESDIR}"/${P}-dyntags-{1,2}.patch
-}
-
-python_test() {
-	# readelf_tests fails
-	local test
-		for test in all_unittests examples_test; do
-			PYTHONPATH=$(ls -d build-${PYTHON_ABI}/lib/) "${PYTHON}" ./test/run_${test}.py || die
-		done
-}
diff --git a/dev-python/pyelftools/pyelftools-0.20.ebuild b/dev-python/pyelftools/pyelftools-0.20.ebuild
deleted file mode 100644
index 1af85a08a4cc..000000000000
--- a/dev-python/pyelftools/pyelftools-0.20.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/dev-python/pyelftools/pyelftools-0.20.ebuild,v 1.1 2012/11/01 05:44:11 vapier Exp $
-
-EAPI="4"
-
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="pure-Python library for parsing and analyzing ELF files and DWARF debugging information"
-HOMEPAGE="http://pypi.python.org/pypi/pyelftools https://bitbucket.org/eliben/pyelftools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_test() {
-	local t
-	# readelf_tests fails
-	for t in all_unittests examples_test ; do
-		./test/run_${t}.py || die
-	done
-}
diff --git a/dev-python/pyelftools/pyelftools-0.21-r1.ebuild b/dev-python/pyelftools/pyelftools-0.21-r1.ebuild
deleted file mode 100644
index f1168dbabbae..000000000000
--- a/dev-python/pyelftools/pyelftools-0.21-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyelftools/pyelftools-0.21-r1.ebuild,v 1.1 2013/04/20 17:15:54 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python library for parsing and analyzing ELF files and DWARF debugging information"
-HOMEPAGE="http://pypi.python.org/pypi/pyelftools https://bitbucket.org/eliben/pyelftools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-python_test() {
-	# readelf_tests often fails due to host `readelf` changing output format
-	local t
-	for t in all_unittests examples_test ; do
-		"${PYTHON}" ./test/run_${t}.py || die "Tests fail with ${EPYTHON}"
-	done
-}
diff --git a/dev-python/pyelftools/pyelftools-0.20-r1.ebuild b/dev-python/pyelftools/pyelftools-0.21-r2.ebuild
similarity index 70%
rename from dev-python/pyelftools/pyelftools-0.20-r1.ebuild
rename to dev-python/pyelftools/pyelftools-0.21-r2.ebuild
index 4bf1a5a2f725..44c5b1c6be74 100644
--- a/dev-python/pyelftools/pyelftools-0.20-r1.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.21-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyelftools/pyelftools-0.20-r1.ebuild,v 1.2 2013/01/21 02:39:53 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyelftools/pyelftools-0.21-r2.ebuild,v 1.1 2013/04/24 01:35:21 vapier Exp $
 
 EAPI="4"
 
@@ -17,14 +17,17 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE=""
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-dyntags-{1,2}.patch
-	distutils_src_prepare
+	epatch "${FILESDIR}"/${P}-dyntable.patch
 }
 
-src_test() {
+python_test() {
+	# readelf_tests often fails due to host `readelf` changing output format
 	local t
-	# readelf_tests fails
 	for t in all_unittests examples_test ; do
-		./test/run_${t}.py || die
+		PYTHONPATH=$(_distutils_get_PYTHONPATH) "$(PYTHON)" ./test/run_${t}.py || die
 	done
 }
+
+src_test() {
+	python_execute_function python_test
+}
diff --git a/dev-python/pyfits/Manifest b/dev-python/pyfits/Manifest
index b8d7c61f1864..6d164b715d21 100644
--- a/dev-python/pyfits/Manifest
+++ b/dev-python/pyfits/Manifest
@@ -1,4 +1,2 @@
 DIST pyfits-2.4.0.tar.gz 284236 SHA256 40c21106b86ad01264780409ecb2c8102e80c3eaf2085224f370fc7b3b07ea22 SHA512 cdbcf8b4e178cde8723eb9386a52e59c9d66462479491d0b0ae1d436c91cc476748c00e837477acf9a46791cd4a7517ff649434c33c225ba8a396148e4485fa1 WHIRLPOOL 2c22a63bd180ad68bf3001d539c403147eecc01dc5537f9c1b0be582c79dd87297f91f33809dec6c9f5906396d409af5b4495ef0b68fe6cc03d816a51a286e50
-DIST pyfits-3.0.8.tar.gz 683390 SHA256 cd5aa6911b1f56daf634f9d29ca6942cc54bd8924b1d9a5ed0fef570ed34c5ec SHA512 376183308394a34b7d6a05caeb3757d2baddeeb139b4d475c954051e8b0e7bdc9f6644d5405a668e9cfce9a348980b65478cd66bad6207868f65d35b7ca44550 WHIRLPOOL 6ccb872c38dc1fdbca4073b570a4b38530aa158239b64e6147f58329bb725ae3682cc4451c466291b650f86131d6157c512625798aa7dba6d3c033762e48d8a7
 DIST pyfits-3.1.1.tar.gz 775299 SHA256 5c87a050dc9ea8c1572c09f8ab46f59cc77b7b11cd7d41af35ae46939e32813a SHA512 9fe25a4d92245e07cab2a8bdc490a9bad3ad0f4f9f2e8d24e93710fe2bdf4d98f0a7167a23396861637c6ec6df25c3d306f678edc922f6aac5a6412f06de4147 WHIRLPOOL f45851f9a506d6245f1aa1f69c513430744f771c4e808050b3f8aa24f3450d735ebc18204bf5e6a16d8288f1479b8658887c8a689d605ac4bbdaa57475912cb4
-DIST pyfits-3.1.tar.gz 766083 SHA256 0c12f135fe7b519231f2b19e7699811f94b94bfd4728b0a3e7966d6648cc5790 SHA512 7e377699d4e0a0616177f3d56ce9bffb4a3e1a68a377ad16f8ef2b942f530187289ffff922ba59e1155cbb49b911fd7b6b057a8ba9582073922f0836fc731c61 WHIRLPOOL 00b78d3a53a79eef22728ea36b8f7632ca8ea29df0aeb9c40ec55a4678b670bc5e2d571ff4d7e48f78e9441f9ba03748186bad7803d8cf07eba5346087dd14a6
diff --git a/dev-python/pyfits/metadata.xml b/dev-python/pyfits/metadata.xml
index b47d563f34f6..f413ce9b6b03 100644
--- a/dev-python/pyfits/metadata.xml
+++ b/dev-python/pyfits/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-astronomy</herd>
-	<herd>python</herd>
-	<longdescription lang="en">PyFITS provides an interface to FITS formatted files under the
-    Python scripting language and PyRAF, the Python-based interface to
-    IRAF.</longdescription>
-	<upstream>
-		<remote-id type="pypi">pyfits</remote-id>
-	</upstream>
+<herd>sci-astronomy</herd>
+<herd>python</herd>
+<longdescription lang="en">
+  PyFITS provides an interface to FITS formatted files under the
+  Python scripting language and PyRAF, the Python-based interface to
+  IRAF.
+</longdescription>
+<upstream>
+  <remote-id type="pypi">pyfits</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyfits/pyfits-3.0.8.ebuild b/dev-python/pyfits/pyfits-3.0.8.ebuild
deleted file mode 100644
index 4e1829b84cc3..000000000000
--- a/dev-python/pyfits/pyfits-3.0.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.0.8.ebuild,v 1.4 2012/08/08 19:11:00 bicatali Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="*:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 2.7-pypy-*"
-DISTUTILS_SRC_TEST=nosetests
-
-inherit distutils eutils
-
-DESCRIPTION="Provides an interface to FITS formatted files under python"
-HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits http://pypi.python.org/pypi/pyfits"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/numpy
-	dev-python/setuptools
-	!dev-python/astropy"
-DEPEND="${RDEPEND}
-	dev-python/stsci-distutils
-	dev-python/d2to1"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-debundle_zlib.patch
-	distutils_src_prepare
-}
-
-src_test() {
-	testing() {
-		nosetests -w "$(ls -d build-${PYTHON_ABI}/lib*)"
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/pyfits/pyfits-3.1.1-r1.ebuild b/dev-python/pyfits/pyfits-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..5599a2f72ad1
--- /dev/null
+++ b/dev-python/pyfits/pyfits-3.1.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.1.1-r1.ebuild,v 1.1 2013/04/22 21:50:31 bicatali Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+inherit distutils-r1 eutils
+
+DESCRIPTION="Provides an interface to FITS formatted files under python"
+HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	!dev-python/astropy"
+DEPEND="${RDEPEND}
+	dev-python/stsci-distutils[${PYTHON_USEDEP}]
+	dev-python/d2to1[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.0.8-debundle_zlib.patch )
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	nosetests || die
+}
diff --git a/dev-python/pyfits/pyfits-3.1.ebuild b/dev-python/pyfits/pyfits-3.1.ebuild
deleted file mode 100644
index c2763e4c2165..000000000000
--- a/dev-python/pyfits/pyfits-3.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.1.ebuild,v 1.2 2012/10/12 09:35:57 patrick Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="*:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 2.7-pypy-* 3.3"
-DISTUTILS_SRC_TEST=nosetests
-
-inherit distutils eutils
-
-DESCRIPTION="Provides an interface to FITS formatted files under python"
-HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits http://pypi.python.org/pypi/pyfits"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/numpy
-	dev-python/setuptools
-	!dev-python/astropy"
-DEPEND="${RDEPEND}
-	dev-python/stsci-distutils
-	dev-python/d2to1"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.8-debundle_zlib.patch
-	distutils_src_prepare
-}
-
-src_test() {
-	testing() {
-		nosetests -w "$(ls -d build-${PYTHON_ABI}/lib*)"
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild b/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild
index 90df82d72442..9dc97aaf44c5 100644
--- a/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild
+++ b/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild,v 1.3 2012/11/12 19:06:58 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild,v 1.4 2013/04/23 05:35:51 patrick Exp $
 
 EAPI="4"
 PYTHON_DEPEND="*:2.6"
@@ -8,6 +8,8 @@ SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.5 *-jython 2.7-pypy-*"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 
+WANT_AUTOMAKE="1.12"
+
 inherit autotools eutils python
 
 MY_PN="PythonMagick"
@@ -26,7 +28,7 @@ RDEPEND=">=dev-libs/boost-1.48[python]
 	>=media-gfx/imagemagick-6.4"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	>=sys-devel/automake-1.12"
+	"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/pywcs/pywcs-1.11.ebuild b/dev-python/pywcs/pywcs-1.11.ebuild
index 3a1f3d6dc117..afd721b373c7 100644
--- a/dev-python/pywcs/pywcs-1.11.ebuild
+++ b/dev-python/pywcs/pywcs-1.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pywcs/pywcs-1.11.ebuild,v 1.5 2012/10/16 09:03:59 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pywcs/pywcs-1.11.ebuild,v 1.6 2013/04/23 16:00:52 bicatali Exp $
 
 EAPI=4
 
@@ -25,7 +25,8 @@ CDEPEND=">=sci-astronomy/wcslib-${WCS_V}"
 DEPEND="${CDEPEND}
 	  virtual/pkgconfig"
 RDEPEND="${CDEPEND}
-	  dev-python/pyfits"
+	dev-python/pyfits
+	!dev-python/astropy"
 
 S=${WORKDIR}/${MYP}
 
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 2d40b9f16200..09bd23cadd38 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,3 +1,4 @@
 DIST sip-4.13.3.tar.gz 734458 SHA256 ec295f71ef339c5b98db5650865f2c6c1200c4085b7a3f33f284111e1f534ac1 SHA512 2e27bfbb79285e420c8989f620dca52b7bf5f0c70377c4e50def20f3440bae60c5a4cd12d03ec40f1270ddcce4f2137b3b1accd6f6646292855c8b344afd9059 WHIRLPOOL 3304b0865f3cc7f015b719a083d6632efeafa7b9233a5138397c222ef01f1a2ed74f2e793b193b8576571f0af1b549111a964ee21106d3b1818eba696943ae1a
 DIST sip-4.14.3.tar.gz 747092 SHA256 a84fcaf0e400a45496fe70f0cf1adc7eddf0788ade44a4567d51db8bf1ff5770 SHA512 8e91ef5efbdb84d22812b392e2fb7bfdd6e8b798d49245b7ba945f24a452475be4f5bee0d11a7a00553ec8d1628ee80542a910f87e24fe5dcc1b81fd8b9b122a WHIRLPOOL 0d8634aa175239066c387244e9296a51123ae4219419c346ff93ff68dc451af75b0cd8d136e03658ea280930b3bde7acb50d65a4e138ffbe9268a7acd69a9e62
 DIST sip-4.14.5.tar.gz 749843 SHA256 47eeff6cc6456c3ef353630472b681b2fe4e8076c8e85a7801cd9265d45f4e90 SHA512 0100197678bfe1742b35817eeed40f9b38375b146c412679f24c11faa4f0ac02abade79d1567a23d107d28916322f97fc16ddc3600fc1e23c0721385a99a6650 WHIRLPOOL e49b9c49267d840e0a22c98c9d56f8d49f7efd8bcc7eb4b250db43962ab7b50cca615bab6fe5ac87edd693ca7b0dbee8bb408e13e60c6c0c1ee2c16242fb99d6
+DIST sip-4.14.6.tar.gz 749965 SHA256 4adda378be3ed0c2bb15f502b8437be72ddada20201b9433ea0df50c7b698daf SHA512 b8ad6c98a98c7e568096f8c24cf2ac4df312634c4442c769643a647de9243ed5d40519a633d3ec042c2004543f5f41bbc8112b07a1abef0c930f6d6d2ec823e2 WHIRLPOOL 815f46c43c7ceb679f2956f5b1f01513d37705ac770667d812566c52a1c2a9d51ddb59d3aaf1412ecd5de2619e84b3791db5ded30adc69f28cb0e827b4286bbd
diff --git a/dev-python/sip/sip-4.14.6.ebuild b/dev-python/sip/sip-4.14.6.ebuild
new file mode 100644
index 000000000000..b01b917ef835
--- /dev/null
+++ b/dev-python/sip/sip-4.14.6.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.14.6.ebuild,v 1.1 2013/04/23 03:33:30 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+
+inherit eutils python-r1 toolchain-funcs
+
+DESCRIPTION="Python extension module generator for C and C++ libraries"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/software/sip/intro http://pypi.python.org/pypi/SIP"
+LICENSE="|| ( GPL-2 GPL-3 sip )"
+
+if [[ ${PV} == *9999* ]]; then
+	# live version from mercurial repo
+	EHG_REPO_URI="http://www.riverbankcomputing.com/hg/sip"
+	inherit mercurial
+elif [[ ${PV} == *_pre* ]]; then
+	# development snapshot
+	HG_REVISION=
+	MY_P=${PN}-${PV%_pre*}-snapshot-${HG_REVISION}
+	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
+else
+	# official release
+	SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
+fi
+
+# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
+SLOT="0/9"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="debug doc"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+[[ ${PV} == *9999* ]] && DEPEND+="
+	=dev-lang/python-2*
+	sys-devel/bison
+	sys-devel/flex
+	doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.9.3-darwin.patch
+
+	if [[ ${PV} == *9999* ]]; then
+		python2 build.py prepare || die
+		if use doc; then
+			python2 build.py doc || die
+		fi
+	fi
+
+	# Sub-slot sanity check
+	local sub_slot=${SLOT#*/}
+	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
+	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	python_copy_sources
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}" configure.py
+			--bindir="${EPREFIX}/usr/bin"
+			--destdir="$(python_get_sitedir)"
+			--incdir="$(python_get_includedir)"
+			--sipdir="${EPREFIX}/usr/share/sip"
+			$(use debug && echo --debug)
+			AR="$(tc-getAR) cqs"
+			CC="$(tc-getCC)"
+			CFLAGS="${CFLAGS}"
+			CFLAGS_RELEASE=
+			CXX="$(tc-getCXX)"
+			CXXFLAGS="${CXXFLAGS}"
+			CXXFLAGS_RELEASE=
+			LINK="$(tc-getCXX)"
+			LINK_SHLIB="$(tc-getCXX)"
+			LFLAGS="${LDFLAGS}"
+			LFLAGS_RELEASE=
+			RANLIB=
+			STRIP=
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}"
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake DESTDIR="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	dodoc NEWS
+	use doc && dohtml -r doc/html/*
+}
diff --git a/dev-python/sleekxmpp/Manifest b/dev-python/sleekxmpp/Manifest
new file mode 100644
index 000000000000..e8f055bab09b
--- /dev/null
+++ b/dev-python/sleekxmpp/Manifest
@@ -0,0 +1 @@
+DIST sleekxmpp-1.1.11.tar.gz 1303266 SHA256 f28e7de712dac23aff0ab5ff420da28dcd3b2e9d696ddc1c307570cfb5a08b4d SHA512 3b746d0fd93a1d2ca5a6965ab568c1516a89e5b4b046eee4f0c872c8eaf17b8c5b60090c2623e35c4bea6a1025c832d946b4bc76d9a396a03833d9799f2ab5eb WHIRLPOOL 1da74c284bd5957bdf4c6018ddbd956b7000e86e3ebd4388c8e9ed53b475063f5f498b0f0236251f9147fee2e5b5110876c306d4a985fcc4ac3b6a175df9a89a
diff --git a/dev-python/sleekxmpp/files/sleekxmpp-1.1.11-tests-exit-code.patch b/dev-python/sleekxmpp/files/sleekxmpp-1.1.11-tests-exit-code.patch
new file mode 100644
index 000000000000..f424c353a07d
--- /dev/null
+++ b/dev-python/sleekxmpp/files/sleekxmpp-1.1.11-tests-exit-code.patch
@@ -0,0 +1,13 @@
+--- sleekxmpp-1.1.11/testall.py
++++ sleekxmpp-1.1.11/testall.py
+@@ -52,7 +52,9 @@
+         pass
+ 
+     def run(self):
+-        run_tests()
++        result = run_tests()
++        if not result.wasSuccessful():
++            sys.exit(1)
+ 
+ 
+ if __name__ == '__main__':
diff --git a/dev-python/sleekxmpp/metadata.xml b/dev-python/sleekxmpp/metadata.xml
new file mode 100644
index 000000000000..de4bfc9703b9
--- /dev/null
+++ b/dev-python/sleekxmpp/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <maintainer>
+    <email>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">fritzy/SleekXMPP</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sleekxmpp/sleekxmpp-1.1.11.ebuild b/dev-python/sleekxmpp/sleekxmpp-1.1.11.ebuild
new file mode 100644
index 000000000000..12429b7b3398
--- /dev/null
+++ b/dev-python/sleekxmpp/sleekxmpp-1.1.11.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sleekxmpp/sleekxmpp-1.1.11.ebuild,v 1.1 2013/04/23 05:38:02 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+# tests currently fail under 3.3
+
+inherit eutils distutils-r1
+
+DESCRIPTION="Python library for XMPP"
+HOMEPAGE="http://sleekxmpp.com/ https://github.com/fritzy/SleekXMPP/ https://pypi.python.org/pypi/sleekxmpp/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="app-crypt/gnupg"
+
+PATCHES=( "${FILESDIR}"/${P}-tests-exit-code.patch )
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/zsi/metadata.xml b/dev-python/zsi/metadata.xml
index 45a8bfabc6f6..5a2028cd9c40 100644
--- a/dev-python/zsi/metadata.xml
+++ b/dev-python/zsi/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<maintainer>
-		<email>angelos@gentoo.org</email>
-		<name>Christoph Mende</name>
-	</maintainer>
-	<use>
-		<flag name='twisted'>add support for <pkg>dev-python/twisted</pkg></flag>
-	</use>
+  <herd>python</herd>
+  <maintainer>
+    <email>angelos@gentoo.org</email>
+    <name>Christoph Mende</name>
+  </maintainer>
+  <use>
+    <flag name="twisted">add support for <pkg>dev-python/twisted</pkg></flag>
+  </use>
 </pkgmetadata>
-
diff --git a/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild b/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild
new file mode 100644
index 000000000000..6d087f3d92e1
--- /dev/null
+++ b/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild,v 1.2 2013/04/23 15:11:28 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+MY_PN="ZSI"
+MY_P="${MY_PN}-${PV/_alpha/-a}"
+
+DESCRIPTION="Web Services for Python"
+HOMEPAGE="http://pywebsvcs.sourceforge.net/zsi.html"
+SRC_URI="mirror://sourceforge/pywebsvcs/${MY_P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc examples twisted"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	twisted? (
+		dev-python/twisted
+		dev-python/twisted-web
+	)"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	if ! use twisted; then
+		sed -i \
+			-e "/version_info/d"\
+			-e "/ZSI.twisted/d"\
+			setup.py || die "sed failed"
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dohtml doc/*.{html,css,png}
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r doc/examples/* samples/*
+	fi
+}
diff --git a/dev-ruby/libxml/libxml-2.4.0.ebuild b/dev-ruby/libxml/libxml-2.4.0.ebuild
index 3e61b54b286e..33eb95ec3e59 100644
--- a/dev-ruby/libxml/libxml-2.4.0.ebuild
+++ b/dev-ruby/libxml/libxml-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.4.0.ebuild,v 1.2 2013/04/22 18:33:41 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.4.0.ebuild,v 1.7 2013/04/23 15:05:38 jer Exp $
 
 EAPI=2
 
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/xml4r/libxml-ruby"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="${RDEPEND} dev-libs/libxml2"
diff --git a/dev-ruby/locale/locale-2.0.8.ebuild b/dev-ruby/locale/locale-2.0.8.ebuild
index 1199c94f3761..b22d80b06ba7 100644
--- a/dev-ruby/locale/locale-2.0.8.ebuild
+++ b/dev-ruby/locale/locale-2.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/locale/locale-2.0.8.ebuild,v 1.2 2013/04/02 03:59:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/locale/locale-2.0.8.ebuild,v 1.3 2013/04/23 17:07:42 graaff Exp $
 
 EAPI=4
 
@@ -23,7 +23,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-macos"
 SLOT="0"
 IUSE=""
 
-ruby_add_bdepend "dev-ruby/yard"
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/test-unit-rr )"
 
@@ -34,7 +34,9 @@ all_ruby_prepare() {
 all_ruby_compile() {
 	all_fakegem_compile
 
-	yard || die
+	if use doc ; then
+		yard || die
+	fi
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/vlad/Manifest b/dev-ruby/vlad/Manifest
index 7bcb0889de07..9d8c5e1a8a82 100644
--- a/dev-ruby/vlad/Manifest
+++ b/dev-ruby/vlad/Manifest
@@ -1,2 +1,3 @@
 DIST vlad-2.2.5.gem 27136 SHA256 4f6486ce17603ab10d0c8685d70567ba674cb05d921177b10246620631ebad0a SHA512 f81d3de5e05e64122fdf8fae724813829145ee2b94f6ed5a28aa870e99d34736d91856dfd71d967addb4fc566b0c0538163b5512f916eea564366bead7c4e6ec WHIRLPOOL 230c9a4fa02702d6c575db1e9af86414a805613dad5ec6cf83821b13f45127d9ac7f8cc3833a81229a03ae1ace3116063ed2dab96ad4db79a5ecb77de8bda88f
 DIST vlad-2.3.1.gem 27136 SHA256 6ebd90140b81aa8b7aca785478e9fc1113256d6489ac3f971dfc4039ab16b943 SHA512 ce7e02ac30b7f54de2cec9575ac32f416b62ed8e818404adb73c3f80fcbb0e36b4fdad32ac92d349b54bc8920ac135cecdc5673692de7c8a0c760735e6877a73 WHIRLPOOL 4b04a7a98c1beb4c6946a489c919a8b3fe73111a15e478c85de0fc74ef92f20b97a9170ecf50e74a6aa13ac07aae1cea4fee0772c4f6f659d76eb81908451b5f
+DIST vlad-2.4.1.gem 27136 SHA256 7e6ae9db517cdb8429be28980513a02bf8ba7f3edeb6e15ba0a7000ff9a5d4af SHA512 6a451958d4910197438993ae9151e1da3dd5a1b3cb98e92448b43a8e65d98335dbede7ceec2ab9cff4405a7f18e3e615c2fc3cce1f3f252b229b6ae21d517c73 WHIRLPOOL 73cd8cd8a6bd15ccc93c95e22a3c7eab16bb887ad013269f213d3da6aa8ae02c07f4ca1d39a377525d24a2d2bcb2dfcdf2aa452a0f1961d5abdc8482d80413d7
diff --git a/dev-ruby/vlad/vlad-2.4.1.ebuild b/dev-ruby/vlad/vlad-2.4.1.ebuild
new file mode 100644
index 000000000000..5f8df80b3e26
--- /dev/null
+++ b/dev-ruby/vlad/vlad-2.4.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/vlad/vlad-2.4.1.ebuild,v 1.1 2013/04/23 05:52:32 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="considerations.txt History.txt README.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pragmatic application deployment automation, without mercy."
+HOMEPAGE="http://rubyhitsquad.com/Vlad_the_Deployer.html"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_bdepend ">=dev-ruby/hoe-2.9.2 test? ( dev-ruby/minitest )"
+ruby_add_rdepend ">=dev-ruby/rake-remote_task-2.1"
+
+all_ruby_prepare() {
+	# Keep Isolate from managing the dependencies.
+	sed -i -e '/isolate/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/webrobots/Manifest b/dev-ruby/webrobots/Manifest
index 820c2beaed2d..d114f6f24dc6 100644
--- a/dev-ruby/webrobots/Manifest
+++ b/dev-ruby/webrobots/Manifest
@@ -1 +1,2 @@
 DIST webrobots-0.0.13.gem 16384 SHA256 eade843b13ee1927ebda438eb5e6e856552787c8c92d47e586fe93f908eedbf8 SHA512 abb9bfd6c54cba1f557811e4c1703ed7a8d889bf3126c0fbccc7c601e0907551ffa43fcb86dc602cd572142060acfe12e2a1222f48f12030b8069f399b175db2 WHIRLPOOL 837b77aa6ca139e824b8838dc8140aff3863610bfcd6e80837b23c5de664682d5a45983b560e1b941d5276aeea86be50f6391d22255dd70340979e4170c8feb8
+DIST webrobots-0.1.1.gem 17408 SHA256 568c5e5a149c5e7fbd5065522bb986ddd8f147e8586818ab7e79d6a02e8496ca SHA512 f303c238620d17cb64064d11eb352d2afb32529f7092609484e5e232ccbc903683f89116a0e5232605b6d0286a4a76b82e71e44884a7b77d12125f3b3c6c5a34 WHIRLPOOL e7fa930ccebb17b0d785c3a4d0257d6fcd255816913b7a8e1f3c8ec4cd1a0e42d9040c30e6a3b4e28114dfc106f60c6161f6f4055686c0c6688bc781d6772b00
diff --git a/dev-ruby/webrobots/webrobots-0.1.1.ebuild b/dev-ruby/webrobots/webrobots-0.1.1.ebuild
new file mode 100644
index 000000000000..e0d566a41324
--- /dev/null
+++ b/dev-ruby/webrobots/webrobots-0.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webrobots/webrobots-0.1.1.ebuild,v 1.1 2013/04/23 06:23:17 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library to help write robots.txt compliant web robots."
+HOMEPAGE="http://rubygems.org/gems/webrobots"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.4.4"
+
+ruby_add_bdepend "test? ( dev-ruby/shoulda dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/,/end/d' Rakefile test/helper.rb || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib test/test_*.rb
+}
diff --git a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
index c0819d88acc8..af92df0db90d 100644
--- a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
+++ b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.10.2-r2.ebuild,v 1.1 2013/04/14 17:41:44 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.10.2-r2.ebuild,v 1.2 2013/04/23 19:42:17 grobian Exp $
 
 EAPI=5
 
@@ -52,6 +52,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
 	"${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
 	"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
 	"${FILESDIR}"/${PN}-2.8.10-desktop.patch
 	"${FILESDIR}"/${PN}-2.8.10-libform.patch
 	"${FILESDIR}"/${PN}-2.8.10-more-no_host_paths.patch
diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch
new file mode 100644
index 000000000000..97c93aa5831e
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch
@@ -0,0 +1,50 @@
+Do not detect Xcode and set -isysroot for its SDK, since that messes up
+our toolchain, and hence makes any compilation fail, bug #445308
+
+--- Modules/Platform/Darwin.cmake
++++ Modules/Platform/Darwin.cmake
+@@ -60,18 +60,18 @@
+ endif()
+ 
+ # Ask xcode-select where to find /Developer or fall back to ancient location.
+-execute_process(COMMAND xcode-select -print-path
+-  OUTPUT_VARIABLE _stdout
+-  OUTPUT_STRIP_TRAILING_WHITESPACE
+-  ERROR_VARIABLE _stderr
+-  RESULT_VARIABLE _failed)
+-if(NOT _failed AND IS_DIRECTORY ${_stdout})
+-  set(OSX_DEVELOPER_ROOT ${_stdout})
+-elseif(IS_DIRECTORY "/Developer")
+-  set(OSX_DEVELOPER_ROOT "/Developer")
+-else()
++#execute_process(COMMAND xcode-select -print-path
++#  OUTPUT_VARIABLE _stdout
++#  OUTPUT_STRIP_TRAILING_WHITESPACE
++#  ERROR_VARIABLE _stderr
++#  RESULT_VARIABLE _failed)
++#if(NOT _failed AND IS_DIRECTORY ${_stdout})
++#  set(OSX_DEVELOPER_ROOT ${_stdout})
++#elseif(IS_DIRECTORY "/Developer")
++#  set(OSX_DEVELOPER_ROOT "/Developer")
++#else()
+   set(OSX_DEVELOPER_ROOT "")
+-endif()
++#endif()
+ 
+ execute_process(COMMAND sw_vers -productVersion
+   OUTPUT_VARIABLE CURRENT_OSX_VERSION
+@@ -91,10 +91,10 @@
+ # CMAKE_OSX_DEPLOYMENT_TARGET
+ 
+ # Set cache variable - end user may change this during ccmake or cmake-gui configure.
+-if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
+-  set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
+-    "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
+-endif()
++#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
++#  set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
++#    "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
++#endif()
+ 
+ #----------------------------------------------------------------------------
+ # CMAKE_OSX_SYSROOT
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index ea15eb689e70..f5f02589269a 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,5 +1,4 @@
-DIST glib-2.30.3.tar.xz 5642448 SHA256 e6cbb27c71c445993346e785e8609cc75cea2941e32312e544872feba572dd27 SHA512 9f212b2c94c8c76ed619a1a97515ffc4c71dd39a982852cc9db600ca3034be1fb646d657dd39831f2fe80a81972400b977ea59fa81923dfe646158c9f1ab8843 WHIRLPOOL 145e20955b0ce2b44e05833bd508ac03a0399fc4d4c1c551c6a05809e6922cd57c37c5b32ebbe80f7ba0a21660059d7cb4837fa233de37af6c12cd0bc3a7afeb
 DIST glib-2.32.4.tar.xz 6178556 SHA256 a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2 SHA512 bc8b2d6afae7635f940065eca3e854ee171812c7b582d55313db11d28875495dbf41fc0a260347b30f7490daa65ccc377d8a2d60bb3a26d07997606d8e3d989f WHIRLPOOL 35aec94088acff460685c0b1bb2e6fcffadb0f9f0044b93f3fa042ed82dd52efb5e56022575c0ebcfda4230d38edc26a916623f0bfcbfc8e1c6b76a3133d43bc
-DIST glib-2.34.2.tar.xz 6367740 SHA256 2d99a8309cdd0c584bd5386a49265fb19ac64575fe108fd901d6f26c8d73c708 SHA512 986a064968bd6681e8166704c7caa8e467a99ba24b035874fbd21e1374a56f24fc78325ab5776e60ffe6f5555e9104fcc89ddf2e3d3c9ec31906cbaaf1f7a827 WHIRLPOOL 81556274b0ab62ba1bc4846f857566971f3fca305ab75ca4163a5071505d7223d24743c629cc53383ffb329ba401721abcb7ade57d42bf9c2ef4debb23b16660
 DIST glib-2.34.3.tar.xz 6334872 SHA256 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7 SHA512 2382e09159da2ef47384a3e52622f139577af69d6aba86ea1636f2b6b23b9f6bf89967f29394fd7f93d0528e2c58ae015864aa58a3e3e4f504c7a268b2ef4a75 WHIRLPOOL 296f29666bdd38faae41a1b0b7875dd5fb6ac23d5d27282658e73bbb614db944b3a92d5334ddcca19f959e4c5ef2bf20a5b0f19390558645f986afc2f84edd4d
 DIST glib-2.36.0.tar.xz 6508276 SHA256 455a8abe8692c5174bcc7ffa15b96a7521a2f2f9fb47594405927c35cb9bb227 SHA512 86402c22b3df419112aab82bfe2c2a598992c6eadf941375b6f4f1840f9004491fafcbd95dc372262cddb29064abba54c640b1dbf281ff75c0ea209683876530 WHIRLPOOL 9db755e0a6070a63b78ebc71b6c54279faeffec57f9392c329fdbd105bfe5f74caff134c0aef7c93a542eed71e0465f7c1a42c4277ad7a8d42cf837fdc1f434c
+DIST glib-2.36.1.tar.xz 6524408 SHA256 7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24 SHA512 e738ef537fc8b05f535a42a46c3e5cf8d7c9c3aed788adea1bfd924e6031e6f3e8366850a3a1a0ea2c2a4c5e54f08eacf6cccbf32fb8a361b62a6caf9c4b7852 WHIRLPOOL 05298f71ff63b458ddc7e67c7ce0ab800109068c6bb2b0bff5ccfd76d8ed29cb5568d8a2953b71947bb0385033c3564467f9adfa377fc65c27eb765f71f71ef3
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.30.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.30.3.ebuild
deleted file mode 100644
index c46e860c9cdf..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.30.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.30.3.ebuild,v 1.9 2012/09/25 11:42:03 tetromino Exp $
-
-EAPI="4"
-GNOME_ORG_MODULE="glib"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
-
-inherit gnome.org multilib python
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-# To prevent circular dependencies with glib[test]
-PDEPEND=">=dev-libs/glib-${PV}:2"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs 2 gdbus-codegen.in
-	sed -e "s:@libdir@:${EPREFIX}/usr/$(get_libdir):" \
-		-i gdbus-codegen.in || die "sed gdbus-codegen.in failed"
-	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
-		-i config.py || die "sed config.py failed"
-}
-
-src_test() {
-	elog "Skipping tests. This package is tested by dev-libs/glib"
-	elog "when merged with FEATURES=test"
-}
-
-src_install() {
-	insinto "/usr/$(get_libdir)/gdbus-2.0/codegen"
-
-	# Keep in sync with Makefile.am!
-	doins __init__.py \
-		codegen.py \
-		codegen_main.py \
-		codegen_docbook.py \
-		config.py \
-		dbustypes.py \
-		parser.py \
-		utils.py
-
-	newbin gdbus-codegen.in gdbus-codegen
-
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
-
-pkg_postinst() {
-	python_need_rebuild
-	python_mod_optimize /usr/$(get_libdir)/gdbus-2.0/codegen
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/gdbus-2.0/codegen
-}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.34.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.36.1.ebuild
similarity index 80%
rename from dev-util/gdbus-codegen/gdbus-codegen-2.34.2.ebuild
rename to dev-util/gdbus-codegen/gdbus-codegen-2.36.1.ebuild
index b62e100abf66..0ab055c9d191 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.34.2.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.36.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.34.2.ebuild,v 1.3 2012/12/17 19:53:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.36.1.ebuild,v 1.1 2013/04/23 19:06:15 pacho Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="glib"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
@@ -26,7 +26,7 @@ PDEPEND=">=dev-libs/glib-${PV}:2"
 S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
 
 python_prepare_all() {
-	epatch "${FILESDIR}/${PN}-2.32.4-sitedir.patch"
+	epatch "${FILESDIR}/${PN}-2.36.0-sitedir.patch"
 	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
 		-i config.py || die "sed config.py failed"
 
@@ -36,8 +36,8 @@ python_prepare_all() {
 }
 
 src_test() {
-	elog "Skipping tests. This package is tested by dev-libs/glib"
-	elog "when merged with FEATURES=test"
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
 }
 
 python_install_all() {
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 88ca9bc560e4..1bbb0b56cec7 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.152 2013/04/15 21:46:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.153 2013/04/23 19:16:00 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -38,12 +38,15 @@ inherit libtool multiprocessing
 # @DESCRIPTION:
 # CONSTANT!
 # The latest major version/slot of automake available on each arch.  #312315
+# We should list both the latest stable, and the latest unstable.  #465732
+# This way the stable builds will still work, but the unstable are allowed
+# to build & test things for us ahead of time (if they have it installed).
 # 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>
-_LATEST_AUTOMAKE=( 1.12:1.12 )
+_LATEST_AUTOMAKE=( 1.12:1.12 1.13:1.13 )
 
 _automake_atom="sys-devel/automake"
 _autoconf_atom="sys-devel/autoconf"
diff --git a/eclass/vim.eclass b/eclass/vim.eclass
index e3912738258a..3139b432586c 100644
--- a/eclass/vim.eclass
+++ b/eclass/vim.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.210 2013/04/21 23:26:59 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.212 2013/04/24 01:49:40 radhermit Exp $
 
 # Authors:
 # 	Jim Ramsay <lack@gentoo.org>
@@ -43,7 +43,7 @@ MY_PN=${PN%-cvs}
 if [[ ${MY_PN} != "vim-core" ]] ; then
 	if [[ ${HAS_PYTHON_R1} ]]; then
 		PYTHON_REQ_USE=threads
-		inherit python-r1
+		inherit python-single-r1
 	else
 		# vim supports python-2 only
 		PYTHON_DEPEND="python? 2"
@@ -90,13 +90,6 @@ else
 			python? ( ${PYTHON_DEPS} )"
 		RDEPEND="${RDEPEND}
 			python? ( ${PYTHON_DEPS} )"
-		# at most one version of py2 and one of py3
-		REQUIRED_USE="${REQUIRED_USE}
-			python? (
-				|| ( $(python_gen_useflags '*') )
-				?? ( $(python_gen_useflags 'python2*') )
-				?? ( $(python_gen_useflags 'python3*') )
-			)"
 	fi
 
 	DEPEND="${DEPEND}
@@ -255,8 +248,10 @@ vim_pkg_setup() {
 	mkdir -p "${T}/home"
 	export HOME="${T}/home"
 
-	if [[ ! ${HAS_PYTHON_R1} ]]; then
-		if [[ ${MY_PN} != "vim-core" ]] && use python; then
+	if [[ ${MY_PN} != "vim-core" ]] && use python; then
+		if [[ ${HAS_PYTHON_R1} ]]; then
+			python-single-r1_pkg_setup
+		else
 			# vim supports python-2 only
 			python_set_active_version 2
 			# python.eclass only defines python_pkg_setup for EAPIs that support
@@ -436,19 +431,15 @@ vim_src_configure() {
 		myconf="${myconf} `use_enable perl perlinterp`"
 		if [[ ${HAS_PYTHON_R1} ]]; then
 			if use python; then
-				py_add_interp() {
-					local v
-
-					[[ ${EPYTHON} == python3* ]] && v=3
-
-					myconf="${myconf} --enable-python${v}interp
-						vi_cv_path_python${v}=${PYTHON}"
-				}
-
-				python_foreach_impl py_add_interp
+				if [[ ${EPYTHON} == python3* ]]; then
+					myconf="${myconf} --enable-python3interp"
+					export vi_cv_path_python3="${PYTHON}"
+				else
+					myconf="${myconf} --enable-pythoninterp"
+					export vi_cv_path_python="${PYTHON}"
+				fi
 			else
-				myconf="${myconf} --disable-pythoninterp
-					--disable-python3interp"
+				myconf="${myconf} --disable-pythoninterp --disable-python3interp"
 			fi
 		else
 			myconf="${myconf} `use_enable python pythoninterp`"
@@ -540,8 +531,6 @@ vim_src_configure() {
 }
 
 vim_src_compile() {
-	has src_configure ${TO_EXPORT} || vim_src_configure
-
 	# The following allows emake to be used
 	emake -j1 -C src auto/osdef.h objects || die "make failed"
 
diff --git a/gnome-extra/zeitgeist/files/zeitgeist-0.9.12-download_monitor.patch b/gnome-extra/zeitgeist/files/zeitgeist-0.9.12-download_monitor.patch
new file mode 100644
index 000000000000..6eea705c1414
--- /dev/null
+++ b/gnome-extra/zeitgeist/files/zeitgeist-0.9.12-download_monitor.patch
@@ -0,0 +1,11 @@
+--- zeitgeist-0.9.12/configure.ac	2013-04-13 10:09:15.000000000 +0200
++++ zeitgeist-0.9.12_mod/configure.ac	2013-04-22 21:14:47.604406313 +0200
+@@ -189,6 +189,8 @@
+ 
+ if test "x$enable_downloads_monitor" = "xyes" -a "x$enable_datahub" = "xyes"; then
+     AC_DEFINE([DOWNLOADS_MONITOR_ENABLED], [1], [Is the XDG_DOWNLOAD_DIRECTORY file monitor enabled?])
++else
++    AC_DEFINE([DOWNLOADS_MONITOR_ENABLED], [0], [Is the XDG_DOWNLOAD_DIRECTORY file monitor enabled?])
+ fi
+ AM_CONDITIONAL(DOWNLOADS_MONITOR_ENABLED, test "x$enable_downloads_monitor" = "xyes" -a "x$enable_datahub" = "xyes")
+ 
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild
index f2b91b2bfe89..78b3fb6984a7 100644
--- a/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild
+++ b/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild,v 1.1 2013/04/21 14:11:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild,v 1.3 2013/04/23 08:53:25 jlec Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} )
-
+AUTOTOOLS_AUTORECONF=true
 VALA_MIN_API_VERSION=0.18
 
 inherit autotools-utils eutils python-r1 versionator vala
@@ -22,7 +22,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+datahub +dbus downloads-monitor extensions +fts icu introspection nls plugins sql-debug telepathy"
 
-REQUIERED_USE="datahub? ( downloads-monitor )"
+REQUIRED_USE="downloads-monitor? ( datahub )"
 
 RDEPEND="
 	!gnome-extra/zeitgeist-datahub
@@ -44,6 +44,8 @@ DEPEND="${RDEPEND}
 	${vala_depend}
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${P}-download_monitor.patch )
+
 src_prepare() {
 	vala_src_prepare
 	autotools-utils_src_prepare
diff --git a/gnustep-apps/cenon/Manifest b/gnustep-apps/cenon/Manifest
index 150620cbfeea..346529afbb7d 100644
--- a/gnustep-apps/cenon/Manifest
+++ b/gnustep-apps/cenon/Manifest
@@ -1,2 +1,3 @@
-DIST Cenon-3.9.5.tar.bz2 2003607 RMD160 3ab6af7c49f00bc1fa8f63e5f987aa91b7798c29 SHA1 f3d9251290cc0ffa9e09e884a971f926a0eab9b5 SHA256 523049066f88e9e022127c017633b0431a29b9eda847e875c8c82d1f976f4977
-DIST Cenon-3.9.6.tar.bz2 2005991 RMD160 9a80e3ed91f861715e486199de6523fe6d0c3a29 SHA1 083f0f15beea03b534b814edc574e149dec3082f SHA256 373e6c3b7e23950aef865cc3719eece97e1bfbfcecae901cac2e5e6e6ff9175d
+DIST Cenon-3.9.5.tar.bz2 2003607 SHA256 523049066f88e9e022127c017633b0431a29b9eda847e875c8c82d1f976f4977
+DIST Cenon-3.9.6.tar.bz2 2005991 SHA256 373e6c3b7e23950aef865cc3719eece97e1bfbfcecae901cac2e5e6e6ff9175d SHA512 28becfdefe52ffabf36cedf45c9abd409d1f603bf9bf8e75c1637625b368707812c62408c8369a809359ed8977afa98d7eee1b3348de1e3ab9e485e59f853d45 WHIRLPOOL 91eaf7a86d4d2431a6e24c24490677c9c35c9e25fb15e99dec6262183cd9d2ee7b2818b934b8612b5b759628f545f77c8a6687231cb2033d3f4d512e582bf1fe
+DIST Cenon-4.0.2.tar.bz2 4143462 SHA256 8c8906225e188747bf80499886c289786ffc27c6e051dafe12567542f9ef0693 SHA512 202532242eedaf936a35e5df176cf613afe22880f1341e6e9b054fdae9d9aa158acf67bc6927cbbe70cc6215be378e08e318c66ff6a28122676c3ca5b9950d72 WHIRLPOOL 379aab9dba8cc1f9c91d6721168b1f0bc88a8cc646af5ed8437cf2ec589c2b7cf6150782063ced6457ca0b06296721b5a412332b33f3e47254760ac195e65189
diff --git a/gnustep-apps/cenon/cenon-4.0.2.ebuild b/gnustep-apps/cenon/cenon-4.0.2.ebuild
new file mode 100644
index 000000000000..70770945082e
--- /dev/null
+++ b/gnustep-apps/cenon/cenon-4.0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cenon/cenon-4.0.2.ebuild,v 1.1 2013/04/23 22:56:10 voyageur Exp $
+
+EAPI=5
+inherit gnustep-2
+
+S=${WORKDIR}/${PN/c/C}
+
+DESCRIPTION="Cenon is a vector graphics tool for GNUstep, OpenStep and MacOSX"
+HOMEPAGE="http://www.cenon.info/"
+SRC_URI="http://www.vhf-group.com/vhf-interservice/download/source/${P/c/C}.tar.bz2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="Cenon"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=gnustep-libs/cenonlibrary-4.0.0"
+
+src_prepare() {
+	# Do not install files already provided by cenonlibrary
+	epatch "${FILESDIR}"/${P}-install.patch
+}
diff --git a/gnustep-apps/cenon/files/cenon-4.0.2-install.patch b/gnustep-apps/cenon/files/cenon-4.0.2-install.patch
new file mode 100644
index 000000000000..8a75db6ee13a
--- /dev/null
+++ b/gnustep-apps/cenon/files/cenon-4.0.2-install.patch
@@ -0,0 +1,19 @@
+diff -Naur Cenon.orig/GNUmakefile.postamble Cenon/GNUmakefile.postamble
+--- Cenon.orig/GNUmakefile.postamble	2013-04-23 18:18:19.231871028 +0200
++++ Cenon/GNUmakefile.postamble	2013-04-23 18:19:31.482864370 +0200
+@@ -18,12 +18,12 @@
+ # before-install::
+ 
+ # Things to do after installing
+-after-install::
++#after-install::
+ 	# copy library
+ 	#rm -R $(GNUSTEP_LIBRARY)/$(APP_NAME)
+-	cp -R Library/$(APP_NAME)/ $(GNUSTEP_LIBRARY)/
++	#cp -R Library/$(APP_NAME)/ $(GNUSTEP_LIBRARY)/
+ 	# set permissions (rrr)
+-	chmod -R ugo+rX $(GNUSTEP_APPS)/$(APP_NAME).*
++	#chmod -R ugo+rX $(GNUSTEP_APPS)/$(APP_NAME).*
+ 	#chmod -R ugo+rX $(GNUSTEP_LIBRARY)/$(APP_NAME)
+ 
+ # Things to do before uninstalling
diff --git a/gnustep-libs/cenonlibrary/Manifest b/gnustep-libs/cenonlibrary/Manifest
index 3a5019b7d21c..8b2e40f12b8b 100644
--- a/gnustep-libs/cenonlibrary/Manifest
+++ b/gnustep-libs/cenonlibrary/Manifest
@@ -1,2 +1,3 @@
-DIST CenonLibrary-3.82-1.tar.bz2 11422281 RMD160 fa626d5be312520cac89485e0b6f32a48be546d1 SHA1 c1749422fbb0f7509bdd5cf52a11fd8da347d3d2 SHA256 9e116dc985e19456eeb7d71205d2685fab8da828de84ba2a0726ab4abeddaf49
-DIST CenonLibrary-3.9.4-1.tar.bz2 2058146 RMD160 057a140eef2d5961babc6433ed6dbae08d36526c SHA1 323ee902cf79dac1a06f9f06c5867b0d88572865 SHA256 eecb3c588f65cbe68db902e2c29264904a04b1042f74b598695667cd9aeea761
+DIST CenonLibrary-3.82-1.tar.bz2 11422281 SHA256 9e116dc985e19456eeb7d71205d2685fab8da828de84ba2a0726ab4abeddaf49 SHA512 8c54c84c25d78b1daa0f58670a76bf187d485fdd52de677cda4c80dfda7605517ae84dd40e67ff004372eb0b85be21577e848f7fedaa2c0213eedf5f282fdf69 WHIRLPOOL 851388e8c46d58064bc85bd52fb73068c74210eae0292092806f829f04c825751ffaa6845a347dcfd1ceadcc5f98adf207a01be5784df10d8843bf015ff2664d
+DIST CenonLibrary-3.9.4-1.tar.bz2 2058146 SHA256 eecb3c588f65cbe68db902e2c29264904a04b1042f74b598695667cd9aeea761
+DIST CenonLibrary-4.0.0-1.tar.bz2 2131692 SHA256 b329331a4b5b40d93eeeddd98f6922a53401b6e4f437538cd98392f8828cbb44 SHA512 75d1acc2635cb5daee3311d2c54a43abf9d0de7b29997fec86effc4dd3932fe73449c08cda642d1f92adcea9da74cd4732014bb04f7418c1f331701bafe44427 WHIRLPOOL bcfbe87deb051b9b48472914a68a38590cee11b3a67f5b02ca8b13037b59f1389f26b07e202920595293e6288a8c974868b861ac27d30b1f592e7db95ff4b43f
diff --git a/gnustep-libs/cenonlibrary/cenonlibrary-4.0.0.ebuild b/gnustep-libs/cenonlibrary/cenonlibrary-4.0.0.ebuild
new file mode 100644
index 000000000000..073737d7fd98
--- /dev/null
+++ b/gnustep-libs/cenonlibrary/cenonlibrary-4.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/cenonlibrary/cenonlibrary-4.0.0.ebuild,v 1.1 2013/04/23 22:56:05 voyageur Exp $
+
+EAPI=5
+inherit gnustep-2
+
+S=${WORKDIR}/Cenon
+
+DESCRIPTION="Default library required to run Cenon"
+HOMEPAGE="http://www.cenon.info/"
+SRC_URI="http://www.vhf-group.com/vhf-interservice/download/source/CenonLibrary-${PV}-1.tar.bz2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="Cenon"
+IUSE=""
+
+src_compile() {
+	echo "nothing to compile"
+}
+
+src_install() {
+	egnustep_env
+	dodir ${GNUSTEP_SYSTEM_LIBRARY}
+	cp -pPR "${S}" "${D}"${GNUSTEP_SYSTEM_LIBRARY}
+}
diff --git a/licenses/SOFA b/licenses/SOFA
new file mode 100644
index 000000000000..172268df999f
--- /dev/null
+++ b/licenses/SOFA
@@ -0,0 +1,105 @@
+copyr.lis                                               2012 February 23
+
+
+COPYRIGHT NOTICE
+
+
+Text equivalent to the following appears at the end of every SOFA
+routine.  (There are small formatting differences between the Fortran
+and C versions.)
+
+*+----------------------------------------------------------------------
+*
+*  Copyright (C) 2012
+*  Standards Of Fundamental Astronomy Board
+*  of the International Astronomical Union.
+*
+*  =====================
+*  SOFA Software License
+*  =====================
+*
+*  NOTICE TO USER:
+*
+*  BY USING THIS SOFTWARE YOU ACCEPT THE FOLLOWING SIX TERMS AND
+*  CONDITIONS WHICH APPLY TO ITS USE.
+*
+*  1. The Software is owned by the IAU SOFA Board ("SOFA").
+*
+*  2. Permission is granted to anyone to use the SOFA software for any
+*     purpose, including commercial applications, free of charge and
+*     without payment of royalties, subject to the conditions and
+*     restrictions listed below.
+*
+*  3. You (the user) may copy and distribute SOFA source code to others,
+*     and use and adapt its code and algorithms in your own software,
+*     on a world-wide, royalty-free basis.  That portion of your
+*     distribution that does not consist of intact and unchanged copies
+*     of SOFA source code files is a "derived work" that must comply
+*     with the following requirements:
+*
+*     a) Your work shall be marked or carry a statement that it
+*        (i) uses routines and computations derived by you from
+*        software provided by SOFA under license to you; and
+*        (ii) does not itself constitute software provided by and/or
+*        endorsed by SOFA.
+*
+*     b) The source code of your derived work must contain descriptions
+*        of how the derived work is based upon, contains and/or differs
+*        from the original SOFA software.
+*
+*     c) The name(s) of all routine(s) in your derived work shall not
+*        include the prefix "iau" or "sofa" or trivial modifications
+*        thereof such as changes of case.
+*
+*     d) The origin of the SOFA components of your derived work must
+*        not be misrepresented;  you must not claim that you wrote the
+*        original software, nor file a patent application for SOFA
+*        software or algorithms embedded in the SOFA software.
+*
+*     e) These requirements must be reproduced intact in any source
+*        distribution and shall apply to anyone to whom you have
+*        granted a further right to modify the source code of your
+*        derived work.
+*
+*     Note that, as originally distributed, the SOFA software is
+*     intended to be a definitive implementation of the IAU standards,
+*     and consequently third-party modifications are discouraged.  All
+*     variations, no matter how minor, must be explicitly marked as
+*     such, as explained above.
+*
+*  4. You shall not cause the SOFA software to be brought into
+*     disrepute, either by misuse, or use for inappropriate tasks, or
+*     by inappropriate modification.
+*
+*  5. The SOFA software is provided "as is" and SOFA makes no warranty
+*     as to its use or performance.   SOFA does not and cannot warrant
+*     the performance or results which the user may obtain by using the
+*     SOFA software.  SOFA makes no warranties, express or implied, as
+*     to non-infringement of third party rights, merchantability, or
+*     fitness for any particular purpose.  In no event will SOFA be
+*     liable to the user for any consequential, incidental, or special
+*     damages, including any lost profits or lost savings, even if a
+*     SOFA representative has been advised of such damages, or for any
+*     claim by any third party.
+*
+*  6. The provision of any version of the SOFA software under the terms
+*     and conditions specified herein does not imply that future
+*     versions will also be made available under the same terms and
+*     conditions.
+*
+*  In any published work or commercial product which uses the SOFA
+*  software directly, acknowledgement (see www.iausofa.org) is
+*  appreciated.
+*
+*  Correspondence concerning SOFA software should be addressed as
+*  follows:
+*
+*      By email:  sofa@ukho.gov.uk
+*      By post:   IAU SOFA Center
+*                 HM Nautical Almanac Office
+*                 UK Hydrographic Office
+*                 Admiralty Way, Taunton
+*                 Somerset, TA1 2DN
+*                 United Kingdom
+*
+*-----------------------------------------------------------------------
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index a3a706a37167..b111e2481c34 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1 +1,2 @@
 DIST msmtp-1.4.30.tar.bz2 303226 SHA256 f152b9296e36e340eb049c7ee4d6980fcdb29d948e654bdc74bea7ee97409886 SHA512 6ebbf6d4f077bf5dc43d43fdc8b83d131364df5b82ebaa12f93f1a78ef8457c500ded0f6d3ee5b8a7825d292d5338743fd32899fd699dcbe2924064723a5f021 WHIRLPOOL 1ab45fb4eb8922b53dbe805b9944cceb13abb455d2395d8ba10339133584c205f6bbfba5ea560d45d1527a424381dc3e2f88c03e5463a6451a177a28819f3fc4
+DIST msmtp-1.4.31.tar.bz2 305770 SHA256 247af9a95fa22f506e85109fc4268a5d91ca03af9b17eebcc1e46b7cd64c225f SHA512 aec12bd9479342d826e7c838116c1771a17dc2b53c220c7fdf4d3fa4cb53eb76041bb64be7417637887e6f0109f65d97155e9c74d60633c280edb0613417a136 WHIRLPOOL a4c1413937786b3cf994b3d2227821e699f00c517915afea04f30064b48fdfb4ff8829c2ad9826f7c5776580c5ebc38e4dacafe53941c3d3615c1226c9619b14
diff --git a/mail-mta/msmtp/msmtp-1.4.30.ebuild b/mail-mta/msmtp/msmtp-1.4.31.ebuild
similarity index 81%
rename from mail-mta/msmtp/msmtp-1.4.30.ebuild
rename to mail-mta/msmtp/msmtp-1.4.31.ebuild
index 9125c3a1da2f..d23b9d1d2a91 100644
--- a/mail-mta/msmtp/msmtp-1.4.30.ebuild
+++ b/mail-mta/msmtp/msmtp-1.4.31.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.30.ebuild,v 1.11 2013/02/28 17:51:38 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.31.ebuild,v 1.1 2013/04/23 00:01:33 radhermit Exp $
 
-EAPI=4
+EAPI=5
 inherit multilib python eutils
 
 DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/msmtp/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc gnome-keyring gnutls idn +mta nls sasl ssl vim-syntax"
 
 CDEPEND="
@@ -99,12 +99,24 @@ src_install() {
 		doins scripts/vim/msmtp.vim
 	fi
 
+	insinto /etc
+	newins doc/msmtprc-system.example msmtprc
+
 	src_install_contrib find_alias find_alias_for_msmtp.sh
 	src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
 	src_install_contrib msmtpq "msmtpq msmtp-queue" README.msmtpq
 	src_install_contrib set_sendmail set_sendmail.sh set_sendmail.conf
 }
 
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		einfo "Please edit ${ROOT}etc/msmtprc before first use."
+		einfo "In addition, per user configuration files can be placed"
+		einfo "as '~/.msmtprc'.  See the msmtprc-user.example file under"
+		einfo "/usr/share/doc/${PF}/ for an example."
+	fi
+}
+
 src_install_contrib() {
 	subdir="$1"
 	bins="$2"
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 728956c6bfda..d5802fc6e0a2 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -1,3 +1,4 @@
 DIST sendmail.8.14.4.tar.gz 2080472 SHA256 bc0109437c5018b3ea8999edb63506db2f3b31c4c1ab4367cb56236a7df97cb1
 DIST sendmail.8.14.5.tar.gz 2092508 SHA256 fb65a86a0f87f12aefb933ee8990540f7a680a594f7fedfdd28918f3934bfb88 SHA512 178addd247f1c7c8ca90d70b9240db4cad4e55f0710d5df0fe979e5473a182d2035150c352836576a28bb2b9660b0d5ebfcd95269a156ac0d2c3dba3edb60452 WHIRLPOOL 2e073759a44d535629d9cce91da4a7082e085defeb9491a4470a8a8c8b18e1545129527c0138a74edb405a9c9724e5a597ee99c7852a423696c495ad8fef783f
 DIST sendmail.8.14.6.tar.gz 2104299 SHA256 4ecbaeb2fec8829cd2852acbd8aca66a1383c1237e8401b2fa5377ee3b6d80cd SHA512 012fc396723a97ea5ad95e8b3ea6a3a40aeb97b85ed8af20ae9486729abe149e85cef4a8a16f763ae3d772a41547066434f97b25055e37590a768efa0c9c3757 WHIRLPOOL 271a09a49ab27e99365f171c617738b35a05949aeea8e6941caad712d75c0a3881da6e5528f0ca2900853a224d54db51800d1797ca80cfe7c9716a1283ff2a4d
+DIST sendmail.8.14.7.tar.gz 2112670 SHA256 fa4ff9e67d1e5a42f353eedb207e08b38c0ac31030f7165866de2c520f508710 SHA512 872fef1be984ae8aecdf4299459de50fea86a3b3758e0aac01ea4307fa936a03e66d3ef8d1352cd21afe588b53b04a1cea6e099ba64a5edab5a31e25fb8e0bd3 WHIRLPOOL 82d7b85a130900bd18e43df182850c1fd589caa21e90c055592ebd89e9da6a6dfa35b2baed87b56ca7772b24bb8567266cfad7352167068aad405e3fcfe9202e
diff --git a/mail-mta/sendmail/sendmail-8.14.7.ebuild b/mail-mta/sendmail/sendmail-8.14.7.ebuild
new file mode 100644
index 000000000000..bf91cd25fcbf
--- /dev/null
+++ b/mail-mta/sendmail/sendmail-8.14.7.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.7.ebuild,v 1.1 2013/04/23 04:23:00 radhermit Exp $
+
+EAPI="5"
+inherit eutils multilib toolchain-funcs user
+
+DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
+HOMEPAGE="http://www.sendmail.org/"
+SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
+
+LICENSE="Sendmail"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ssl ldap sasl tcpd mbox ipv6 nis sockets"
+
+DEPEND="net-mail/mailbase
+	sys-devel/m4
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? ( dev-libs/openssl )
+	ldap? ( net-nds/openldap )
+	>=sys-libs/db-3.2
+	!net-mail/vacation
+	"
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/opensmtpd
+	!mail-mta/qmail-ldap
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]"
+
+PDEPEND="!mbox? ( mail-filter/procmail )"
+
+# libmilter library is part of sendmail, but it does not share the version number with it.
+# In order to find the right libmilter version number, check SMFI_VERSION definition
+# that can be found in ${S}/include/libmilter/mfapi.h (see also SM_LM_VRS_* defines).
+# For example, version 1.0.1 has a SMFI_VERSION of 0x01000001.
+LIBMILTER_VER=1.0.2
+
+pkg_setup() {
+	enewgroup smmsp 209
+	enewuser smmsp 209 -1 /var/spool/mqueue smmsp
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/"${PN}"-8.14.6-build-system.patch
+	epatch "${FILESDIR}"/sendmail-delivered_hdr.patch
+	epatch "${FILESDIR}"/libmilter-sharedlib.patch
+	epatch "${FILESDIR}"/"${PN}"-8.14.5+db-5.0.patch
+	epatch "${FILESDIR}"/sendmail-starttls-multi-crl.patch
+
+	local confCC="$(tc-getCC)"
+	local confCCOPTS="${CFLAGS}"
+	local confLDOPTS="${LDFLAGS}"
+	local confMAPDEF="-DMAP_REGEX"
+	local conf_sendmail_LIBS=""
+	use sasl && confLIBS="${confLIBS} -lsasl2"  \
+		&& confENVDEF="${confENVDEF} -DSASL=2" \
+		&& confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \
+		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lsasl2"
+	use tcpd && confENVDEF="${confENVDEF} -DTCPWRAPPERS" \
+		&& confLIBS="${confLIBS} -lwrap"
+	use ssl && confENVDEF="${confENVDEF} -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL" \
+		&& confENVDEF="${confENVDEF} -D_FFR_TLS_1" \
+		&& confLIBS="${confLIBS} -lssl -lcrypto" \
+		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lssl -lcrypto"
+	use ldap && confMAPDEF="${confMAPDEF} -DLDAPMAP" \
+		&& confLIBS="${confLIBS} -lldap -llber"
+	use ipv6 && confENVDEF="${confENVDEF} -DNETINET6"
+	use nis && confENVDEF="${confENVDEF} -DNIS"
+	use sockets && confENVDEF="${confENVDEF} -DSOCKETMAP"
+	sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
+		-e "s/@@confLDOPTS@@/${confLDOPTS}/" \
+		-e "s/@@confCC@@/${confCC}/" \
+		-e "s/@@confMAPDEF@@/${confMAPDEF}/" \
+		-e "s/@@confENVDEF@@/${confENVDEF}/" \
+		-e "s/@@confLIBS@@/${confLIBS}/" \
+		-e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \
+		"${FILESDIR}"/site.config.m4 > devtools/Site/site.config.m4
+}
+
+src_compile() {
+	sh Build || die "compilation failed in main Build script"
+	pushd libmilter
+	sh Build MILTER_SOVER=${LIBMILTER_VER} || die "libmilter compilation failed"
+	popd
+}
+
+src_install () {
+	local MY_LIBDIR=/usr/$(get_libdir)
+	local MY_OBJDIR="obj.`uname -s`.`uname -r`.`uname -m`"
+	dodir /usr/bin ${MY_LIBDIR} /usr/include/libmilter
+	dodir /usr/share/man/man{1,5,8} /usr/sbin /var/log /usr/share/sendmail-cf
+	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
+	keepdir /var/spool/{clientmqueue,mqueue}
+	for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap
+	do
+		make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
+			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
+			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
+			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
+			MSPQOWN=root CFOWN=root CFGRP=root \
+			install -C "${MY_OBJDIR}/${dir}" \
+			|| die "install failed"
+	done
+	for dir in rmail mail.local
+	do
+		make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
+			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
+			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
+			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
+			MSPQOWN=root CFOWN=root CFGRP=root \
+			force-install -C "${MY_OBJDIR}/${dir}" \
+			|| die "install failed"
+	done
+
+	make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
+		SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
+		MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
+		LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
+		MSPQOWN=root CFOWN=root CFGRP=root \
+		MILTER_SOVER=${LIBMILTER_VER} \
+		install -C "${MY_OBJDIR}/libmilter" \
+		|| die "install failed"
+
+	fowners root:smmsp /usr/sbin/sendmail
+	fperms 2555 /usr/sbin/sendmail
+	fowners smmsp:smmsp /var/spool/clientmqueue
+	fperms 770 /var/spool/clientmqueue
+	fperms 700 /var/spool/mqueue
+	dosym /usr/sbin/makemap /usr/bin/makemap
+	dodoc FAQ KNOWNBUGS README RELEASE_NOTES doc/op/op.ps
+	newdoc sendmail/README README.sendmail
+	newdoc sendmail/SECURITY SECURITY
+	newdoc sendmail/TUNING TUNING
+	newdoc smrsh/README README.smrsh
+	newdoc libmilter/README README.libmilter
+
+	newdoc cf/README README.cf
+	newdoc cf/cf/README README.install-cf
+	cp -pPR cf/* "${D}"/usr/share/sendmail-cf
+
+	docinto contrib
+	dodoc contrib/*
+
+	insinto /etc/mail
+	if use mbox
+	then
+		newins "${FILESDIR}"/sendmail.mc-r1 sendmail.mc
+	else
+		newins "${FILESDIR}"/sendmail-procmail.mc sendmail.mc
+	fi
+	m4 "${D}"/usr/share/sendmail-cf/m4/cf.m4 "${D}"/etc/mail/sendmail.mc \
+		> "${D}"/etc/mail/sendmail.cf
+	echo "include(\`/usr/share/sendmail-cf/m4/cf.m4')dnl" \
+		> "${D}"/etc/mail/submit.mc
+	cat "${D}"/usr/share/sendmail-cf/cf/submit.mc >> "${D}"/etc/mail/submit.mc
+	echo "# local-host-names - include all aliases for your machine here" \
+		> "${D}"/etc/mail/local-host-names
+	cat <<- EOF > "${D}"/etc/mail/trusted-users
+		# trusted-users - users that can send mail as others without a warning
+		# apache, mailman, majordomo, uucp are good candidates
+	EOF
+	cat <<- EOF > "${D}"/etc/mail/access
+		# Check the /usr/share/doc/sendmail/README.cf file for a description
+		# of the format of this file. (search for access_db in that file)
+		# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
+		# package.
+		#
+
+	EOF
+	cat <<- EOF > "${D}"/etc/conf.d/sendmail
+		# Config file for /etc/init.d/sendmail
+		# add start-up options here
+		SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
+		CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue
+		KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
+
+	EOF
+	if use sasl; then
+		dodir /etc/sasl2
+		cat <<- EOF > "${D}"/etc/sasl2/Sendmail.conf
+		pwcheck_method: saslauthd
+		mech_list: PLAIN LOGIN
+
+		EOF
+	fi
+
+	doinitd "${FILESDIR}"/sendmail
+	keepdir /usr/adm/sm.bin
+}
diff --git a/media-gfx/fbgrab/fbgrab-1.0-r2.ebuild b/media-gfx/fbgrab/fbgrab-1.0-r2.ebuild
index d0570a1537dc..167f9ec65a9a 100644
--- a/media-gfx/fbgrab/fbgrab-1.0-r2.ebuild
+++ b/media-gfx/fbgrab/fbgrab-1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbgrab/fbgrab-1.0-r2.ebuild,v 1.4 2013/04/22 15:41:42 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbgrab/fbgrab-1.0-r2.ebuild,v 1.5 2013/04/23 08:39:03 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://hem.bredband.net/gmogmo/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/libpng
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.26.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.26.ebuild
index 94fb16a02be5..d7b5c5ac43cb 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.26.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.26.ebuild,v 1.12 2013/04/12 17:28:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.26.ebuild,v 1.13 2013/04/23 21:56:12 lu_zero Exp $
 
 EAPI=4
 
@@ -30,6 +30,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.19-missing-avutil.patch
 	"${FILESDIR}"/${PN}-1.0.23-automagic.patch
 	"${FILESDIR}"/${PN}-1.0.25-avcodec54.patch
+	"${FILESDIR}"/${P}-libav9.patch #443258
 )
 
 S=${WORKDIR}/${MY_P}
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.26-libav9.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.26-libav9.patch
new file mode 100644
index 000000000000..dfd75dfc0c8d
--- /dev/null
+++ b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.26-libav9.patch
@@ -0,0 +1,34 @@
+Author: Reinhard Tartler <siretart@ubuntu.com>
+Description: Update to newer libav API - compatible to libav 0.8 and libav 9
+
+Index: alsa-plugins-1.0.26/a52/pcm_a52.c
+===================================================================
+--- alsa-plugins-1.0.26.orig/a52/pcm_a52.c	2013-04-22 20:29:05.107102697 +0200
++++ alsa-plugins-1.0.26/a52/pcm_a52.c	2013-04-22 20:34:12.985107208 +0200
+@@ -25,6 +25,8 @@
+ #include <alsa/asoundlib.h>
+ #include <alsa/pcm_external.h>
+ #include <alsa/pcm_plugin.h>
++#include <libavutil/audioconvert.h>
++#include <libavutil/mem.h>
+ #include AVCODEC_HEADER
+ 
+ struct a52_ctx {
+@@ -429,7 +431,7 @@
+ 
+ 	a52_free(rec);
+ 
+-	rec->avctx = avcodec_alloc_context();
++	rec->avctx = avcodec_alloc_context3(rec->codec);
+ 	if (! rec->avctx)
+ 		return -ENOMEM;
+ 
+@@ -457,7 +459,7 @@
+ 	}
+ #endif
+ 
+-	if (avcodec_open(rec->avctx, rec->codec) < 0)
++	if (avcodec_open2(rec->avctx, rec->codec, NULL) < 0)
+ 		return -EINVAL;
+ 
+ 	rec->inbuf = malloc(rec->avctx->frame_size * 2 * io->channels);
diff --git a/media-tv/xbmc/xbmc-12.1-r1.ebuild b/media-tv/xbmc/xbmc-12.1-r1.ebuild
index 69f63a592e46..5e6ee3a14317 100644
--- a/media-tv/xbmc/xbmc-12.1-r1.ebuild
+++ b/media-tv/xbmc/xbmc-12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-12.1-r1.ebuild,v 1.1 2013/04/20 17:22:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-12.1-r1.ebuild,v 1.2 2013/04/23 01:33:23 vapier Exp $
 
 EAPI=5
 
@@ -43,6 +43,7 @@ IUSE="airplay alsa altivec avahi bluetooth bluray caps cec css debug gles goom j
 REQUIRED_USE="
 	pvr? ( mysql )
 	rsxs? ( X )
+	X? ( sdl )
 	xrandr? ( X )
 "
 
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index bfbcaf72e655..940f630c075e 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.142 2013/04/20 17:22:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.143 2013/04/23 01:33:23 vapier Exp $
 
 EAPI=5
 
@@ -40,6 +40,7 @@ IUSE="airplay alsa altivec avahi bluetooth bluray caps cec css debug +fishbmc gl
 REQUIRED_USE="
 	pvr? ( mysql )
 	rsxs? ( X )
+	X? ( sdl )
 	xrandr? ( X )
 "
 
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index d73c29c287bc..e331e322010a 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -2,4 +2,4 @@ DIST fate-0.8.2.tar.xz 443503168 SHA256 4c16212e4d99194e670227ccf93d54c9bb4b6f27
 DIST fate-9.tar.xz 467671500 SHA256 27d10fd49267452ac787c3f43501a4a21d0ccaccc5ddd6d79d8a6150ee276532 SHA512 8e45539f2512ef915b37c857226c0243940259f269b8f99393b9defa3352d7b8c1fcc5078f4f0d40dc0509737f0c915e179cedcc77f71fe5d96b1b956169a202 WHIRLPOOL d280ac32c6d84f121be8d733774e72a4df3f2e84d71051aea509ef5ca3289c94fd548bf03ff12215e045bf20c83426c547e6b5eb446429d167f38af7c7aa9803
 DIST libav-0.8.5.tar.xz 3761376 SHA256 d82cfbbca9825d8cf6cff4d830a57d094d359d23da7179a2d2811300cdcac57f SHA512 88e28b27f4a1f5dd856210b32527bc6c631e3c8470eedcdf303368cb2ff848407d6eb4359279eb8bf6d21375c0e5ac6860db8e1e96c4030990a643f9a365061c WHIRLPOOL a4ba175d9b40c5c1969be74fdae31c1bc67abf308e38c2baf429aecd16f5f7cd34df33e4f18661b5214d4c768011b2b742dc646ef5ceed51278b4ee04736546e
 DIST libav-0.8.6.tar.xz 3761040 SHA256 6144b78975210b9c4974e80bddbd5feb3bafe5e3a9c004a9c36a92ebe9da7cb4 SHA512 23bc6ffca8a9ce0963da6dbedfb110fe794eead713afda8514213e0e8f341b7256768f71ca16452056134a18049e5022973191a521d28dd888a15240db3fe48a WHIRLPOOL 217640b1f7793355b4660c07b514976d2f88b2220336ae20d5cf37fdec0b26218621626e1681f865d481eef613de9401770901e0b0d6e7d36082c81a5988d69a
-DIST libav-9.4.tar.xz 4066184 SHA256 cd7156315a03a9ebe95d2425765074e779979eaf194ad9e52d76b90ffef56d13 SHA512 3932de88746735b057585c5a486e524fa57c71da1aff4c3dbb337bf751eabd6685ee1f89bcdd8d761c7f8bf937ca09b217faf5d357b9814eda004455f0c275a9 WHIRLPOOL d8f611377a05a56cf23260523ed6fa0bf950f6179deec34e398ab40f8e25549eeb317ab15180bf3c44371274d50bbfd8e25eeed8db005f6dcdf5a06964735220
+DIST libav-9.5.tar.xz 4069028 SHA256 cf86a1533f3c28b8a78455f3a8d91fc2892526bbf17b73b308717001710624ff SHA512 2682b62a16e8afc6ca2320ab4c37755c8d20b7f81130d728ebcb317ab709297115ef09b729b263b4578644d9c62c805023458f7772be133ec5089e4dc9b1e461 WHIRLPOOL 1483f209bbf0385fec930f32fe8ac512326fd449c29d9cf7b3b4805543acd9b16cd56cd5d4806121fcaf42cdedcab70f64df1c13f2c9cb7c405161c2999f05ff
diff --git a/media-video/libav/libav-9.4.ebuild b/media-video/libav/libav-9.5.ebuild
similarity index 98%
rename from media-video/libav/libav-9.4.ebuild
rename to media-video/libav/libav-9.5.ebuild
index 4c7b69126503..60f2e5c5f041 100644
--- a/media-video/libav/libav-9.4.ebuild
+++ b/media-video/libav/libav-9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.4.ebuild,v 1.2 2013/04/05 10:48:46 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.5.ebuild,v 1.1 2013/04/22 20:42:24 lu_zero Exp $
 
 EAPI=5
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 2a83fd804a21..1b895541214c 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 22 Apr 2013 20:06:55 +0000
+Wed, 24 Apr 2013 04:36:57 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 7eec3bbba6f2..1b895541214c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 22 Apr 2013 20:06:56 +0000
+Wed, 24 Apr 2013 04:36:57 +0000
diff --git a/metadata/md5-cache/app-accessibility/brltty-4.2 b/metadata/md5-cache/app-accessibility/brltty-4.2
index b39e2fe99eb1..75a84258e8ea 100644
--- a/metadata/md5-cache/app-accessibility/brltty-4.2
+++ b/metadata/md5-cache/app-accessibility/brltty-4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Daemon that provides access to the Linux/Unix console for a blind person
 EAPI=4
 HOMEPAGE=http://mielke.cc/brltty/
@@ -10,5 +10,5 @@ RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=s
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api ) tcl? ( api )
 SLOT=0
 SRC_URI=http://mielke.cc/brltty/releases/brltty-4.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e41f52e1d90d6d846af3cdf2ec49e9f2
diff --git a/metadata/md5-cache/app-accessibility/brltty-4.2-r1 b/metadata/md5-cache/app-accessibility/brltty-4.2-r1
index 473c0626179e..2c656eee29c5 100644
--- a/metadata/md5-cache/app-accessibility/brltty-4.2-r1
+++ b/metadata/md5-cache/app-accessibility/brltty-4.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=virtual/pkgconfig 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=virtual/pkgconfig 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Daemon that provides access to the Linux/Unix console for a blind person
 EAPI=4
 HOMEPAGE=http://mielke.cc/brltty/
@@ -10,5 +10,5 @@ RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=s
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api ) tcl? ( api )
 SLOT=0
 SRC_URI=http://mielke.cc/brltty/releases/brltty-4.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=046eca07f4e913bacbd40967064a17c6
diff --git a/metadata/md5-cache/app-accessibility/epos-2.5.37-r1 b/metadata/md5-cache/app-accessibility/epos-2.5.37-r1
index 19415599814f..ef21792542bb 100644
--- a/metadata/md5-cache/app-accessibility/epos-2.5.37-r1
+++ b/metadata/md5-cache/app-accessibility/epos-2.5.37-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=app-text/sgmltools-lite-3.0.3-r9 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-text/sgmltools-lite-3.0.3-r9 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=language independent text-to-speech system
 EAPI=4
 HOMEPAGE=http://epos.ure.cas.cz/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/epos/epos-2.5.37.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7e217930bf9e6c20f060233e4e825a21
diff --git a/metadata/md5-cache/app-accessibility/flite-1.4-r2 b/metadata/md5-cache/app-accessibility/flite-1.4-r2
index 610f797bb255..ef615e16c332 100644
--- a/metadata/md5-cache/app-accessibility/flite-1.4-r2
+++ b/metadata/md5-cache/app-accessibility/flite-1.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.24.1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.24.1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Flite text to speech engine
 EAPI=4
 HOMEPAGE=http://www.speech.cs.cmu.edu/flite/index.html
@@ -9,5 +9,5 @@ LICENSE=BSD freetts public-domain regexp-UofT BSD-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.24.1 )
 SLOT=0
 SRC_URI=http://www.speech.cs.cmu.edu/flite/packed/flite-1.4/flite-1.4-release.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8cd611e793dd86be3b19d1d38df76464
diff --git a/metadata/md5-cache/app-accessibility/java-access-bridge-1.26.0 b/metadata/md5-cache/app-accessibility/java-access-bridge-1.26.0
index 0f051bbcabf0..b158ec7dc810 100644
--- a/metadata/md5-cache/app-accessibility/java-access-bridge-1.26.0
+++ b/metadata/md5-cache/app-accessibility/java-access-bridge-1.26.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=gnome-base/libbonobo-2 >=gnome-extra/at-spi-1.7.10:1 x11-apps/xprop >=virtual/jdk-1.4 virtual/pkgconfig >=dev-java/java-config-2.1.9-r1 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=gnome-base/libbonobo-2 >=gnome-extra/at-spi-1.7.10:1 x11-apps/xprop >=virtual/jdk-1.4 virtual/pkgconfig >=dev-java/java-config-2.1.9-r1 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Gnome Java Accessibility Bridge
 EAPI=2
 HOMEPAGE=http://developer.gnome.org/projects/gap/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://gnome/sources/java-access-bridge/1.26/java-access-bridge-1.26.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b7d9be437f5b3ff6158e1716f1a4347a
diff --git a/metadata/md5-cache/app-accessibility/java-access-bridge-1.26.2 b/metadata/md5-cache/app-accessibility/java-access-bridge-1.26.2
index db458cb179c1..fe5f95628631 100644
--- a/metadata/md5-cache/app-accessibility/java-access-bridge-1.26.2
+++ b/metadata/md5-cache/app-accessibility/java-access-bridge-1.26.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=gnome-base/libbonobo-2 >=gnome-extra/at-spi-1.7.10:1 x11-apps/xprop >=virtual/jdk-1.4 virtual/pkgconfig >=dev-java/java-config-2.1.9-r1 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=gnome-base/libbonobo-2 >=gnome-extra/at-spi-1.7.10:1 x11-apps/xprop >=virtual/jdk-1.4 virtual/pkgconfig >=dev-java/java-config-2.1.9-r1 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Gnome Java Accessibility Bridge
 EAPI=4
 HOMEPAGE=https://live.gnome.org/Java%20Access%20Bridge/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://gnome/sources/java-access-bridge/1.26/java-access-bridge-1.26.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7776184758caaf60f60a45c78d0d2916
diff --git a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.7.1-r1 b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.7.1-r1
index 84639eb51188..e7f08e6c2f0b 100644
--- a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.7.1-r1
+++ b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.7.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=speech-dispatcher speech synthesis interface
 EAPI=3
 HOMEPAGE=http://www.freebsoft.org/speechd
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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* )
 SLOT=0
 SRC_URI=http://www.freebsoft.org/pub/projects/speechd/speech-dispatcher-0.7.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=6989a1005850b97951ff2a793cd5cf29
diff --git a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.7.1-r2 b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.7.1-r2
index 2d4c2c77f26d..93fa05f231b0 100644
--- a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.7.1-r2
+++ b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.7.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Speech synthesis interface
 EAPI=5
 HOMEPAGE=http://www.freebsoft.org/speechd
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://www.freebsoft.org/pub/projects/speechd/speech-dispatcher-0.7.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5ece492998cf007beda5f6e0bd1e62e4
diff --git a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8-r1 b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8-r1
index 9d98d6d6a3df..84b33a37f1f7 100644
--- a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8-r1
+++ b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.28:2 >=media-libs/libsndfile-1.0.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 )
 SLOT=0
 SRC_URI=http://www.freebsoft.org/pub/projects/speechd/speech-dispatcher-0.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d65cdb1f234e6242da4cfa1e495f0a2c
diff --git a/metadata/md5-cache/app-accessibility/sphinx2-0.6 b/metadata/md5-cache/app-accessibility/sphinx2-0.6
index b464e908ae1e..774efc6f5f0c 100644
--- a/metadata/md5-cache/app-accessibility/sphinx2-0.6
+++ b/metadata/md5-cache/app-accessibility/sphinx2-0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=CMU Speech Recognition-engine
 EAPI=2
 HOMEPAGE=http://fife.speech.cs.cmu.edu/sphinx/
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=mirror://sourceforge/cmusphinx/sphinx2-0.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=616f8ab7309a0010103946a49b360a96
diff --git a/metadata/md5-cache/app-accessibility/sphinx3-0.8 b/metadata/md5-cache/app-accessibility/sphinx3-0.8
index 665e4d9fced5..a8809f6007b7 100644
--- a/metadata/md5-cache/app-accessibility/sphinx3-0.8
+++ b/metadata/md5-cache/app-accessibility/sphinx3-0.8
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=app-accessibility/sphinxbase-0.7[static-libs?,python?] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/cmusphinx/sphinx3-0.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2aa88e97b0a7ac9149cd4dd48bf60552
diff --git a/metadata/md5-cache/app-accessibility/sphinxbase-0.7 b/metadata/md5-cache/app-accessibility/sphinxbase-0.7
index 7459c62d4716..1c98775d2844 100644
--- a/metadata/md5-cache/app-accessibility/sphinxbase-0.7
+++ b/metadata/md5-cache/app-accessibility/sphinxbase-0.7
@@ -9,5 +9,5 @@ LICENSE=BSD-2 HPND MIT
 RDEPEND=lapack? ( virtual/lapack ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/cmusphinx/sphinxbase-0.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=418a51808fa50adc7acbe445aaab0f31
diff --git a/metadata/md5-cache/app-accessibility/sphinxbase-0.8 b/metadata/md5-cache/app-accessibility/sphinxbase-0.8
index fb27cf8094ac..41c64011a604 100644
--- a/metadata/md5-cache/app-accessibility/sphinxbase-0.8
+++ b/metadata/md5-cache/app-accessibility/sphinxbase-0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-sound/pulseaudio lapack? ( virtual/lapack ) python? ( python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) doc? ( >=app-doc/doxygen-1.4.7 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-sound/pulseaudio lapack? ( virtual/lapack ) python? ( python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) doc? ( >=app-doc/doxygen-1.4.7 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Support library required by the Sphinx Speech Recognition Engine
 EAPI=5
 HOMEPAGE=http://cmusphinx.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD-2 HPND MIT
 RDEPEND=media-sound/pulseaudio lapack? ( virtual/lapack ) python? ( python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/cmusphinx/sphinxbase-0.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ff0244c2381d2c4a869c35cd901e3058
diff --git a/metadata/md5-cache/app-accessibility/yasr-0.6.9-r1 b/metadata/md5-cache/app-accessibility/yasr-0.6.9-r1
index 4d0e0a767614..cd14d975298f 100644
--- a/metadata/md5-cache/app-accessibility/yasr-0.6.9-r1
+++ b/metadata/md5-cache/app-accessibility/yasr-0.6.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=general-purpose console screen reader
 EAPI=2
 HOMEPAGE=http://yasr.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/yasr/yasr-0.6.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9c2621b7c78db73189bbfbd779f1aec5
diff --git a/metadata/md5-cache/app-admin/abrt-2.0.12-r1 b/metadata/md5-cache/app-admin/abrt-2.0.12-r1
index 1a87605006e1..ab29014d4db6 100644
--- a/metadata/md5-cache/app-admin/abrt-2.0.12-r1
+++ b/metadata/md5-cache/app-admin/abrt-2.0.12-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/btparser-0.18 >=dev-libs/glib-2.21:2 >=dev-libs/libreport-2.0.11 dev-libs/libxml2 dev-libs/nss sys-apps/dbus sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 x11-libs/libnotify app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.35.0 virtual/pkgconfig >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) virtual/pkgconfig
+DEPEND=>=dev-libs/btparser-0.18 >=dev-libs/glib-2.21:2 >=dev-libs/libreport-2.0.11 dev-libs/libxml2 dev-libs/nss sys-apps/dbus sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 x11-libs/libnotify app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.35.0 virtual/pkgconfig >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) virtual/pkgconfig
 DESCRIPTION=Automatic bug detection and reporting tool
 EAPI=4
 HOMEPAGE=https://fedorahosted.org/abrt/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/btparser-0.18 >=dev-libs/glib-2.21:2 >=dev-libs/libreport-2.0.11 dev-libs/libxml2 dev-libs/nss sys-apps/dbus sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 x11-libs/libnotify app-arch/cpio dev-libs/elfutils >=sys-devel/gdb-7 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=https://fedorahosted.org/released/abrt/abrt-2.0.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b1f4530429c994700abcc103b51ef476
diff --git a/metadata/md5-cache/app-admin/abrt-2.0.8 b/metadata/md5-cache/app-admin/abrt-2.0.8
index b87663ac72d2..ac9ff52d1658 100644
--- a/metadata/md5-cache/app-admin/abrt-2.0.8
+++ b/metadata/md5-cache/app-admin/abrt-2.0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=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 virtual/pkgconfig >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) virtual/pkgconfig
+DEPEND=>=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 virtual/pkgconfig >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) virtual/pkgconfig
 DESCRIPTION=Automatic bug detection and reporting tool
 EAPI=4
 HOMEPAGE=https://fedorahosted.org/abrt/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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* )
 SLOT=0
 SRC_URI=https://fedorahosted.org/released/abrt/abrt-2.0.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3942376d98ed525406866a1347325b8d
diff --git a/metadata/md5-cache/app-admin/apachetop-0.12.6-r1 b/metadata/md5-cache/app-admin/apachetop-0.12.6-r1
index 591a3e8a8d69..e20f011bfa4c 100644
--- a/metadata/md5-cache/app-admin/apachetop-0.12.6-r1
+++ b/metadata/md5-cache/app-admin/apachetop-0.12.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=fam? ( virtual/fam ) pcre? ( dev-libs/libpcre ) adns? ( net-libs/adns ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=fam? ( virtual/fam ) pcre? ( dev-libs/libpcre ) adns? ( net-libs/adns ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A realtime Apache log analyzer
 EAPI=2
 HOMEPAGE=http://www.webta.org/projects/apachetop
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=fam? ( virtual/fam ) pcre? ( dev-libs/libpcre ) adns? ( net-libs/adns )
 SLOT=0
 SRC_URI=http://www.webta.org/apachetop/apachetop-0.12.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=19cb89dc066b291c5c26f803c0fbcd64
diff --git a/metadata/md5-cache/app-admin/augeas-0.10.0-r1 b/metadata/md5-cache/app-admin/augeas-0.10.0-r1
index 8fb0db002725..d70cb5951085 100644
--- a/metadata/md5-cache/app-admin/augeas-0.10.0-r1
+++ b/metadata/md5-cache/app-admin/augeas-0.10.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxml2 sys-libs/readline
 SLOT=0
 SRC_URI=http://augeas.net/download/augeas-0.10.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4144e6777fe34840a228787b548c6674
diff --git a/metadata/md5-cache/app-admin/ccze-0.2.1-r2 b/metadata/md5-cache/app-admin/ccze-0.2.1-r2
index 913d897c6234..87dec641d42c 100644
--- a/metadata/md5-cache/app-admin/ccze-0.2.1-r2
+++ b/metadata/md5-cache/app-admin/ccze-0.2.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-libs/libpcre >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libpcre >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A flexible and fast logfile colorizer
 HOMEPAGE=http://dev.gentoo.org/~joker/ccze/ccze.txt
 KEYWORDS=amd64 ppc x86 ~x86-fbsd
@@ -8,5 +8,5 @@ RDEPEND=dev-libs/libpcre
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/ccze-0.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8f99bf6587ca25bc18de251ef719cc0f
diff --git a/metadata/md5-cache/app-admin/ccze-0.2.1-r3 b/metadata/md5-cache/app-admin/ccze-0.2.1-r3
index c5accf92a402..1ccde45d15f9 100644
--- a/metadata/md5-cache/app-admin/ccze-0.2.1-r3
+++ b/metadata/md5-cache/app-admin/ccze-0.2.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=dev-libs/libpcre sys-libs/ncurses >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libpcre sys-libs/ncurses >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A flexible and fast logfile colorizer
 EAPI=4
 HOMEPAGE=http://dev.gentoo.org/~joker/ccze/ccze.txt
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/libpcre sys-libs/ncurses
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/ccze-0.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7cfaacac2a62aeb9702724f0bc36d21b
diff --git a/metadata/md5-cache/app-admin/chrpath-0.13-r2 b/metadata/md5-cache/app-admin/chrpath-0.13-r2
index 54bb164a785f..4ea9ef29903b 100644
--- a/metadata/md5-cache/app-admin/chrpath-0.13-r2
+++ b/metadata/md5-cache/app-admin/chrpath-0.13-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=chrpath can modify the rpath and runpath of ELF executables
 EAPI=2
 HOMEPAGE=http://directory.fsf.org/project/chrpath/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm ppc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://ftp.tux.org/pub/X-Windows/ftp.hungry.com/chrpath/chrpath-0.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4c46ac146b6b50b33f4342375d666f4d
diff --git a/metadata/md5-cache/app-admin/collectd-5.1.0-r1 b/metadata/md5-cache/app-admin/collectd-5.1.0-r1
index e2ef672c3aa3..1314cec276a0 100644
--- a/metadata/md5-cache/app-admin/collectd-5.1.0-r1
+++ b/metadata/md5-cache/app-admin/collectd-5.1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=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.13 ) 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-3.3.0 ) 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 ) ) virtual/pkgconfig kernel_linux? ( collectd_plugins_vserver? ( sys-kernel/vserver-sources ) ) dev-lang/perl[-build] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.13 ) 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-3.3.0 ) 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 ) ) virtual/pkgconfig kernel_linux? ( collectd_plugins_vserver? ( sys-kernel/vserver-sources ) ) dev-lang/perl[-build] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A small daemon which collects system performance statistics - with a near-infinite number of plugins
 EAPI=4
 HOMEPAGE=http://collectd.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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.13 ) 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-3.3.0 ) 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]
 SLOT=0
 SRC_URI=http://collectd.org/files/collectd-5.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dd1dd3b71a4cba6b362f00763e534808
diff --git a/metadata/md5-cache/app-admin/collectd-5.1.0-r2 b/metadata/md5-cache/app-admin/collectd-5.1.0-r2
index daf9b020d98b..7661460c7fcf 100644
--- a/metadata/md5-cache/app-admin/collectd-5.1.0-r2
+++ b/metadata/md5-cache/app-admin/collectd-5.1.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=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.13 ) 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-3.3.0 ) 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 ) collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver ) 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 ) ) virtual/pkgconfig kernel_linux? ( collectd_plugins_vserver? ( sys-kernel/vserver-sources ) ) dev-lang/perl[-build] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.13 ) 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-3.3.0 ) 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 ) collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver ) 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 ) ) virtual/pkgconfig kernel_linux? ( collectd_plugins_vserver? ( sys-kernel/vserver-sources ) ) dev-lang/perl[-build] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A small daemon which collects system performance statistics - with a near-infinite number of plugins
 EAPI=4
 HOMEPAGE=http://collectd.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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.13 ) 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-3.3.0 ) 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 ) collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver ) 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]
 SLOT=0
 SRC_URI=http://collectd.org/files/collectd-5.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=df893dab69bb9253df41415323553cd9
diff --git a/metadata/md5-cache/app-admin/collectd-5.1.1 b/metadata/md5-cache/app-admin/collectd-5.1.1
index 02b0d75b8256..667ed716a9ce 100644
--- a/metadata/md5-cache/app-admin/collectd-5.1.1
+++ b/metadata/md5-cache/app-admin/collectd-5.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=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.13 ) 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-3.3.0 ) 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 ) collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver ) 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 ) ) virtual/pkgconfig kernel_linux? ( collectd_plugins_vserver? ( sys-kernel/vserver-sources ) ) dev-lang/perl[-build] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.13 ) 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-3.3.0 ) 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 ) collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver ) 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 ) ) virtual/pkgconfig kernel_linux? ( collectd_plugins_vserver? ( sys-kernel/vserver-sources ) ) dev-lang/perl[-build] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A small daemon which collects system performance statistics - with a near-infinite number of plugins
 EAPI=4
 HOMEPAGE=http://collectd.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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.13 ) 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-3.3.0 ) 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 ) collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver ) 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]
 SLOT=0
 SRC_URI=http://collectd.org/files/collectd-5.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fe4c94c470ba1acc0b8f0a156ee4c462
diff --git a/metadata/md5-cache/app-admin/collectd-5.1.1-r1 b/metadata/md5-cache/app-admin/collectd-5.1.1-r1
index a64589e2a0c6..ca43bbcee901 100644
--- a/metadata/md5-cache/app-admin/collectd-5.1.1-r1
+++ b/metadata/md5-cache/app-admin/collectd-5.1.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=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.13 ) 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-3.3.0 ) 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 ) collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver ) 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 ) ) virtual/pkgconfig kernel_linux? ( collectd_plugins_vserver? ( sys-kernel/vserver-sources ) ) dev-lang/perl[-build] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.13 ) 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-3.3.0 ) 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 ) collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver ) 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 ) ) virtual/pkgconfig kernel_linux? ( collectd_plugins_vserver? ( sys-kernel/vserver-sources ) ) dev-lang/perl[-build] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A small daemon which collects system performance statistics - with a near-infinite number of plugins
 EAPI=4
 HOMEPAGE=http://collectd.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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.13 ) 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-3.3.0 ) 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 ) collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver ) 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]
 SLOT=0
 SRC_URI=http://collectd.org/files/collectd-5.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0338f0011d5e0644ae31eb633a6bd886
diff --git a/metadata/md5-cache/app-admin/collectd-5.2.0 b/metadata/md5-cache/app-admin/collectd-5.2.0
index 1cf1bd1b21a8..ff59131ea530 100644
--- a/metadata/md5-cache/app-admin/collectd-5.2.0
+++ b/metadata/md5-cache/app-admin/collectd-5.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=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.13 ) 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-3.3.0 ) 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 ) collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver ) 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 ) ) virtual/pkgconfig kernel_linux? ( collectd_plugins_vserver? ( sys-kernel/vserver-sources ) ) dev-lang/perl[-build] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.13 ) 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-3.3.0 ) 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 ) collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver ) 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 ) ) virtual/pkgconfig kernel_linux? ( collectd_plugins_vserver? ( sys-kernel/vserver-sources ) ) dev-lang/perl[-build] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A a daemon which collects system statistic and provides mechanisms to store the values
 EAPI=4
 HOMEPAGE=http://collectd.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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.13 ) 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-3.3.0 ) 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 ) collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver ) 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]
 SLOT=0
 SRC_URI=http://collectd.org/files/collectd-5.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7e7d393d16ab92a8bb15d4522d3a4826
diff --git a/metadata/md5-cache/app-admin/collectd-5.2.0-r1 b/metadata/md5-cache/app-admin/collectd-5.2.0-r1
index 009fd486e68e..d39ff906d426 100644
--- a/metadata/md5-cache/app-admin/collectd-5.2.0-r1
+++ b/metadata/md5-cache/app-admin/collectd-5.2.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=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.13 ) 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-3.3.0 ) 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 ) collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver ) 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 ) ) virtual/pkgconfig kernel_linux? ( collectd_plugins_vserver? ( sys-kernel/vserver-sources ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] virtual/pkgconfig
+DEPEND=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.13 ) 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-3.3.0 ) 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 ) collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver ) 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 ) ) virtual/pkgconfig kernel_linux? ( collectd_plugins_vserver? ( sys-kernel/vserver-sources ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] virtual/pkgconfig
 DESCRIPTION=A a daemon which collects system statistic and provides mechanisms to store the values
 EAPI=5
 HOMEPAGE=http://collectd.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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.13 ) 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-3.3.0 ) 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 ) collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver ) 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]
 SLOT=0
 SRC_URI=http://collectd.org/files/collectd-5.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b964fcbd9aa2db189a1c3be775b78955
diff --git a/metadata/md5-cache/app-admin/collectd-5.2.1 b/metadata/md5-cache/app-admin/collectd-5.2.1
index 911f3937edc0..dc2a2c4b6e47 100644
--- a/metadata/md5-cache/app-admin/collectd-5.2.1
+++ b/metadata/md5-cache/app-admin/collectd-5.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=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.13 ) 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-3.3.0 ) 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 ) collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver ) 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 ) ) virtual/pkgconfig kernel_linux? ( collectd_plugins_vserver? ( sys-kernel/vserver-sources ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] virtual/pkgconfig
+DEPEND=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.13 ) 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-3.3.0 ) 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 ) collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver ) 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 ) ) virtual/pkgconfig kernel_linux? ( collectd_plugins_vserver? ( sys-kernel/vserver-sources ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] virtual/pkgconfig
 DESCRIPTION=A a daemon which collects system statistic and provides mechanisms to store the values
 EAPI=4
 HOMEPAGE=http://collectd.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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.13 ) 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-3.3.0 ) 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 ) collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver ) 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]
 SLOT=0
 SRC_URI=http://collectd.org/files/collectd-5.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2a4a7250e499d8c004310049d275438d
diff --git a/metadata/md5-cache/app-admin/conserver-8.1.18 b/metadata/md5-cache/app-admin/conserver-8.1.18
index b97a56414480..f42cc165dd03 100644
--- a/metadata/md5-cache/app-admin/conserver-8.1.18
+++ b/metadata/md5-cache/app-admin/conserver-8.1.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Serial Console Manager
 EAPI=4
 HOMEPAGE=http://www.conserver.com/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://www.conserver.com/conserver-8.1.18.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4e8ffb8896de94a60b8de3b8290290d3
diff --git a/metadata/md5-cache/app-admin/cronolog-1.6.2-r3 b/metadata/md5-cache/app-admin/cronolog-1.6.2-r3
index 193a7c2b5d38..7c3d3bc81431 100644
--- a/metadata/md5-cache/app-admin/cronolog-1.6.2-r3
+++ b/metadata/md5-cache/app-admin/cronolog-1.6.2-r3
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Cronolog apache logfile rotator
 HOMEPAGE=http://cronolog.org/
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://cronolog.org/download/cronolog-1.6.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9249e54dbab353351bd129073c65d579
diff --git a/metadata/md5-cache/app-admin/cronolog-1.6.2-r4 b/metadata/md5-cache/app-admin/cronolog-1.6.2-r4
index 0ca30d8756c2..80ed3c476f63 100644
--- a/metadata/md5-cache/app-admin/cronolog-1.6.2-r4
+++ b/metadata/md5-cache/app-admin/cronolog-1.6.2-r4
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Cronolog apache logfile rotator
 HOMEPAGE=http://cronolog.org/
 KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://cronolog.org/download/cronolog-1.6.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=31e0822fb44ccc99bdf8402a81aa29bd
diff --git a/metadata/md5-cache/app-admin/elektra-0.7.1-r3 b/metadata/md5-cache/app-admin/elektra-0.7.1-r3
index ab8b3c9cf11d..5a3f60b83912 100644
--- a/metadata/md5-cache/app-admin/elektra-0.7.1-r3
+++ b/metadata/md5-cache/app-admin/elektra-0.7.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libxml2 sys-devel/libtool iconv? ( virtual/libiconv ) test? ( dev-libs/libxml2[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 sys-devel/libtool iconv? ( virtual/libiconv ) test? ( dev-libs/libxml2[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=universal and secure framework to store config parameters in a hierarchical key-value pair mechanism
 EAPI=4
 HOMEPAGE=http://freedesktop.org/wiki/Software/Elektra
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libxml2
 SLOT=0
 SRC_URI=ftp://ftp.markus-raab.org/elektra/elektra-0.7.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e009427e1f41afa5ef8673bd0e19b91f
diff --git a/metadata/md5-cache/app-admin/elektra-0.7.1-r4 b/metadata/md5-cache/app-admin/elektra-0.7.1-r4
index ef81f0cb91e4..f10def97d8e2 100644
--- a/metadata/md5-cache/app-admin/elektra-0.7.1-r4
+++ b/metadata/md5-cache/app-admin/elektra-0.7.1-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!amd64? ( dev-libs/libxml2 ) amd64? ( abi_x86_64? ( dev-libs/libxml2 ) abi_x86_32? ( app-emulation/emul-linux-x86-baselibs ) ) !amd64? ( sys-devel/libtool ) amd64? ( abi_x86_64? ( sys-devel/libtool ) ) iconv? ( virtual/libiconv ) !amd64? ( test? ( dev-libs/libxml2[static-libs] ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!amd64? ( dev-libs/libxml2 ) amd64? ( abi_x86_64? ( dev-libs/libxml2 ) abi_x86_32? ( app-emulation/emul-linux-x86-baselibs ) ) !amd64? ( sys-devel/libtool ) amd64? ( abi_x86_64? ( sys-devel/libtool ) ) iconv? ( virtual/libiconv ) !amd64? ( test? ( dev-libs/libxml2[static-libs] ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=universal and secure framework to store config parameters in a hierarchical key-value pair mechanism
 EAPI=5
 HOMEPAGE=http://freedesktop.org/wiki/Software/Elektra
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!amd64? ( dev-libs/libxml2 ) amd64? ( abi_x86_64? ( dev-libs/libxml2 ) abi_x86_32? ( app-emulation/emul-linux-x86-baselibs ) )
 SLOT=0
 SRC_URI=ftp://ftp.markus-raab.org/elektra/elektra-0.7.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a09e206071c89b1504dc0f88da5bace9
diff --git a/metadata/md5-cache/app-admin/eselect-9999 b/metadata/md5-cache/app-admin/eselect-9999
index 4fcd0a876fe8..8cf5c6e10233 100644
--- a/metadata/md5-cache/app-admin/eselect-9999
+++ b/metadata/md5-cache/app-admin/eselect-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) doc? ( dev-python/docutils ) dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) doc? ( dev-python/docutils ) dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Gentoo's multi-purpose configuration and management tool
 EAPI=4
 HOMEPAGE=http://www.gentoo.org/proj/en/eselect/
@@ -7,5 +7,5 @@ IUSE=doc
 LICENSE=GPL-2+
 RDEPEND=!app-admin/eselect-news sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=dffc77429f6ad88e9b0c115b82194f86
diff --git a/metadata/md5-cache/app-admin/eselect-lib-bin-symlink-0.1 b/metadata/md5-cache/app-admin/eselect-lib-bin-symlink-0.1
index 30d18280fc6d..82da8fffc87f 100644
--- a/metadata/md5-cache/app-admin/eselect-lib-bin-symlink-0.1
+++ b/metadata/md5-cache/app-admin/eselect-lib-bin-symlink-0.1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/eselect-lib-bin-symlink/downloads/eselect-lib-bin-symlink-0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=43d0fc4dc3164862f7c7cf6a1a31cba7
diff --git a/metadata/md5-cache/app-admin/eselect-lib-bin-symlink-0.1.1 b/metadata/md5-cache/app-admin/eselect-lib-bin-symlink-0.1.1
index dcca9e9a36b3..9bc0365d9569 100644
--- a/metadata/md5-cache/app-admin/eselect-lib-bin-symlink-0.1.1
+++ b/metadata/md5-cache/app-admin/eselect-lib-bin-symlink-0.1.1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/eselect-lib-bin-symlink/downloads/eselect-lib-bin-symlink-0.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=764183faf895f4915b3385eee6b85ec3
diff --git a/metadata/md5-cache/app-admin/eselect-lib-bin-symlink-9999 b/metadata/md5-cache/app-admin/eselect-lib-bin-symlink-9999
index ba716ea0a53c..977c5e7f8bca 100644
--- a/metadata/md5-cache/app-admin/eselect-lib-bin-symlink-9999
+++ b/metadata/md5-cache/app-admin/eselect-lib-bin-symlink-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An eselect library to manage executable symlinks
 EAPI=5
 HOMEPAGE=https://bitbucket.org/mgorny/eselect-lib-bin-symlink/
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3e0b007fd1926041acb637c688414c1d
diff --git a/metadata/md5-cache/app-admin/eselect-python-99999999 b/metadata/md5-cache/app-admin/eselect-python-99999999
index c706e4a4be15..1887d5f1f90d 100644
--- a/metadata/md5-cache/app-admin/eselect-python-99999999
+++ b/metadata/md5-cache/app-admin/eselect-python-99999999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install postinst unpack
-DEPEND=sys-devel/autoconf || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=sys-devel/autoconf || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Eselect module for management of multiple Python versions
 HOMEPAGE=http://www.gentoo.org/proj/en/Python/
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=336b8f196174eec5248e9f489f47f4a1
diff --git a/metadata/md5-cache/app-admin/fam-2.7.0-r6 b/metadata/md5-cache/app-admin/fam-2.7.0-r6
index 2b3db813acb1..43d1d50ce1f7 100644
--- a/metadata/md5-cache/app-admin/fam-2.7.0-r6
+++ b/metadata/md5-cache/app-admin/fam-2.7.0-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( net-nds/rpcbind >=net-nds/portmap-5b-r6 ) !app-admin/gamin || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( net-nds/rpcbind >=net-nds/portmap-5b-r6 ) !app-admin/gamin || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=FAM, the File Alteration Monitor
 EAPI=2
 HOMEPAGE=http://oss.sgi.com/projects/fam/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=|| ( net-nds/rpcbind >=net-nds/portmap-5b-r6 ) !app-admin/gamin
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a015f8231bf3dd75b2b28fc58d269cd3
diff --git a/metadata/md5-cache/app-admin/gam-server-0.1.10-r1 b/metadata/md5-cache/app-admin/gam-server-0.1.10-r1
index 2105bc605a21..7d5df44824cd 100644
--- a/metadata/md5-cache/app-admin/gam-server-0.1.10-r1
+++ b/metadata/md5-cache/app-admin/gam-server-0.1.10-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2:2 >=dev-libs/libgamin-0.1.10 !app-admin/fam !<app-admin/gamin-0.1.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2:2 >=dev-libs/libgamin-0.1.10 !app-admin/fam !<app-admin/gamin-0.1.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library providing the FAM File Alteration Monitor API
 EAPI=3
 HOMEPAGE=http://www.gnome.org/~veillard/gamin/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2:2 >=dev-libs/libgamin-0.1.10 !app-admin/fam !<app-admin/gamin-0.1.10
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8583d161e6c1650a515f2267a809156b
diff --git a/metadata/md5-cache/app-admin/geolizer-2.01.10_p20070115 b/metadata/md5-cache/app-admin/geolizer-2.01.10_p20070115
index 06204c656e9d..780e08670591 100644
--- a/metadata/md5-cache/app-admin/geolizer-2.01.10_p20070115
+++ b/metadata/md5-cache/app-admin/geolizer-2.01.10_p20070115
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare prerm setup
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Webserver log file analyzer
 EAPI=2
 HOMEPAGE=http://sysd.org/stas/node/10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=75d0b2ddf3522d02c648a7540612b6eb
diff --git a/metadata/md5-cache/app-admin/geolizer-2.01.10_p20070115-r1 b/metadata/md5-cache/app-admin/geolizer-2.01.10_p20070115-r1
index ffb0d38f36fd..8e6ca88970f1 100644
--- a/metadata/md5-cache/app-admin/geolizer-2.01.10_p20070115-r1
+++ b/metadata/md5-cache/app-admin/geolizer-2.01.10_p20070115-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare prerm setup
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Webserver log file analyzer
 EAPI=2
 HOMEPAGE=http://sysd.org/stas/node/10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=d5ada66011f425b728c0a69ecba0aa66
diff --git a/metadata/md5-cache/app-admin/gksu-polkit-0.0.3 b/metadata/md5-cache/app-admin/gksu-polkit-0.0.3
index dd445ba66baa..b95cf8e319f0 100644
--- a/metadata/md5-cache/app-admin/gksu-polkit-0.0.3
+++ b/metadata/md5-cache/app-admin/gksu-polkit-0.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-util/intltool virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-util/intltool virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Polkit-based library and application for running programs as root
 EAPI=4
 HOMEPAGE=https://live.gnome.org/gksu
@@ -8,5 +8,5 @@ LICENSE=LGPL-3
 RDEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.14:2 >=dev-libs/libgee-0.5:0 sys-auth/polkit >=x11-libs/gtk+-2.14:2 x11-libs/startup-notification
 SLOT=0
 SRC_URI=mirror://debian/pool/main/g/gksu-polkit/gksu-polkit_0.0.3.orig.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f6400245c27e664a2e909dce3bec3930
diff --git a/metadata/md5-cache/app-admin/gnome-system-tools-2.32.0-r3 b/metadata/md5-cache/app-admin/gnome-system-tools-2.32.0-r3
index aec83b7b9333..9b5d7864341c 100644
--- a/metadata/md5-cache/app-admin/gnome-system-tools-2.32.0-r3
+++ b/metadata/md5-cache/app-admin/gnome-system-tools-2.32.0-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 virtual/pkgconfig >=dev-util/intltool-0.35.0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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 virtual/pkgconfig >=dev-util/intltool-0.35.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Tools aimed to make easy the administration of UNIX systems
 EAPI=4
 HOMEPAGE=http://www.gnome.org/projects/gst/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=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 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-system-tools/2.32/gnome-system-tools-2.32.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=42c7dfdff109dabfc2dd4cf65b59ee5f
diff --git a/metadata/md5-cache/app-admin/gtkdiskfree-2.0.1 b/metadata/md5-cache/app-admin/gtkdiskfree-2.0.1
index e3e6f4c6f930..5b9925daf742 100644
--- a/metadata/md5-cache/app-admin/gtkdiskfree-2.0.1
+++ b/metadata/md5-cache/app-admin/gtkdiskfree-2.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:3 ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:3 ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Graphical tool to show free disk space
 EAPI=4
 HOMEPAGE=https://gitorious.org/gtkdiskfree
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:3 )
 SLOT=0
 SRC_URI=mirror://gentoo/gtkdiskfree-2.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=2987a91b1edc58a5cfd527790baf9191
diff --git a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r22 b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r22
index 180943d57729..7717464af1c8 100644
--- a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r22
+++ b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r22
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A simple utility to read the temperature of SMART capable hard drives
 EAPI=4
 HOMEPAGE=http://savannah.nongnu.org/projects/hddtemp/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2 mirror://gentoo/hddtemp-20080531.db.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=acff7065efb2ee2b64d0242201629dfa
diff --git a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r3 b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r3
index 437d0cda7fc3..edfbc138c08c 100644
--- a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r3
+++ b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config install postinst unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A simple utility to read the temperature of SMART capable hard drives
 HOMEPAGE=http://savannah.nongnu.org/projects/hddtemp/
 IUSE=nls
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2 mirror://gentoo/hddtemp-20080531.db.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6b1db6c7915332b9d26505cf4a0ce1d1
diff --git a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r5 b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r5
index 7d29eb2047bf..10b1c38ccd21 100644
--- a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r5
+++ b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config install postinst unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A simple utility to read the temperature of SMART capable hard drives
 HOMEPAGE=http://savannah.nongnu.org/projects/hddtemp/
 IUSE=nls
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2 mirror://gentoo/hddtemp-20080531.db.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=841a736c79e940940529e392bcbbd6b7
diff --git a/metadata/md5-cache/app-admin/integrit-4.0 b/metadata/md5-cache/app-admin/integrit-4.0
index dc38cc7cc59c..b251e98cdd6c 100644
--- a/metadata/md5-cache/app-admin/integrit-4.0
+++ b/metadata/md5-cache/app-admin/integrit-4.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=file integrity verification program
 HOMEPAGE=http://integrit.sourceforge.net/
 KEYWORDS=~amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/integrit/integrit-4.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=be3f624621a13f9c68993289062017fd
diff --git a/metadata/md5-cache/app-admin/integrit-4.1 b/metadata/md5-cache/app-admin/integrit-4.1
index f4b91d216ff9..04b8d0d10665 100644
--- a/metadata/md5-cache/app-admin/integrit-4.1
+++ b/metadata/md5-cache/app-admin/integrit-4.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=file integrity verification program
 HOMEPAGE=http://integrit.sourceforge.net/
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/integrit/integrit-4.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=f5cc41a420020210b83a695870a1f4c8
diff --git a/metadata/md5-cache/app-admin/integrit-4.1-r1 b/metadata/md5-cache/app-admin/integrit-4.1-r1
index 1316dbb20d8f..10fc2642dc4c 100644
--- a/metadata/md5-cache/app-admin/integrit-4.1-r1
+++ b/metadata/md5-cache/app-admin/integrit-4.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=file integrity verification program
 EAPI=4
 HOMEPAGE=http://integrit.sourceforge.net/
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/integrit/integrit-4.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=828fb1bd4d972801e530f27f1943629d
diff --git a/metadata/md5-cache/app-admin/logmon-0.4.4 b/metadata/md5-cache/app-admin/logmon-0.4.4
index 0847987593ec..67e2ed75ffaf 100644
--- a/metadata/md5-cache/app-admin/logmon-0.4.4
+++ b/metadata/md5-cache/app-admin/logmon-0.4.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Split-screen terminal/ncurses based log viewer
 HOMEPAGE=http://www.edespot.com/code/LogMon/
 KEYWORDS=amd64 ~ppc ppc64 x86
@@ -7,5 +7,5 @@ LICENSE=Artistic
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.edespot.com/code/LogMon/LogMon-0.4.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e62018a415c28b5938d73737be4f10cf
diff --git a/metadata/md5-cache/app-admin/logmon-0.4.4-r1 b/metadata/md5-cache/app-admin/logmon-0.4.4-r1
index 6aab8a2203c0..a6d8e0c351aa 100644
--- a/metadata/md5-cache/app-admin/logmon-0.4.4-r1
+++ b/metadata/md5-cache/app-admin/logmon-0.4.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=sys-libs/glibc sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/glibc sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Split-screen terminal/ncurses based log viewer
 EAPI=5
 HOMEPAGE=http://www.edespot.com/code/LogMon/
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=sys-libs/glibc sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.edespot.com/code/LogMon/LogMon-0.4.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3e1536f6cc40aa6f932e0b5e73ad3345
diff --git a/metadata/md5-cache/app-admin/osiris-4.2.3 b/metadata/md5-cache/app-admin/osiris-4.2.3
index a873c58d7de1..016cf78a7a64 100644
--- a/metadata/md5-cache/app-admin/osiris-4.2.3
+++ b/metadata/md5-cache/app-admin/osiris-4.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postrm setup unpack
-DEPEND=>=dev-libs/openssl-0.9.8c >=sys-libs/db-4.3 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/openssl-0.9.8c >=sys-libs/db-4.3 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=File integrity verification system
 HOMEPAGE=http://osiris.shmoo.com/
 KEYWORDS=~amd64 ~ppc ~x86
@@ -7,5 +7,5 @@ LICENSE=OSIRIS
 RDEPEND=>=dev-libs/openssl-0.9.8c >=sys-libs/db-4.3
 SLOT=0
 SRC_URI=http://osiris.shmoo.com/data/osiris-4.2.3.tar.gz http://osiris.shmoo.com/data/modules/mod_uptime.tar.gz http://osiris.shmoo.com/data/modules/mod_dns.tar.gz http://osiris.shmoo.com/data/modules/mod_nvram.tar.gz http://osiris.shmoo.com/data/modules/mod_ports.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f4bc93791639cbc3fb4d415c4ea21363
diff --git a/metadata/md5-cache/app-admin/procinfo-ng-2.0.304 b/metadata/md5-cache/app-admin/procinfo-ng-2.0.304
index 6f541678c9d0..1ece5ee240f0 100644
--- a/metadata/md5-cache/app-admin/procinfo-ng-2.0.304
+++ b/metadata/md5-cache/app-admin/procinfo-ng-2.0.304
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Completely rewrite of the old system monitoring app procinfo.
 EAPI=3
 HOMEPAGE=http://sourceforge.net/projects/procinfo-ng/
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 LGPL-2.1 )
 RDEPEND=sys-libs/ncurses !app-admin/procinfo
 SLOT=0
 SRC_URI=mirror://sourceforge/procinfo-ng/procinfo-ng-2.0.304.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9cf502112a504edceb5cf5a2d76fd61a
diff --git a/metadata/md5-cache/app-admin/pwgen-2.06-r2 b/metadata/md5-cache/app-admin/pwgen-2.06-r2
index 811a4f3521c1..434f51e178aa 100644
--- a/metadata/md5-cache/app-admin/pwgen-2.06-r2
+++ b/metadata/md5-cache/app-admin/pwgen-2.06-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Password Generator
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/pwgen/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbs
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/pwgen/pwgen-2.06.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a2a455ec6aef9e0cc3a8009c7a1a7593
diff --git a/metadata/md5-cache/app-admin/rsyslog-5.10.1 b/metadata/md5-cache/app-admin/rsyslog-5.10.1
index c306f119c872..df7402561a38 100644
--- a/metadata/md5-cache/app-admin/rsyslog-5.10.1
+++ b/metadata/md5-cache/app-admin/rsyslog-5.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare test
-DEPEND=dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-0.1.3 ) snmp? ( net-analyzer/net-snmp ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-0.1.3 ) snmp? ( net-analyzer/net-snmp ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
 EAPI=4
 HOMEPAGE=http://www.rsyslog.com/
@@ -10,5 +10,5 @@ RDEPEND=dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/k
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-5.10.1.tar.gz zeromq? ( https://github.com/aggregateknowledge/rsyslog-zeromq/tarball/44b551abc29dd5b541884bd51b45b413855a93d8 -> rsyslog-zeromq.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fa5bd76f2b6baf6253cf0622c85190c5
diff --git a/metadata/md5-cache/app-admin/rsyslog-5.8.11 b/metadata/md5-cache/app-admin/rsyslog-5.8.11
index 0c41d64be414..fdba6d45a3e7 100644
--- a/metadata/md5-cache/app-admin/rsyslog-5.8.11
+++ b/metadata/md5-cache/app-admin/rsyslog-5.8.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare test
-DEPEND=dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-0.1.3 ) snmp? ( net-analyzer/net-snmp ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-0.1.3 ) snmp? ( net-analyzer/net-snmp ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
 EAPI=4
 HOMEPAGE=http://www.rsyslog.com/
@@ -10,5 +10,5 @@ RDEPEND=dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/k
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-5.8.11.tar.gz zeromq? ( https://github.com/aggregateknowledge/rsyslog-zeromq/tarball/44b551abc29dd5b541884bd51b45b413855a93d8 -> rsyslog-zeromq.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a7072b01e43639674bd6d2923c5760da
diff --git a/metadata/md5-cache/app-admin/rsyslog-5.8.12 b/metadata/md5-cache/app-admin/rsyslog-5.8.12
index 7ced513bedad..659d57df3e2a 100644
--- a/metadata/md5-cache/app-admin/rsyslog-5.8.12
+++ b/metadata/md5-cache/app-admin/rsyslog-5.8.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare test
-DEPEND=dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-0.1.3 ) snmp? ( net-analyzer/net-snmp ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-0.1.3 ) snmp? ( net-analyzer/net-snmp ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
 EAPI=4
 HOMEPAGE=http://www.rsyslog.com/
@@ -10,5 +10,5 @@ RDEPEND=dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/k
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-5.8.12.tar.gz zeromq? ( https://github.com/aggregateknowledge/rsyslog-zeromq/tarball/44b551abc29dd5b541884bd51b45b413855a93d8 -> rsyslog-zeromq.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9963f9017ccdcfd6d0af868d6f4ea9e4
diff --git a/metadata/md5-cache/app-admin/rsyslog-5.8.5 b/metadata/md5-cache/app-admin/rsyslog-5.8.5
index e2924ddb6dcd..8a4be7075bcd 100644
--- a/metadata/md5-cache/app-admin/rsyslog-5.8.5
+++ b/metadata/md5-cache/app-admin/rsyslog-5.8.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare test
-DEPEND=dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-0.1.3 ) snmp? ( net-analyzer/net-snmp ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-0.1.3 ) snmp? ( net-analyzer/net-snmp ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
 EAPI=4
 HOMEPAGE=http://www.rsyslog.com/
@@ -10,5 +10,5 @@ RDEPEND=dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) gnutls? ( net-libs/gn
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-5.8.5.tar.gz zeromq? ( https://github.com/aggregateknowledge/rsyslog-zeromq/tarball/44b551abc29dd5b541884bd51b45b413855a93d8 -> rsyslog-zeromq.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=59e7a7495cf4b0d955a282f273a1c491
diff --git a/metadata/md5-cache/app-admin/rsyslog-6.2.2 b/metadata/md5-cache/app-admin/rsyslog-6.2.2
index aa3ad0353413..855ff33cf9c7 100644
--- a/metadata/md5-cache/app-admin/rsyslog-6.2.2
+++ b/metadata/md5-cache/app-admin/rsyslog-6.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare test
-DEPEND=dev-libs/libee dev-libs/libestr dev-libs/liblognorm dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-0.1.3 ) snmp? ( net-analyzer/net-snmp ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=dev-libs/libee dev-libs/libestr dev-libs/liblognorm dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-0.1.3 ) snmp? ( net-analyzer/net-snmp ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
 EAPI=4
 HOMEPAGE=http://www.rsyslog.com/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libee dev-libs/libestr dev-libs/liblognorm dbi? ( dev-db/libdbi
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-6.2.2.tar.gz zeromq? ( https://github.com/aggregateknowledge/rsyslog-zeromq/tarball/44b551abc29dd5b541884bd51b45b413855a93d8 -> rsyslog-zeromq.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b266b900c1aa421924101a29c69a7338
diff --git a/metadata/md5-cache/app-admin/rsyslog-6.6.0 b/metadata/md5-cache/app-admin/rsyslog-6.6.0
index 6ef91909df52..a261f500e7a9 100644
--- a/metadata/md5-cache/app-admin/rsyslog-6.6.0
+++ b/metadata/md5-cache/app-admin/rsyslog-6.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare test
-DEPEND=dev-libs/json-c dev-libs/libee dev-libs/libestr dev-libs/liblognorm dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-1.0.1 ) snmp? ( net-analyzer/net-snmp ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zeromq? ( net-libs/czmq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=dev-libs/json-c dev-libs/libee dev-libs/libestr dev-libs/liblognorm dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-1.0.1 ) snmp? ( net-analyzer/net-snmp ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zeromq? ( net-libs/czmq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
 EAPI=4
 HOMEPAGE=http://www.rsyslog.com/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/json-c dev-libs/libee dev-libs/libestr dev-libs/liblognorm dbi?
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-6.6.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7e63ebfbe18eabe52ec6b329d3970baa
diff --git a/metadata/md5-cache/app-admin/rsyslog-7.2.2-r1 b/metadata/md5-cache/app-admin/rsyslog-7.2.2-r1
index 68a8eb60c503..dae11f6a436d 100644
--- a/metadata/md5-cache/app-admin/rsyslog-7.2.2-r1
+++ b/metadata/md5-cache/app-admin/rsyslog-7.2.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare test
-DEPEND=dev-libs/json-c dev-libs/libee dev-libs/libestr dev-libs/liblognorm net-misc/curl dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-1.0.1 ) snmp? ( net-analyzer/net-snmp ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zeromq? ( net-libs/czmq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=dev-libs/json-c dev-libs/libee dev-libs/libestr dev-libs/liblognorm net-misc/curl dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-1.0.1 ) snmp? ( net-analyzer/net-snmp ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zeromq? ( net-libs/czmq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
 EAPI=4
 HOMEPAGE=http://www.rsyslog.com/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/json-c dev-libs/libee dev-libs/libestr dev-libs/liblognorm net-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=537b2ed3ef555a29a4b2b7ade792ffa8
diff --git a/metadata/md5-cache/app-admin/rsyslog-7.2.5 b/metadata/md5-cache/app-admin/rsyslog-7.2.5
index a6a5caf8b667..4d51d4205742 100644
--- a/metadata/md5-cache/app-admin/rsyslog-7.2.5
+++ b/metadata/md5-cache/app-admin/rsyslog-7.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare test
-DEPEND=dev-libs/json-c dev-libs/libee dev-libs/libestr dev-libs/liblognorm net-misc/curl dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-1.0.1 ) snmp? ( net-analyzer/net-snmp ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zeromq? ( net-libs/czmq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=dev-libs/json-c dev-libs/libee dev-libs/libestr dev-libs/liblognorm net-misc/curl dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-1.0.1 ) snmp? ( net-analyzer/net-snmp ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zeromq? ( net-libs/czmq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
 EAPI=4
 HOMEPAGE=http://www.rsyslog.com/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/json-c dev-libs/libee dev-libs/libestr dev-libs/liblognorm net-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.2.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=54d4b2a33d49a37cfa753b6f85d45c38
diff --git a/metadata/md5-cache/app-admin/rsyslog-7.2.7 b/metadata/md5-cache/app-admin/rsyslog-7.2.7
index d3f620041d55..cc44d0a00c73 100644
--- a/metadata/md5-cache/app-admin/rsyslog-7.2.7
+++ b/metadata/md5-cache/app-admin/rsyslog-7.2.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare test
-DEPEND=dev-libs/json-c dev-libs/libee >=dev-libs/libestr-0.1.5 dev-libs/liblognorm net-misc/curl dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-1.0.1 ) snmp? ( net-analyzer/net-snmp ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zeromq? ( net-libs/czmq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=dev-libs/json-c dev-libs/libee >=dev-libs/libestr-0.1.5 dev-libs/liblognorm net-misc/curl dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-1.0.1 ) snmp? ( net-analyzer/net-snmp ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zeromq? ( net-libs/czmq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
 EAPI=4
 HOMEPAGE=http://www.rsyslog.com/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/json-c dev-libs/libee >=dev-libs/libestr-0.1.5 dev-libs/liblogn
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.2.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2b58dcdcd27812dc3fc182f7bdbe4386
diff --git a/metadata/md5-cache/app-admin/sagan-0.2.0-r1 b/metadata/md5-cache/app-admin/sagan-0.2.0-r1
index 19958440fdb4..28fd12f7c86f 100644
--- a/metadata/md5-cache/app-admin/sagan-0.2.0-r1
+++ b/metadata/md5-cache/app-admin/sagan-0.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) prelude? ( dev-libs/libprelude ) lognorm? ( dev-libs/liblognorm ) libdnet? ( dev-libs/libdnet )
 SLOT=0
 SRC_URI=http://sagan.softwink.com/download/sagan-0.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=191fc00da9d61602db6077eb2ce66c07
diff --git a/metadata/md5-cache/app-admin/sagan-0.2.0-r3 b/metadata/md5-cache/app-admin/sagan-0.2.0-r3
index 5cbc66586136..479416a67e66 100644
--- a/metadata/md5-cache/app-admin/sagan-0.2.0-r3
+++ b/metadata/md5-cache/app-admin/sagan-0.2.0-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) prelude? ( dev-libs/libprelude ) lognorm? ( dev-libs/liblognorm ) libdnet? ( dev-libs/libdnet )
 SLOT=0
 SRC_URI=http://sagan.softwink.com/download/sagan-0.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1a0e710822bf09dec03e687cced74262
diff --git a/metadata/md5-cache/app-admin/sagan-0.2.1 b/metadata/md5-cache/app-admin/sagan-0.2.1
index a815063496a1..1b33d2a2c8ca 100644
--- a/metadata/md5-cache/app-admin/sagan-0.2.1
+++ b/metadata/md5-cache/app-admin/sagan-0.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) prelude? ( dev-libs/libprelude ) lognorm? ( dev-libs/liblognorm ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 )
 SLOT=0
 SRC_URI=http://sagan.softwink.com/download/sagan-0.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c7f5f348b98659e57f3f2b0d77e46bbe
diff --git a/metadata/md5-cache/app-admin/sagan-0.2.1-r2 b/metadata/md5-cache/app-admin/sagan-0.2.1-r2
index e2031f3f1096..bff155ddae20 100644
--- a/metadata/md5-cache/app-admin/sagan-0.2.1-r2
+++ b/metadata/md5-cache/app-admin/sagan-0.2.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) prelude? ( dev-libs/libprelude ) lognorm? ( dev-libs/liblognorm ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 )
 SLOT=0
 SRC_URI=http://sagan.softwink.com/download/sagan-0.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eabed6fe484b822d7a715d867d7d1d77
diff --git a/metadata/md5-cache/app-admin/sagan-0.2.2_p2-r1 b/metadata/md5-cache/app-admin/sagan-0.2.2_p2-r1
index 643c88f6654b..8cbc5065b7e5 100644
--- a/metadata/md5-cache/app-admin/sagan-0.2.2_p2-r1
+++ b/metadata/md5-cache/app-admin/sagan-0.2.2_p2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) prelude? ( dev-libs/libprelude ) lognorm? ( dev-libs/liblognorm ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 )
 SLOT=0
 SRC_URI=http://sagan.softwink.com/download/sagan-0.2.2-r2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f62fd5d08bbe887863375a289b9bad7c
diff --git a/metadata/md5-cache/app-admin/sagan-0.2.2_p2-r2 b/metadata/md5-cache/app-admin/sagan-0.2.2_p2-r2
index aeed5b88f6d1..3cacccb67fc9 100644
--- a/metadata/md5-cache/app-admin/sagan-0.2.2_p2-r2
+++ b/metadata/md5-cache/app-admin/sagan-0.2.2_p2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Sagan is a multi-threaded, real time system and event log monitoring system
 EAPI=4
 HOMEPAGE=http://sagan.softwink.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) prelude? ( dev-libs/libprelude ) lognorm? ( dev-libs/liblognorm ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 )
 SLOT=0
 SRC_URI=http://sagan.softwink.com/download/sagan-0.2.2-r2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0544f56179784a211df8ac30eef9a04c
diff --git a/metadata/md5-cache/app-admin/sagan-0.2.3 b/metadata/md5-cache/app-admin/sagan-0.2.3
index 1ed856f20f99..af4bd473fba8 100644
--- a/metadata/md5-cache/app-admin/sagan-0.2.3
+++ b/metadata/md5-cache/app-admin/sagan-0.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/pkgconfig dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) lognorm? ( dev-libs/liblognorm ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) lognorm? ( dev-libs/liblognorm ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Sagan is a multi-threaded, real time system and event log monitoring system
 EAPI=5
 HOMEPAGE=http://sagan.quadrantsec.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) lognorm? ( dev-libs/liblognorm ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 )
 SLOT=0
 SRC_URI=http://sagan.quadrantsec.com/download/sagan-0.2.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=99cd4769abd011b2538ddd106d666116
diff --git a/metadata/md5-cache/app-admin/setools-3.3.7-r1 b/metadata/md5-cache/app-admin/setools-3.3.7-r1
index 0fe59d1a564d..3ee03752446a 100644
--- a/metadata/md5-cache/app-admin/setools-3.3.7-r1
+++ b/metadata/md5-cache/app-admin/setools-3.3.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=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 virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( =dev-lang/python-2* )
+DEPEND=>=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 virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( =dev-lang/python-2* )
 DESCRIPTION=SELinux policy tools
 EAPI=2
 HOMEPAGE=http://www.tresys.com/selinux/selinux_policy_tools.shtml
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/libsepol-2.1.0 sys-libs/libselinux >=dev-db/sqlite-3.2:3 dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://oss.tresys.com/projects/setools/chrome/site/dists/setools-3.3.7/setools-3.3.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6c96062ec942e913e4af234ed2a2f571
diff --git a/metadata/md5-cache/app-admin/setools-3.3.7-r3 b/metadata/md5-cache/app-admin/setools-3.3.7-r3
index dd4db8c6b930..2493429374c9 100644
--- a/metadata/md5-cache/app-admin/setools-3.3.7-r3
+++ b/metadata/md5-cache/app-admin/setools-3.3.7-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=sys-libs/libsepol-2.1.4 sys-libs/libselinux sys-devel/bison sys-devel/flex >=dev-db/sqlite-3.2:3 dev-libs/libxml2:2 virtual/pkgconfig java? ( >=dev-lang/swig-2.0.4 >=virtual/jdk-1.4 ) python? ( >=dev-lang/swig-2.0.4 ) X? ( >=dev-lang/tk-8.4.9 >=gnome-base/libglade-2.0 >=x11-libs/gtk+-2.8:2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( dev-lang/python )
+DEPEND=>=sys-libs/libsepol-2.1.4 sys-libs/libselinux sys-devel/bison sys-devel/flex >=dev-db/sqlite-3.2:3 dev-libs/libxml2:2 virtual/pkgconfig java? ( >=dev-lang/swig-2.0.4 >=virtual/jdk-1.4 ) python? ( >=dev-lang/swig-2.0.4 ) X? ( >=dev-lang/tk-8.4.9 >=gnome-base/libglade-2.0 >=x11-libs/gtk+-2.8:2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( dev-lang/python )
 DESCRIPTION=SELinux policy tools
 EAPI=2
 HOMEPAGE=http://www.tresys.com/selinux/selinux_policy_tools.shtml
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/libsepol-2.1.4 sys-libs/libselinux >=dev-db/sqlite-3.2:3 dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://oss.tresys.com/projects/setools/chrome/site/dists/setools-3.3.7/setools-3.3.7.tar.bz2 http://dev.gentoo.org/~swift/patches/setools/setools-3.3.7-01-fedora-patches.tar.gz http://dev.gentoo.org/~swift/patches/setools/setools-3.3.7-03-gentoo-patches.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e67f1ba58af539da8798c7f0d7962bcf
diff --git a/metadata/md5-cache/app-admin/setools-3.3.7-r5 b/metadata/md5-cache/app-admin/setools-3.3.7-r5
index f83a5d4536b4..a9e8ca67cbf8 100644
--- a/metadata/md5-cache/app-admin/setools-3.3.7-r5
+++ b/metadata/md5-cache/app-admin/setools-3.3.7-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=sys-libs/libsepol-2.1.4 sys-libs/libselinux sys-devel/bison sys-devel/flex >=dev-db/sqlite-3.2:3 dev-libs/libxml2:2 virtual/pkgconfig java? ( >=dev-lang/swig-2.0.4 >=virtual/jdk-1.4 ) python? ( >=dev-lang/swig-2.0.4 ) X? ( >=dev-lang/tk-8.4.9 >=gnome-base/libglade-2.0 >=x11-libs/gtk+-2.8:2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( dev-lang/python )
+DEPEND=>=sys-libs/libsepol-2.1.4 sys-libs/libselinux sys-devel/bison sys-devel/flex >=dev-db/sqlite-3.2:3 dev-libs/libxml2:2 virtual/pkgconfig java? ( >=dev-lang/swig-2.0.4 >=virtual/jdk-1.4 ) python? ( >=dev-lang/swig-2.0.4 ) X? ( >=dev-lang/tk-8.4.9 >=gnome-base/libglade-2.0 >=x11-libs/gtk+-2.8:2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( dev-lang/python )
 DESCRIPTION=SELinux policy tools
 EAPI=2
 HOMEPAGE=http://www.tresys.com/selinux/selinux_policy_tools.shtml
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/libsepol-2.1.4 sys-libs/libselinux >=dev-db/sqlite-3.2:3 dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://oss.tresys.com/projects/setools/chrome/site/dists/setools-3.3.7/setools-3.3.7.tar.bz2 http://dev.gentoo.org/~swift/patches/setools/setools-3.3.7-01-fedora-patches.tar.gz http://dev.gentoo.org/~swift/patches/setools/setools-3.3.7-05-gentoo-patches.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=db427ac0082d548eefda49f837e6ac01
diff --git a/metadata/md5-cache/app-admin/setools-3.3.7-r6 b/metadata/md5-cache/app-admin/setools-3.3.7-r6
index 935328aaed3a..20bc9b887480 100644
--- a/metadata/md5-cache/app-admin/setools-3.3.7-r6
+++ b/metadata/md5-cache/app-admin/setools-3.3.7-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=sys-libs/libsepol-2.1.4 sys-libs/libselinux sys-devel/bison sys-devel/flex >=dev-db/sqlite-3.2:3 dev-libs/libxml2:2 virtual/pkgconfig java? ( <dev-lang/swig-2.0 >=virtual/jdk-1.4 ) python? ( <dev-lang/swig-2.0 ) X? ( >=dev-lang/tk-8.4.9 >=gnome-base/libglade-2.0 >=x11-libs/gtk+-2.8:2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( dev-lang/python )
+DEPEND=>=sys-libs/libsepol-2.1.4 sys-libs/libselinux sys-devel/bison sys-devel/flex >=dev-db/sqlite-3.2:3 dev-libs/libxml2:2 virtual/pkgconfig java? ( <dev-lang/swig-2.0 >=virtual/jdk-1.4 ) python? ( <dev-lang/swig-2.0 ) X? ( >=dev-lang/tk-8.4.9 >=gnome-base/libglade-2.0 >=x11-libs/gtk+-2.8:2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( dev-lang/python )
 DESCRIPTION=SELinux policy tools
 EAPI=2
 HOMEPAGE=http://www.tresys.com/selinux/selinux_policy_tools.shtml
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/libsepol-2.1.4 sys-libs/libselinux >=dev-db/sqlite-3.2:3 dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://oss.tresys.com/projects/setools/chrome/site/dists/setools-3.3.7/setools-3.3.7.tar.bz2 http://dev.gentoo.org/~swift/patches/setools/setools-3.3.7-01-fedora-patches.tar.gz http://dev.gentoo.org/~swift/patches/setools/setools-3.3.7-06-gentoo-patches.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d9831204493d5009c1fd42d06ac909df
diff --git a/metadata/md5-cache/app-admin/setools-3.3.8-r1 b/metadata/md5-cache/app-admin/setools-3.3.8-r1
index 0c9ce831e371..36b325a6c036 100644
--- a/metadata/md5-cache/app-admin/setools-3.3.8-r1
+++ b/metadata/md5-cache/app-admin/setools-3.3.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=sys-libs/libsepol-2.1.4 sys-libs/libselinux sys-devel/bison sys-devel/flex >=dev-db/sqlite-3.2:3 dev-libs/libxml2:2 virtual/pkgconfig java? ( <dev-lang/swig-2.0 >=virtual/jdk-1.4 ) python? ( <dev-lang/swig-2.0 ) X? ( >=dev-lang/tk-8.4.9 >=gnome-base/libglade-2.0 >=x11-libs/gtk+-2.8:2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( dev-lang/python )
+DEPEND=>=sys-libs/libsepol-2.1.4 sys-libs/libselinux sys-devel/bison sys-devel/flex >=dev-db/sqlite-3.2:3 dev-libs/libxml2:2 virtual/pkgconfig java? ( <dev-lang/swig-2.0 >=virtual/jdk-1.4 ) python? ( <dev-lang/swig-2.0 ) X? ( >=dev-lang/tk-8.4.9 >=gnome-base/libglade-2.0 >=x11-libs/gtk+-2.8:2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( dev-lang/python )
 DESCRIPTION=SELinux policy tools
 EAPI=2
 HOMEPAGE=http://www.tresys.com/selinux/selinux_policy_tools.shtml
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/libsepol-2.1.4 sys-libs/libselinux >=dev-db/sqlite-3.2:3 dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://oss.tresys.com/projects/setools/chrome/site/dists/setools-3.3.8/setools-3.3.8.tar.bz2 http://dev.gentoo.org/~swift/patches/setools/setools-3.3.8-01-fedora-patches.tar.gz http://dev.gentoo.org/~swift/patches/setools/setools-3.3.8-01-gentoo-patches.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a2def52f1c06d8309ac10c91c9165078
diff --git a/metadata/md5-cache/app-admin/setools-3.3.8-r2 b/metadata/md5-cache/app-admin/setools-3.3.8-r2
index f0caf630dbdb..047349942060 100644
--- a/metadata/md5-cache/app-admin/setools-3.3.8-r2
+++ b/metadata/md5-cache/app-admin/setools-3.3.8-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=sys-libs/libsepol-2.1.4 sys-libs/libselinux sys-devel/bison sys-devel/flex >=dev-db/sqlite-3.2:3 dev-libs/libxml2:2 virtual/pkgconfig java? ( dev-lang/swig:1 >=virtual/jdk-1.4 ) python? ( dev-lang/swig:1 ) X? ( >=dev-lang/tk-8.4.9 >=gnome-base/libglade-2.0 >=x11-libs/gtk+-2.8:2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( dev-lang/python )
+DEPEND=>=sys-libs/libsepol-2.1.4 sys-libs/libselinux sys-devel/bison sys-devel/flex >=dev-db/sqlite-3.2:3 dev-libs/libxml2:2 virtual/pkgconfig java? ( dev-lang/swig:1 >=virtual/jdk-1.4 ) python? ( dev-lang/swig:1 ) X? ( >=dev-lang/tk-8.4.9 >=gnome-base/libglade-2.0 >=x11-libs/gtk+-2.8:2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( dev-lang/python )
 DESCRIPTION=SELinux policy tools
 EAPI=2
 HOMEPAGE=http://www.tresys.com/selinux/selinux_policy_tools.shtml
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/libsepol-2.1.4 sys-libs/libselinux >=dev-db/sqlite-3.2:3 dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://oss.tresys.com/projects/setools/chrome/site/dists/setools-3.3.8/setools-3.3.8.tar.bz2 http://dev.gentoo.org/~swift/patches/setools/setools-3.3.8-01-fedora-patches.tar.gz http://dev.gentoo.org/~swift/patches/setools/setools-3.3.8-01-gentoo-patches.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7e63cbe1110d6bc83fc304028a1c3e10
diff --git a/metadata/md5-cache/app-admin/sxid-4.2-r1 b/metadata/md5-cache/app-admin/sxid-4.2-r1
index cda327a453b0..439cdf2166a6 100644
--- a/metadata/md5-cache/app-admin/sxid-4.2-r1
+++ b/metadata/md5-cache/app-admin/sxid-4.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=postinst prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=suid, sgid file and directory checking
 EAPI=4
 HOMEPAGE=http://freshmeat.net/projects/sxid
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/mailx
 SLOT=0
 SRC_URI=http://linukz.org/download/sxid-4.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=59f2b80f7f63b500ab524f062ab39700
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.2.5 b/metadata/md5-cache/app-admin/syslog-ng-3.2.5
index fd9dd45afb63..88489dc8c2b7 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.2.5
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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 ) virtual/pkgconfig sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=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 ) virtual/pkgconfig sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=2
 HOMEPAGE=http://www.balabit.com/products/syslog_ng/
@@ -10,5 +10,5 @@ RDEPEND=pcre? ( dev-libs/libpcre ) spoof-source? ( net-libs/libnet ) ssl? ( dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.balabit.com/downloads/files/syslog-ng/sources/3.2.5/source/syslog-ng_3.2.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3e0db97cb6173489fcfc07dbfc440823
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.3.5-r1 b/metadata/md5-cache/app-admin/syslog-ng-3.3.5-r1
index edb15c00ab04..d77779819bcb 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.3.5-r1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.3.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=!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] ) virtual/pkgconfig sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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] ) virtual/pkgconfig sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=2
 HOMEPAGE=http://www.balabit.com/products/syslog_ng/
@@ -10,5 +10,5 @@ RDEPEND=!static? ( pcre? ( dev-libs/libpcre ) spoof-source? ( net-libs/libnet )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.balabit.com/downloads/files/syslog-ng/sources/3.3.5/source/syslog-ng_3.3.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e86bae5f576ff0d28330e1c9dcb773ee
diff --git a/metadata/md5-cache/app-admin/system-config-printer-common-1.3.11-r1 b/metadata/md5-cache/app-admin/system-config-printer-common-1.3.11-r1
index 0f0ee3c51069..9b9670cd7473 100644
--- a/metadata/md5-cache/app-admin/system-config-printer-common-1.3.11-r1
+++ b/metadata/md5-cache/app-admin/system-config-printer-common-1.3.11-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2 dev-libs/libxml2[python] dev-python/dbus-python >=dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cyberelk.net/tim/data/system-config-printer/1.3/system-config-printer-1.3.11.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ae1fe7ab9ac3531c995d63829c4037bb
diff --git a/metadata/md5-cache/app-admin/system-config-printer-common-1.3.12 b/metadata/md5-cache/app-admin/system-config-printer-common-1.3.12
index 99986881e5d3..ff946deb47d9 100644
--- a/metadata/md5-cache/app-admin/system-config-printer-common-1.3.12
+++ b/metadata/md5-cache/app-admin/system-config-printer-common-1.3.12
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2 dev-libs/libxml2[python] dev-python/dbus-python >=dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cyberelk.net/tim/data/system-config-printer/1.3/system-config-printer-1.3.12.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=693001de3ceb80782e0634dae06efd59
diff --git a/metadata/md5-cache/app-admin/system-config-printer-gnome-1.3.11 b/metadata/md5-cache/app-admin/system-config-printer-gnome-1.3.11
index 717d907896e1..ebb6aacbbd4b 100644
--- a/metadata/md5-cache/app-admin/system-config-printer-gnome-1.3.11
+++ b/metadata/md5-cache/app-admin/system-config-printer-gnome-1.3.11
@@ -10,5 +10,5 @@ RDEPEND=~app-admin/system-config-printer-common-1.3.11 dev-python/notify-python
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cyberelk.net/tim/data/system-config-printer/1.3/system-config-printer-1.3.11.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=63dfc8c5f25a3fc3bb1eb8f9f3bdcdb1
diff --git a/metadata/md5-cache/app-admin/system-config-printer-gnome-1.3.12 b/metadata/md5-cache/app-admin/system-config-printer-gnome-1.3.12
index 2f4a3110034e..ade94a8599a7 100644
--- a/metadata/md5-cache/app-admin/system-config-printer-gnome-1.3.12
+++ b/metadata/md5-cache/app-admin/system-config-printer-gnome-1.3.12
@@ -10,5 +10,5 @@ RDEPEND=~app-admin/system-config-printer-common-1.3.12 dev-python/notify-python
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cyberelk.net/tim/data/system-config-printer/1.3/system-config-printer-1.3.12.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fd9a178c3d8eb2adf65d62cba40ffc13
diff --git a/metadata/md5-cache/app-admin/tripwire-2.4.2 b/metadata/md5-cache/app-admin/tripwire-2.4.2
index fd3e26006ade..6c1dee714a0e 100644
--- a/metadata/md5-cache/app-admin/tripwire-2.4.2
+++ b/metadata/md5-cache/app-admin/tripwire-2.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-devel/automake sys-devel/autoconf dev-util/patchutils ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-devel/automake sys-devel/autoconf dev-util/patchutils ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open Source File Integrity Checker and IDS
 EAPI=2
 HOMEPAGE=http://www.tripwire.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/cron virtual/mta ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/tripwire/tripwire-2.4.2-src.tar.bz2 mirror://gentoo/twpol.txt.gz mirror://gentoo/tripwire.gif
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e41c928532be1a00be4a7028377874c7
diff --git a/metadata/md5-cache/app-admin/tripwire-2.4.2-r1 b/metadata/md5-cache/app-admin/tripwire-2.4.2-r1
index 79a5a48005b1..efdee2fcd85f 100644
--- a/metadata/md5-cache/app-admin/tripwire-2.4.2-r1
+++ b/metadata/md5-cache/app-admin/tripwire-2.4.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-devel/automake sys-devel/autoconf dev-util/patchutils ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-devel/automake sys-devel/autoconf dev-util/patchutils ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open Source File Integrity Checker and IDS
 EAPI=2
 HOMEPAGE=http://www.tripwire.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/cron virtual/mta ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/tripwire/tripwire-2.4.2-src.tar.bz2 mirror://gentoo/twpol.txt.gz mirror://gentoo/tripwire.gif
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=402e795829ebec7c7edda185ae4fe871
diff --git a/metadata/md5-cache/app-admin/tripwire-2.4.2.2 b/metadata/md5-cache/app-admin/tripwire-2.4.2.2
index 785c4c9a4a28..d5d578c4dbf8 100644
--- a/metadata/md5-cache/app-admin/tripwire-2.4.2.2
+++ b/metadata/md5-cache/app-admin/tripwire-2.4.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-devel/automake sys-devel/autoconf dev-util/patchutils ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-devel/automake sys-devel/autoconf dev-util/patchutils ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open Source File Integrity Checker and IDS
 EAPI=4
 HOMEPAGE=http://www.tripwire.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/cron virtual/mta ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/tripwire/tripwire-2.4.2.2-src.tar.bz2 mirror://gentoo/twpol.txt.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6572b4b7716e28ed83ea744fb384b873
diff --git a/metadata/md5-cache/app-admin/tripwire-2.4.2.2-r1 b/metadata/md5-cache/app-admin/tripwire-2.4.2.2-r1
index 12a2b4709146..9568441cc821 100644
--- a/metadata/md5-cache/app-admin/tripwire-2.4.2.2-r1
+++ b/metadata/md5-cache/app-admin/tripwire-2.4.2.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-devel/automake sys-devel/autoconf dev-util/patchutils ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-devel/automake sys-devel/autoconf dev-util/patchutils ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open Source File Integrity Checker and IDS
 EAPI=4
 HOMEPAGE=http://www.tripwire.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/cron virtual/mta ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/tripwire/tripwire-2.4.2.2-src.tar.bz2 mirror://gentoo/twpol.txt.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8ed95a5bb69aa7133d51814e4baeb9c6
diff --git a/metadata/md5-cache/app-admin/ulogd-1.24-r2 b/metadata/md5-cache/app-admin/ulogd-1.24-r2
index 8185d01b01be..667a414b9ada 100644
--- a/metadata/md5-cache/app-admin/ulogd-1.24-r2
+++ b/metadata/md5-cache/app-admin/ulogd-1.24-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=net-firewall/iptables mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-firewall/iptables mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A userspace logging daemon for netfilter/iptables related logging
 EAPI=1
 HOMEPAGE=http://netfilter.org/projects/ulogd/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/iptables mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) net-libs/libpcap
 SLOT=0
 SRC_URI=http://ftp.netfilter.org/pub/ulogd/ulogd-1.24.tar.bz2 mirror://gentoo/ulogd-glsa-200805.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7030205d6f4e4f60e4d0b28b0cf2b9ef
diff --git a/metadata/md5-cache/app-admin/ulogd-2.0.2 b/metadata/md5-cache/app-admin/ulogd-2.0.2
index 39a7dc3ba829..d04535a6dca2 100644
--- a/metadata/md5-cache/app-admin/ulogd-2.0.2
+++ b/metadata/md5-cache/app-admin/ulogd-2.0.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=net-firewall/iptables >=net-libs/libnfnetlink-1.0.1 >=net-libs/libmnl-1.0.3 dbi? ( dev-db/libdbi ) nfacct? ( >=net-libs/libnetfilter_acct-1.0.1 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) mysql? ( virtual/mysql ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) doc? ( app-text/linuxdoc-tools app-text/texlive-core virtual/latex-base ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-firewall/iptables >=net-libs/libnfnetlink-1.0.1 >=net-libs/libmnl-1.0.3 dbi? ( dev-db/libdbi ) nfacct? ( >=net-libs/libnetfilter_acct-1.0.1 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) mysql? ( virtual/mysql ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) doc? ( app-text/linuxdoc-tools app-text/texlive-core virtual/latex-base ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A userspace logging daemon for netfilter/iptables related logging
 EAPI=5
 HOMEPAGE=http://netfilter.org/projects/ulogd/index.html
 IUSE=dbi doc mysql nfacct +nfct +nflog pcap postgres sqlite
-KEYWORDS=amd64 ~ia64 ~ppc x86
+KEYWORDS=amd64 ~ia64 ppc x86
 LICENSE=GPL-2
 RDEPEND=net-firewall/iptables >=net-libs/libnfnetlink-1.0.1 >=net-libs/libmnl-1.0.3 dbi? ( dev-db/libdbi ) nfacct? ( >=net-libs/libnetfilter_acct-1.0.1 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) mysql? ( virtual/mysql ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=http://ftp.netfilter.org/pub/ulogd/ulogd-2.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=be9b53aeaf94edea5bd58485d8933113
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=25a03b04486727de0961cc1385fd4a10
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.97.5-r1 b/metadata/md5-cache/app-antivirus/clamav-0.97.5-r1
index 8548201e82be..75561c989d32 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.97.5-r1
+++ b/metadata/md5-cache/app-antivirus/clamav-0.97.5-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/clamav/clamav-0.97.5.tar.gz
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4f948030d5e0e1c0e54a85dd7c5d1f9d
+_md5_=e71565326643aa623d5f7a25c5e14942
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.97.8 b/metadata/md5-cache/app-antivirus/clamav-0.97.8
new file mode 100644
index 000000000000..f66c2ebf4f0f
--- /dev/null
+++ b/metadata/md5-cache/app-antivirus/clamav-0.97.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses ) iconv? ( virtual/libiconv ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2 sys-devel/libtool virtual/pkgconfig
+DESCRIPTION=Clam Anti-Virus Scanner
+EAPI=5
+HOMEPAGE=http://www.clamav.net/
+IUSE=bzip2 clamdtop iconv ipv6 milter selinux static-libs uclibc
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses ) iconv? ( virtual/libiconv ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2 sys-devel/libtool selinux? ( sec-policy/selinux-clamav )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/clamav/clamav-0.97.8.tar.gz
+_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=9388daa70af87203f8d31fbdad826e03
diff --git a/metadata/md5-cache/app-arch/arj-3.10.22-r3 b/metadata/md5-cache/app-arch/arj-3.10.22-r3
index 77feaaee93bc..a36fa8bdd96d 100644
--- a/metadata/md5-cache/app-arch/arj-3.10.22-r3
+++ b/metadata/md5-cache/app-arch/arj-3.10.22-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utility for opening arj archives
 EAPI=3
 HOMEPAGE=http://arj.sourceforge.net
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d0b529db209adf5e3b3a73171d0d2000
diff --git a/metadata/md5-cache/app-arch/arj-3.10.22-r4 b/metadata/md5-cache/app-arch/arj-3.10.22-r4
index 74a019ce5d00..f7e52d9032a6 100644
--- a/metadata/md5-cache/app-arch/arj-3.10.22-r4
+++ b/metadata/md5-cache/app-arch/arj-3.10.22-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utility for opening arj archives
 EAPI=4
 HOMEPAGE=http://arj.sourceforge.net
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linu
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=992fdab1a21dafa8ddc0a8763de639c2
diff --git a/metadata/md5-cache/app-arch/dpkg-1.16.10 b/metadata/md5-cache/app-arch/dpkg-1.16.10
index 1dc93f5b7e06..7a3b771068aa 100644
--- a/metadata/md5-cache/app-arch/dpkg-1.16.10
+++ b/metadata/md5-cache/app-arch/dpkg-1.16.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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 ) app-arch/xz-utils nls? ( app-text/po4a ) sys-devel/flex virtual/pkgconfig test? ( dev-perl/DateTime-Format-DateParse dev-perl/IO-String dev-perl/Test-Pod ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) app-arch/xz-utils nls? ( app-text/po4a ) sys-devel/flex virtual/pkgconfig test? ( dev-perl/DateTime-Format-DateParse dev-perl/IO-String dev-perl/Test-Pod ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Package maintenance system for Debian
 EAPI=4
 HOMEPAGE=http://packages.qa.debian.org/dpkg
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib?
 REQUIRED_USE=dselect? ( nls )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.16.10.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6c9a62f747521a203ad994c41ded433f
diff --git a/metadata/md5-cache/app-arch/dpkg-1.16.8 b/metadata/md5-cache/app-arch/dpkg-1.16.8
index 1ea406d6d566..e5a58547d8f1 100644
--- a/metadata/md5-cache/app-arch/dpkg-1.16.8
+++ b/metadata/md5-cache/app-arch/dpkg-1.16.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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 ) app-arch/xz-utils nls? ( app-text/po4a ) sys-devel/flex virtual/pkgconfig test? ( dev-perl/DateTime-Format-DateParse dev-perl/IO-String dev-perl/Test-Pod ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) app-arch/xz-utils nls? ( app-text/po4a ) sys-devel/flex virtual/pkgconfig test? ( dev-perl/DateTime-Format-DateParse dev-perl/IO-String dev-perl/Test-Pod ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Package maintenance system for Debian
 EAPI=4
 HOMEPAGE=http://packages.qa.debian.org/dpkg
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib?
 REQUIRED_USE=dselect? ( nls )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.16.8.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=60bea7a9c2d1bfc4cc4dff0304933525
diff --git a/metadata/md5-cache/app-arch/dpkg-1.16.9 b/metadata/md5-cache/app-arch/dpkg-1.16.9
index 4814d67e3064..859264159118 100644
--- a/metadata/md5-cache/app-arch/dpkg-1.16.9
+++ b/metadata/md5-cache/app-arch/dpkg-1.16.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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 ) app-arch/xz-utils nls? ( app-text/po4a ) sys-devel/flex virtual/pkgconfig test? ( dev-perl/DateTime-Format-DateParse dev-perl/IO-String dev-perl/Test-Pod ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) app-arch/xz-utils nls? ( app-text/po4a ) sys-devel/flex virtual/pkgconfig test? ( dev-perl/DateTime-Format-DateParse dev-perl/IO-String dev-perl/Test-Pod ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Package maintenance system for Debian
 EAPI=4
 HOMEPAGE=http://packages.qa.debian.org/dpkg
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib?
 REQUIRED_USE=dselect? ( nls )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.16.9.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=37a12fbae5a35fd525cb3684e2274d51
diff --git a/metadata/md5-cache/app-arch/dump-0.4.44-r1 b/metadata/md5-cache/app-arch/dump-0.4.44-r1
index b2df26cb7a06..94d4ad044ba3 100644
--- a/metadata/md5-cache/app-arch/dump-0.4.44-r1
+++ b/metadata/md5-cache/app-arch/dump-0.4.44-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=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] ) ) virtual/pkgconfig virtual/os-headers || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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] ) ) virtual/pkgconfig virtual/os-headers || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Dump/restore ext2fs backup utilities
 EAPI=4
 HOMEPAGE=http://dump.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=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] ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/dump/dump-0.4b44.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dec049bae39de6f2e38316e9be6aa3c7
diff --git a/metadata/md5-cache/app-arch/lbzip2-2.2 b/metadata/md5-cache/app-arch/lbzip2-2.2
index 72a08fac3016..35a618444350 100644
--- a/metadata/md5-cache/app-arch/lbzip2-2.2
+++ b/metadata/md5-cache/app-arch/lbzip2-2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=symlink? ( !app-arch/pbzip2[symlink] )
 SLOT=0
 SRC_URI=mirror://github/kjn/lbzip2/lbzip2-2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4ec834a7dfd12050839afbb157348570
diff --git a/metadata/md5-cache/app-arch/lbzip2-2.2-r1 b/metadata/md5-cache/app-arch/lbzip2-2.2-r1
index 2edbbb07e887..5208c3570872 100644
--- a/metadata/md5-cache/app-arch/lbzip2-2.2-r1
+++ b/metadata/md5-cache/app-arch/lbzip2-2.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=symlink? ( !app-arch/pbzip2[symlink] )
 SLOT=0
 SRC_URI=mirror://github/kjn/lbzip2/lbzip2-2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=82c0fc0d0eacc5f7f9ac45ab4ac77fa1
diff --git a/metadata/md5-cache/app-arch/lcab-1.0_beta12 b/metadata/md5-cache/app-arch/lcab-1.0_beta12
index b34c92243813..55904857feee 100644
--- a/metadata/md5-cache/app-arch/lcab-1.0_beta12
+++ b/metadata/md5-cache/app-arch/lcab-1.0_beta12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=CAB file creation tool
 EAPI=4
 HOMEPAGE=http://ohnopub.net/lcab/
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://mirror.ohnopub.net/mirror/lcab-1.0b12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=6bccc90d32b83e6b6d15fbabb1d66b14
diff --git a/metadata/md5-cache/app-arch/lha-114i-r7 b/metadata/md5-cache/app-arch/lha-114i-r7
index c5c4247c820a..c32dd27e3c2f 100644
--- a/metadata/md5-cache/app-arch/lha-114i-r7
+++ b/metadata/md5-cache/app-arch/lha-114i-r7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utility for creating and opening lzh archives
 EAPI=4
 HOMEPAGE=http://lha.sourceforge.jp
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x
 LICENSE=lha
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/lha/22231/lha-1.14i-ac20050924p1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=249b6617d975b03633744d8a3a584d3c
diff --git a/metadata/md5-cache/app-arch/libpar2-0.2.1 b/metadata/md5-cache/app-arch/libpar2-0.2.1
index 4da5da1b0189..196ba32adb47 100644
--- a/metadata/md5-cache/app-arch/libpar2-0.2.1
+++ b/metadata/md5-cache/app-arch/libpar2-0.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libsigc++:2
 SLOT=0
 SRC_URI=https://launchpad.net/libpar2/0.2/0.2.1/+download/libpar2-0.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=caaea64046fd0c2d5fe9139138124c28
diff --git a/metadata/md5-cache/app-arch/libzpaq-5.01 b/metadata/md5-cache/app-arch/libzpaq-5.01
index 9119290bbd06..423cec743119 100644
--- a/metadata/md5-cache/app-arch/libzpaq-5.01
+++ b/metadata/md5-cache/app-arch/libzpaq-5.01
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library to compress files or objects in the ZPAQ format
 EAPI=3
 HOMEPAGE=http://mattmahoney.net/dc/zpaq.html
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=zpaq
 SLOT=0
 SRC_URI=http://mattmahoney.net/dc/libzpaq501.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b26a7e25e550b01d9b9e2e748edc306
diff --git a/metadata/md5-cache/app-arch/libzpaq-6.10 b/metadata/md5-cache/app-arch/libzpaq-6.10
index 72745f534458..938968024ee0 100644
--- a/metadata/md5-cache/app-arch/libzpaq-6.10
+++ b/metadata/md5-cache/app-arch/libzpaq-6.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library to compress files in the ZPAQ format
 EAPI=4
 HOMEPAGE=http://mattmahoney.net/dc/zpaq.html
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=zpaq
 SLOT=0
 SRC_URI=http://mattmahoney.net/dc/zpaq610.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=11d722af2dd396df4ef265e80f441d8f
diff --git a/metadata/md5-cache/app-arch/pax-3.4.12.16 b/metadata/md5-cache/app-arch/pax-3.4.12.16
index 8cfc07529ad5..20f3f205bf21 100644
--- a/metadata/md5-cache/app-arch/pax-3.4.12.16
+++ b/metadata/md5-cache/app-arch/pax-3.4.12.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=pax (Portable Archive eXchange) is the POSIX standard archive tool
 EAPI=4
 HOMEPAGE=http://www.openbsd.org/cgi-bin/cvsweb/src/bin/pax/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://fedora-dev/releases/16/Everything/source/SRPMS/pax-3.4-12.fc16.src.rpm
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f24fbac194709d42018771c990cc4e50
diff --git a/metadata/md5-cache/app-arch/pdv-1.5.1-r2 b/metadata/md5-cache/app-arch/pdv-1.5.1-r2
index 096e09ca4945..03eb691e3ba9 100644
--- a/metadata/md5-cache/app-arch/pdv-1.5.1-r2
+++ b/metadata/md5-cache/app-arch/pdv-1.5.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=X? ( >=x11-libs/motif-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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=X? ( >=x11-libs/motif-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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=build a self-extracting and self-installing binary package
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/pdv
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=X? ( >=x11-libs/motif-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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pdv/pdv-1.5.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=91c5ba784a8e35df545e525cfec4ff56
diff --git a/metadata/md5-cache/app-arch/rpm-4.10.2 b/metadata/md5-cache/app-arch/rpm-4.10.2
index e74b92973ebb..bb2234717944 100644
--- a/metadata/md5-cache/app-arch/rpm-4.10.2
+++ b/metadata/md5-cache/app-arch/rpm-4.10.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!app-arch/rpm5 >=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 ) selinux? ( sec-policy/selinux-rpm ) nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] =dev-lang/python-2*
+DEPEND=!app-arch/rpm5 >=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 ) selinux? ( sec-policy/selinux-rpm ) nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] =dev-lang/python-2*
 DESCRIPTION=Red Hat Package Management Utils
 EAPI=4
 HOMEPAGE=http://www.rpm.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!app-arch/rpm5 >=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 ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl[-build] =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://rpm.org/releases/rpm-4.10.x/rpm-4.10.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=79045e14d0680b637a86816a64a87d9c
diff --git a/metadata/md5-cache/app-arch/rpm-4.11.0.1 b/metadata/md5-cache/app-arch/rpm-4.11.0.1
index f6c0f5178593..0bfc419219be 100644
--- a/metadata/md5-cache/app-arch/rpm-4.11.0.1
+++ b/metadata/md5-cache/app-arch/rpm-4.11.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=!app-arch/rpm5 >=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? ( python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) selinux? ( sec-policy/selinux-rpm ) nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+DEPEND=!app-arch/rpm5 >=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? ( python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) selinux? ( sec-policy/selinux-rpm ) nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 DESCRIPTION=Red Hat Package Management Utils
 EAPI=5
 HOMEPAGE=http://www.rpm.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!app-arch/rpm5 >=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? ( python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://rpm.org/releases/rpm-4.11.x/rpm-4.11.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=93152e073c98ebfd9006d1b9b566e72f
diff --git a/metadata/md5-cache/app-arch/rzip-2.1-r2 b/metadata/md5-cache/app-arch/rzip-2.1-r2
index 076a21f52c3b..4b1108a8f209 100644
--- a/metadata/md5-cache/app-arch/rzip-2.1-r2
+++ b/metadata/md5-cache/app-arch/rzip-2.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=app-arch/bzip2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/bzip2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Compression program for large files
 EAPI=2
 HOMEPAGE=http://rzip.samba.org
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2
 SLOT=0
 SRC_URI=http://rzip.samba.org/ftp/rzip/rzip-2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3e9038bfa024e68b2da3fc1d28e465f9
diff --git a/metadata/md5-cache/app-arch/snappy-1.1.0 b/metadata/md5-cache/app-arch/snappy-1.1.0
index faf1fd170fe0..be7e999bc9f2 100644
--- a/metadata/md5-cache/app-arch/snappy-1.1.0
+++ b/metadata/md5-cache/app-arch/snappy-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A high-speed compression/decompression library by Google
 EAPI=5
 HOMEPAGE=https://code.google.com/p/snappy/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://snappy.googlecode.com/files/snappy-1.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0b87533749dc2a65b364f8410dcce2a3
diff --git a/metadata/md5-cache/app-arch/tar-1.26-r1 b/metadata/md5-cache/app-arch/tar-1.26-r1
index f13b17033284..339deaf47a2b 100644
--- a/metadata/md5-cache/app-arch/tar-1.26-r1
+++ b/metadata/md5-cache/app-arch/tar-1.26-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.10.35 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.10.35 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Use this to make tarballs :)
 EAPI=3
 HOMEPAGE=http://www.gnu.org/software/tar/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=xattr? ( sys-apps/attr )
 SLOT=0
 SRC_URI=mirror://gnu/tar/tar-1.26.tar.bz2 mirror://gnu-alpha/tar/tar-1.26.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7c1bb1534419e2c5095b061a21588b35
diff --git a/metadata/md5-cache/app-arch/torrentzip-0.2-r1 b/metadata/md5-cache/app-arch/torrentzip-0.2-r1
index f4f4094b810e..0dadfded52b0 100644
--- a/metadata/md5-cache/app-arch/torrentzip-0.2-r1
+++ b/metadata/md5-cache/app-arch/torrentzip-0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=sys-libs/zlib || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=archiving program that uses standard values when creating zips to create identical files over multiple systems with the ability to create a torrentzip format from a zip file
 HOMEPAGE=https://sourceforge.net/projects/trrntzip
 KEYWORDS=~amd64 ~x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/trrntzip/trrntzip_v02_src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7e683e174ff80ff9cbbdd355c9e833c1
diff --git a/metadata/md5-cache/app-arch/unrar-gpl-0.0.1_p20080417-r1 b/metadata/md5-cache/app-arch/unrar-gpl-0.0.1_p20080417-r1
index c6619545994c..fc6b23b3f5b0 100644
--- a/metadata/md5-cache/app-arch/unrar-gpl-0.0.1_p20080417-r1
+++ b/metadata/md5-cache/app-arch/unrar-gpl-0.0.1_p20080417-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free rar unpacker for old (pre v3) rar files
 EAPI=4
 HOMEPAGE=http://home.gna.org/unrar/
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/unrar-gpl-0.0.1_p20080417.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=fe1d3a6444a380308d48c4adcec513fe
diff --git a/metadata/md5-cache/app-arch/unshield-0.6_p20120308 b/metadata/md5-cache/app-arch/unshield-0.6_p20120308
index c29293f5ed7f..6856fe943b6b 100644
--- a/metadata/md5-cache/app-arch/unshield-0.6_p20120308
+++ b/metadata/md5-cache/app-arch/unshield-0.6_p20120308
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/openssl:0 sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl:0 sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=InstallShield CAB file extractor
 EAPI=4
 HOMEPAGE=http://github.com/twogood/unshield http://sourceforge.net/projects/synce/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/openssl:0 sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://gentoo/unshield-0.6_p20120308.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=55b2ccc3be49ab751bf4a711a043913f
diff --git a/metadata/md5-cache/app-arch/xar-1.5.2 b/metadata/md5-cache/app-arch/xar-1.5.2
index f3f03bb5126a..08e4d97b65f2 100644
--- a/metadata/md5-cache/app-arch/xar-1.5.2
+++ b/metadata/md5-cache/app-arch/xar-1.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-libs/openssl dev-libs/libxml2 sys-libs/zlib acl? ( sys-apps/acl ) bzip2? ( app-arch/bzip2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl dev-libs/libxml2 sys-libs/zlib acl? ( sys-apps/acl ) bzip2? ( app-arch/bzip2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=an easily extensible archive format
 EAPI=1
 HOMEPAGE=http://code.google.com/p/xar
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=dev-libs/openssl dev-libs/libxml2 sys-libs/zlib acl? ( sys-apps/acl ) bzip2? ( app-arch/bzip2 )
 SLOT=0
 SRC_URI=http://xar.googlecode.com/files/xar-1.5.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0fcb231146450c2d4b06e3daa147cb0b
diff --git a/metadata/md5-cache/app-arch/xar-1.5.2-r1 b/metadata/md5-cache/app-arch/xar-1.5.2-r1
index 69f98ee91b7c..939d07030f8d 100644
--- a/metadata/md5-cache/app-arch/xar-1.5.2-r1
+++ b/metadata/md5-cache/app-arch/xar-1.5.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/openssl dev-libs/libxml2 sys-libs/zlib acl? ( sys-apps/acl ) bzip2? ( app-arch/bzip2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl dev-libs/libxml2 sys-libs/zlib acl? ( sys-apps/acl ) bzip2? ( app-arch/bzip2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An easily extensible archive format
 EAPI=4
 HOMEPAGE=http://code.google.com/p/xar
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=dev-libs/openssl dev-libs/libxml2 sys-libs/zlib acl? ( sys-apps/acl ) bzip2? ( app-arch/bzip2 )
 SLOT=0
 SRC_URI=http://xar.googlecode.com/files/xar-1.5.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e9f635b459e86a1f30afa358b8d11df8
diff --git a/metadata/md5-cache/app-arch/xarchiver-0.5.2-r3 b/metadata/md5-cache/app-arch/xarchiver-0.5.2-r3
index d65d6f8e480a..0eca1a02c0ca 100644
--- a/metadata/md5-cache/app-arch/xarchiver-0.5.2-r3
+++ b/metadata/md5-cache/app-arch/xarchiver-0.5.2-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 >=x11-libs/gtk+-2.10:2
 SLOT=0
 SRC_URI=mirror://sourceforge/xarchiver/xarchiver-0.5.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=35b0f7748b0564bcf35c10047b6ae822
diff --git a/metadata/md5-cache/app-arch/xz-utils-9999 b/metadata/md5-cache/app-arch/xz-utils-9999
index beb7b15576e9..54180ec08451 100644
--- a/metadata/md5-cache/app-arch/xz-utils-9999
+++ b/metadata/md5-cache/app-arch/xz-utils-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare unpack
-DEPEND=!<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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!<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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=utils for managing LZMA compressed files
 EAPI=4
 HOMEPAGE=http://tukaani.org/xz/
@@ -7,5 +7,5 @@ IUSE=nls static-libs +threads
 LICENSE=LGPL-2.1
 RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=89d8d76c404e69cf8ab13fef12d8c5b3
diff --git a/metadata/md5-cache/app-arch/zpaq-4.04 b/metadata/md5-cache/app-arch/zpaq-4.04
index 4219c5891606..91373544d299 100644
--- a/metadata/md5-cache/app-arch/zpaq-4.04
+++ b/metadata/md5-cache/app-arch/zpaq-4.04
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND==app-arch/libzpaq-5* dev-libs/libdivsufsort app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==app-arch/libzpaq-5* dev-libs/libdivsufsort app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A unified compressor for PAQ algorithms
 EAPI=3
 HOMEPAGE=http://mattmahoney.net/dc/zpaq.html
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND==app-arch/libzpaq-5* dev-libs/libdivsufsort
 SLOT=0
 SRC_URI=http://mattmahoney.net/dc/zpaq404.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=270ac8ae59189299d0c956423ea7a128
diff --git a/metadata/md5-cache/app-arch/zpaq-6.10 b/metadata/md5-cache/app-arch/zpaq-6.10
index a9e646f3556c..c05d9d424ea2 100644
--- a/metadata/md5-cache/app-arch/zpaq-6.10
+++ b/metadata/md5-cache/app-arch/zpaq-6.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND==app-arch/libzpaq-6* dev-libs/libdivsufsort app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==app-arch/libzpaq-6* dev-libs/libdivsufsort app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Journaling incremental deduplicating archiving compressor
 EAPI=3
 HOMEPAGE=http://mattmahoney.net/dc/zpaq.html
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND==app-arch/libzpaq-6* dev-libs/libdivsufsort
 SLOT=0
 SRC_URI=http://mattmahoney.net/dc/zpaq610.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c14e871a7283123dfdabc940f44770f8
diff --git a/metadata/md5-cache/app-backup/amanda-2.6.0_p2-r4 b/metadata/md5-cache/app-backup/amanda-2.6.0_p2-r4
index 21ecf1429515..d3c1982928c4 100644
--- a/metadata/md5-cache/app-backup/amanda-2.6.0_p2-r4
+++ b/metadata/md5-cache/app-backup/amanda-2.6.0_p2-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar dev-lang/perl app-arch/dump net-misc/openssh dev-libs/glib s3? ( net-misc/curl ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) !sparc? ( xfs? ( sys-fs/xfsdump ) ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx sci-visualization/gnuplot app-crypt/aespipe app-crypt/gnupg ) sys-devel/autoconf sys-devel/automake || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar dev-lang/perl app-arch/dump net-misc/openssh dev-libs/glib s3? ( net-misc/curl ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) !sparc? ( xfs? ( sys-fs/xfsdump ) ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx sci-visualization/gnuplot app-crypt/aespipe app-crypt/gnupg ) sys-devel/autoconf sys-devel/automake || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
 HOMEPAGE=http://www.amanda.org/
 IUSE=berkdb debug gdbm minimal s3 samba xfs kerberos devpay ipv6
@@ -8,5 +8,5 @@ LICENSE=HPND BSD GPL-2 GPL-2+
 RDEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar dev-lang/perl app-arch/dump net-misc/openssh dev-libs/glib s3? ( net-misc/curl ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) !sparc? ( xfs? ( sys-fs/xfsdump ) ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx sci-visualization/gnuplot app-crypt/aespipe app-crypt/gnupg )
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-2.6.0p2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=55ff314b102319e09a15d800573f5aee
diff --git a/metadata/md5-cache/app-backup/amanda-2.6.1_p2 b/metadata/md5-cache/app-backup/amanda-2.6.1_p2
index 640a6fac211f..a456c5d89a47 100644
--- a/metadata/md5-cache/app-backup/amanda-2.6.1_p2
+++ b/metadata/md5-cache/app-backup/amanda-2.6.1_p2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.2 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.2 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
 HOMEPAGE=http://www.amanda.org/
 IUSE=gnuplot ipv6 kerberos minimal nls s3 samba xfs
@@ -8,5 +8,5 @@ LICENSE=HPND BSD GPL-2 GPL-2+
 RDEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.2 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg )
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-2.6.1p2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c6c3d9733eb57d09c20bfef9fc6d081f
diff --git a/metadata/md5-cache/app-backup/amanda-3.2.1 b/metadata/md5-cache/app-backup/amanda-3.2.1
index ef8b226da6c9..3ed39bd7fb95 100644
--- a/metadata/md5-cache/app-backup/amanda-3.2.1
+++ b/metadata/md5-cache/app-backup/amanda-3.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+DEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
 EAPI=3
 HOMEPAGE=http://www.amanda.org/
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
 RDEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f1937248f8cfffed2fd91f3c171ed2d9
diff --git a/metadata/md5-cache/app-backup/amanda-3.2.2 b/metadata/md5-cache/app-backup/amanda-3.2.2
index 58bbe203a9b1..32bf35242aad 100644
--- a/metadata/md5-cache/app-backup/amanda-3.2.2
+++ b/metadata/md5-cache/app-backup/amanda-3.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+DEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
 EAPI=3
 HOMEPAGE=http://www.amanda.org/
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
 RDEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4a05c41b231872941d50fe31faa7b7eb
diff --git a/metadata/md5-cache/app-backup/amanda-3.2.3 b/metadata/md5-cache/app-backup/amanda-3.2.3
index c0d807354ba6..152aea353f7e 100644
--- a/metadata/md5-cache/app-backup/amanda-3.2.3
+++ b/metadata/md5-cache/app-backup/amanda-3.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+DEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
 EAPI=3
 HOMEPAGE=http://www.amanda.org/
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
 RDEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.2.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bcb5a8922afb6cddc966020d54f14584
diff --git a/metadata/md5-cache/app-backup/amanda-3.3.0 b/metadata/md5-cache/app-backup/amanda-3.3.0
index 68ac1b54bd14..4a1a15529fed 100644
--- a/metadata/md5-cache/app-backup/amanda-3.3.0
+++ b/metadata/md5-cache/app-backup/amanda-3.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+DEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
 EAPI=3
 HOMEPAGE=http://www.amanda.org/
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
 RDEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=af2e73af4d668b6a5348c486566d6db0
diff --git a/metadata/md5-cache/app-backup/amanda-3.3.1 b/metadata/md5-cache/app-backup/amanda-3.3.1
index 10a11c2c5cd0..478c1b179635 100644
--- a/metadata/md5-cache/app-backup/amanda-3.3.1
+++ b/metadata/md5-cache/app-backup/amanda-3.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+DEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
 EAPI=3
 HOMEPAGE=http://www.amanda.org/
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
 RDEPEND=sys-libs/readline virtual/inetd virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d122f325b36a34ee82c2915389684d31
diff --git a/metadata/md5-cache/app-backup/amanda-3.3.3 b/metadata/md5-cache/app-backup/amanda-3.3.3
index 8e08c94d43d9..323fd06af928 100644
--- a/metadata/md5-cache/app-backup/amanda-3.3.3
+++ b/metadata/md5-cache/app-backup/amanda-3.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/readline virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !systemd? ( virtual/inetd ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] virtual/pkgconfig
+DEPEND=sys-libs/readline virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !systemd? ( virtual/inetd ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] virtual/pkgconfig
 DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
 EAPI=3
 HOMEPAGE=http://www.amanda.org/
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
 RDEPEND=sys-libs/readline virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !systemd? ( virtual/inetd ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7fdda2332cdb2303dc0790b6191a99ef
diff --git a/metadata/md5-cache/app-backup/backupninja-1.0.1 b/metadata/md5-cache/app-backup/backupninja-1.0.1
index 58f28d9fe35a..c06beb95eaf7 100644
--- a/metadata/md5-cache/app-backup/backupninja-1.0.1
+++ b/metadata/md5-cache/app-backup/backupninja-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=dev-util/dialog || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-util/dialog || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=lightweight, extensible meta-backup system
 EAPI=5
 HOMEPAGE=http://riseuplabs.org/backupninja/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-util/dialog
 SLOT=0
 SRC_URI=https://labs.riseup.net/code/attachments/download/275/backupninja-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=28928097fcc3140d661262b97e54aa8e
diff --git a/metadata/md5-cache/app-backup/bacula-5.2.13 b/metadata/md5-cache/app-backup/bacula-5.2.13
index a3f27186f617..ca8d321e8f07 100644
--- a/metadata/md5-cache/app-backup/bacula-5.2.13
+++ b/metadata/md5-cache/app-backup/bacula-5.2.13
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ^^ ( mysql postgres sqlite3 ) bacula-clientonly ) static? ( ba
 SLOT=0
 SRC_URI=mirror://sourceforge/bacula/bacula-5.2.13.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a7dc8fe49b73a03a411a7679328618ca
+_md5_=a88fc49c37fe82e8a992a82701b6152c
diff --git a/metadata/md5-cache/app-backup/boxbackup-0.10 b/metadata/md5-cache/app-backup/boxbackup-0.10
index 467bdb9e94c2..6f51271e8497 100644
--- a/metadata/md5-cache/app-backup/boxbackup-0.10
+++ b/metadata/md5-cache/app-backup/boxbackup-0.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst preinst unpack
-DEPEND=sys-libs/zlib sys-libs/db >=dev-libs/openssl-0.9.7 >=dev-lang/perl-5.6 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib sys-libs/db >=dev-libs/openssl-0.9.7 >=dev-lang/perl-5.6 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A completely automatic on-line backup system
 HOMEPAGE=http://boxbackup.org/
 IUSE=client-only
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/zlib sys-libs/db >=dev-libs/openssl-0.9.7 >=dev-lang/perl-5.6 virtual/mta
 SLOT=0
 SRC_URI=mirror://sourceforge/boxbackup/boxbackup-0.10.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=075d4e696a49c1f9b2c762dc6b99cdd5
diff --git a/metadata/md5-cache/app-backup/fsarchiver-0.6.15 b/metadata/md5-cache/app-backup/fsarchiver-0.6.15
index 839c3bf884e3..14802614da7e 100644
--- a/metadata/md5-cache/app-backup/fsarchiver-0.6.15
+++ b/metadata/md5-cache/app-backup/fsarchiver-0.6.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Flexible filesystem archiver for backup and deployment tool
 EAPI=4
 HOMEPAGE=http://www.fsarchiver.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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] ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/fsarchiver/fsarchiver-0.6.15.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6ce16427aaaf7dfe7702eadf97ebf273
diff --git a/metadata/md5-cache/app-backup/fsarchiver-0.6.16 b/metadata/md5-cache/app-backup/fsarchiver-0.6.16
index 29ed21eac836..b6927a927349 100644
--- a/metadata/md5-cache/app-backup/fsarchiver-0.6.16
+++ b/metadata/md5-cache/app-backup/fsarchiver-0.6.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Flexible filesystem archiver for backup and deployment tool
 EAPI=5
 HOMEPAGE=http://www.fsarchiver.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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] ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/fsarchiver/fsarchiver-0.6.16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bd0bdf8fbcdd60837d771a210f4518f3
diff --git a/metadata/md5-cache/app-backup/fsarchiver-0.6.17 b/metadata/md5-cache/app-backup/fsarchiver-0.6.17
index 1267bee2246a..9fefc9eec7f0 100644
--- a/metadata/md5-cache/app-backup/fsarchiver-0.6.17
+++ b/metadata/md5-cache/app-backup/fsarchiver-0.6.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Flexible filesystem archiver for backup and deployment tool
 EAPI=5
 HOMEPAGE=http://www.fsarchiver.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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] ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/fsarchiver/fsarchiver-0.6.17.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ab8bfa1e431e3a95f519a920fca3786f
diff --git a/metadata/md5-cache/app-benchmarks/acovea-5.1.1 b/metadata/md5-cache/app-benchmarks/acovea-5.1.1
index bb088c472b30..0064411c1268 100644
--- a/metadata/md5-cache/app-benchmarks/acovea-5.1.1
+++ b/metadata/md5-cache/app-benchmarks/acovea-5.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libcoyotl-3.1.0 >=dev-libs/libevocosm-3.1.0 dev-libs/expat
 SLOT=0
 SRC_URI=http://www.coyotegulch.com/distfiles/libacovea-5.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed89114d9736d0dfcc00f1a80cc8ac6c
diff --git a/metadata/md5-cache/app-benchmarks/dbench-4.0 b/metadata/md5-cache/app-benchmarks/dbench-4.0
index 6f4f25bff38e..0a41b772c532 100644
--- a/metadata/md5-cache/app-benchmarks/dbench-4.0
+++ b/metadata/md5-cache/app-benchmarks/dbench-4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst unpack
-DEPEND=dev-libs/popt || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/popt || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Popular filesystem benchmark
 HOMEPAGE=http://samba.org/ftp/tridge/dbench/
 KEYWORDS=amd64 hppa ppc ppc64 sparc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/popt
 SLOT=0
 SRC_URI=ftp://ftp.samba.org/pub/tridge/dbench/dbench-4.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1e1bd4b5c2d099321600e458cc9b4df4
diff --git a/metadata/md5-cache/app-benchmarks/filebench-1.3.4 b/metadata/md5-cache/app-benchmarks/filebench-1.3.4
index 5e41080a04a1..1a7b35acb3c7 100644
--- a/metadata/md5-cache/app-benchmarks/filebench-1.3.4
+++ b/metadata/md5-cache/app-benchmarks/filebench-1.3.4
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-libs/libaio sys-devel/flex sys-devel/bison || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libaio sys-devel/flex sys-devel/bison || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Filebench - A Model Based File System Workload Generator
 HOMEPAGE=http://sourceforge.net/projects/filebench/
 KEYWORDS=~amd64 ~x86
 LICENSE=CDDL
 SLOT=0
 SRC_URI=mirror://sourceforge/filebench/filebench-1.3.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0d2d6dc49ac4d1d35d54bcc3a4b9af04
diff --git a/metadata/md5-cache/app-benchmarks/filebench-1.4.9 b/metadata/md5-cache/app-benchmarks/filebench-1.4.9
index aadbe8cb752c..742dc462ec2b 100644
--- a/metadata/md5-cache/app-benchmarks/filebench-1.4.9
+++ b/metadata/md5-cache/app-benchmarks/filebench-1.4.9
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-libs/libaio sys-devel/flex sys-devel/bison || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libaio sys-devel/flex sys-devel/bison || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Filebench - A Model Based File System Workload Generator
 HOMEPAGE=http://sourceforge.net/projects/filebench/
 KEYWORDS=~amd64 ~x86
 LICENSE=CDDL
 SLOT=0
 SRC_URI=mirror://sourceforge/filebench/filebench-1.4.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3e03ebaa215f344537dee1514d3eb438
diff --git a/metadata/md5-cache/app-benchmarks/filebench-1.4.9.1 b/metadata/md5-cache/app-benchmarks/filebench-1.4.9.1
index fbadff571bb8..3f9187fdbeed 100644
--- a/metadata/md5-cache/app-benchmarks/filebench-1.4.9.1
+++ b/metadata/md5-cache/app-benchmarks/filebench-1.4.9.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-libs/libaio sys-devel/flex sys-devel/bison || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libaio sys-devel/flex sys-devel/bison || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Filebench - A Model Based File System Workload Generator
 HOMEPAGE=http://sourceforge.net/projects/filebench/
 KEYWORDS=~amd64 ~x86
 LICENSE=CDDL
 SLOT=0
 SRC_URI=mirror://sourceforge/filebench/filebench-1.4.9.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5d4169f5424d2d649f209f10c9b4cb62
diff --git a/metadata/md5-cache/app-benchmarks/httperf-0.8 b/metadata/md5-cache/app-benchmarks/httperf-0.8
index f0df25e2beda..84a0847fcf50 100644
--- a/metadata/md5-cache/app-benchmarks/httperf-0.8
+++ b/metadata/md5-cache/app-benchmarks/httperf-0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=A tool from HP for measuring web server performance.
 HOMEPAGE=http://www.hpl.hp.com/research/linux/httperf/index.php
 IUSE=debug ssl
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~mips x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.hpl.hp.com/pub/httperf/httperf-0.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f1e865cbb0f57c6c73a6b014049ce361
diff --git a/metadata/md5-cache/app-benchmarks/httperf-0.9.0-r1 b/metadata/md5-cache/app-benchmarks/httperf-0.9.0-r1
index 998256c2b8fb..f035b5b82b69 100644
--- a/metadata/md5-cache/app-benchmarks/httperf-0.9.0-r1
+++ b/metadata/md5-cache/app-benchmarks/httperf-0.9.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A tool from HP for measuring web server performance.
 EAPI=2
 HOMEPAGE=http://code.google.com/p/httperf/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl
 SLOT=0
 SRC_URI=http://httperf.googlecode.com/files/httperf-0.9.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8665b76befa4c03644931711b2ae581b
diff --git a/metadata/md5-cache/app-benchmarks/httperf-0.9.0-r2 b/metadata/md5-cache/app-benchmarks/httperf-0.9.0-r2
index 47eba13f3046..4303364dca7c 100644
--- a/metadata/md5-cache/app-benchmarks/httperf-0.9.0-r2
+++ b/metadata/md5-cache/app-benchmarks/httperf-0.9.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A tool from HP for measuring web server performance.
 EAPI=4
 HOMEPAGE=http://code.google.com/p/httperf/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl
 SLOT=0
 SRC_URI=http://httperf.googlecode.com/files/httperf-0.9.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b1c40de6e6f5937f8065e1303c8338aa
diff --git a/metadata/md5-cache/app-benchmarks/ltp-20120903 b/metadata/md5-cache/app-benchmarks/ltp-20120903
index 7f6385d09d51..f176a4c08ed5 100644
--- a/metadata/md5-cache/app-benchmarks/ltp-20120903
+++ b/metadata/md5-cache/app-benchmarks/ltp-20120903
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=expect? ( dev-tcltk/expect ) perl? ( dev-lang/perl ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=expect? ( dev-tcltk/expect ) perl? ( dev-lang/perl ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A testsuite for the linux kernel
 EAPI=4
 HOMEPAGE=http://ltp.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ltp/LTP%20Source/ltp-20120903/ltp-full-20120903.bz2 -> ltp-20120903.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e9334d5e576d0dd619ef38fafe1711f3
diff --git a/metadata/md5-cache/app-benchmarks/ltp-20130109 b/metadata/md5-cache/app-benchmarks/ltp-20130109
index 4a9e7e914095..83318237af5e 100644
--- a/metadata/md5-cache/app-benchmarks/ltp-20130109
+++ b/metadata/md5-cache/app-benchmarks/ltp-20130109
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=expect? ( dev-tcltk/expect ) perl? ( dev-lang/perl ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=expect? ( dev-tcltk/expect ) perl? ( dev-lang/perl ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A testsuite for the linux kernel
 EAPI=4
 HOMEPAGE=http://ltp.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ltp/LTP%20Source/ltp-20130109/ltp-full-20130109.bz2 -> ltp-20130109.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=72ee85c6062993cb1a3f29eb1795dffa
diff --git a/metadata/md5-cache/app-benchmarks/os-autoinst-9999 b/metadata/md5-cache/app-benchmarks/os-autoinst-9999
index 9d5a088cba75..0189fde152dc 100644
--- a/metadata/md5-cache/app-benchmarks/os-autoinst-9999
+++ b/metadata/md5-cache/app-benchmarks/os-autoinst-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=media-libs/opencv-2.4 dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/opencv-2.4 dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=automated testing of Operating Systems
 EAPI=4
 HOMEPAGE=http://os-autoinst.org/
 LICENSE=GPL-2
 RDEPEND=>=media-libs/opencv-2.4 dev-lang/perl[ithreads] dev-perl/JSON app-emulation/qemu app-text/gocr media-gfx/imagemagick media-video/ffmpeg2theora
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=41fa55493ca551fd1e4a6016499c7b9f
diff --git a/metadata/md5-cache/app-benchmarks/siege-2.66 b/metadata/md5-cache/app-benchmarks/siege-2.66
index c8fb2281ed78..e59ea97f1f2f 100644
--- a/metadata/md5-cache/app-benchmarks/siege-2.66
+++ b/metadata/md5-cache/app-benchmarks/siege-2.66
@@ -9,5 +9,5 @@ PDEPEND=bash-completion? ( app-shells/bash-completion )
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) bash-completion? ( app-admin/eselect )
 SLOT=0
 SRC_URI=ftp://sid.joedog.org/pub/siege/siege-2.66.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion	003731da0df19d26955927bd534f3058	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion	003731da0df19d26955927bd534f3058	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8d6632107a1f82db9e5e6873b30aeec2
diff --git a/metadata/md5-cache/app-benchmarks/siege-2.67 b/metadata/md5-cache/app-benchmarks/siege-2.67
index c19c2af94242..4108273f7d2a 100644
--- a/metadata/md5-cache/app-benchmarks/siege-2.67
+++ b/metadata/md5-cache/app-benchmarks/siege-2.67
@@ -9,5 +9,5 @@ PDEPEND=bash-completion? ( app-shells/bash-completion )
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) bash-completion? ( app-admin/eselect )
 SLOT=0
 SRC_URI=ftp://sid.joedog.org/pub/siege/siege-2.67.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion	003731da0df19d26955927bd534f3058	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion	003731da0df19d26955927bd534f3058	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f09c27ff47c34c4bbb6ad332f970d7e9
diff --git a/metadata/md5-cache/app-benchmarks/siege-2.70 b/metadata/md5-cache/app-benchmarks/siege-2.70
index 2667928148c4..06116ed21825 100644
--- a/metadata/md5-cache/app-benchmarks/siege-2.70
+++ b/metadata/md5-cache/app-benchmarks/siege-2.70
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d )
 SLOT=0
 SRC_URI=http://www.joedog.org/pub/siege/siege-2.70.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6576c0b2fc0b14eecb86e15759880902
diff --git a/metadata/md5-cache/app-benchmarks/siege-2.72 b/metadata/md5-cache/app-benchmarks/siege-2.72
index 07f875279902..e24370b98376 100644
--- a/metadata/md5-cache/app-benchmarks/siege-2.72
+++ b/metadata/md5-cache/app-benchmarks/siege-2.72
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d )
 SLOT=0
 SRC_URI=http://www.joedog.org/pub/siege/siege-2.72.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3b5c5038b1c068475514b72e4b174c4f
diff --git a/metadata/md5-cache/app-benchmarks/spew-1.0.8 b/metadata/md5-cache/app-benchmarks/spew-1.0.8
index 20bb4297dd57..676df5626fa4 100644
--- a/metadata/md5-cache/app-benchmarks/spew-1.0.8
+++ b/metadata/md5-cache/app-benchmarks/spew-1.0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=static? ( sys-libs/ncurses[-gpm] dev-libs/popt[static-libs] ) !static? ( sys-libs/ncurses dev-libs/popt ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=static? ( sys-libs/ncurses[-gpm] dev-libs/popt[static-libs] ) !static? ( sys-libs/ncurses dev-libs/popt ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Measures I/O performance and/or generates I/O load
 EAPI=4
 HOMEPAGE=http://spew.berlios.de/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=static? ( sys-libs/ncurses[-gpm] dev-libs/popt[static-libs] ) !static? ( sys-libs/ncurses dev-libs/popt )
 SLOT=0
 SRC_URI=ftp://ftp.berlios.de/pub/spew/1.0.8/spew-1.0.8.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6853603a151f4dd4397c8c3f37de2cec
diff --git a/metadata/md5-cache/app-benchmarks/stress-1.0.0 b/metadata/md5-cache/app-benchmarks/stress-1.0.0
index dba21eba574b..508984cbe151 100644
--- a/metadata/md5-cache/app-benchmarks/stress-1.0.0
+++ b/metadata/md5-cache/app-benchmarks/stress-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-apps/help2man || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/help2man || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Imposes stressful loads on different aspects of the system.
 HOMEPAGE=http://weather.ou.edu/~apw/projects/stress
 IUSE=static
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://weather.ou.edu/~apw/projects/stress/stress-1.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c6691f5080f99997fdd47c998276c022
diff --git a/metadata/md5-cache/app-benchmarks/stress-1.0.1 b/metadata/md5-cache/app-benchmarks/stress-1.0.1
index 2aebccc94eb5..e876b274f7c0 100644
--- a/metadata/md5-cache/app-benchmarks/stress-1.0.1
+++ b/metadata/md5-cache/app-benchmarks/stress-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-apps/help2man || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/help2man || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Imposes stressful loads on different aspects of the system.
 HOMEPAGE=http://weather.ou.edu/~apw/projects/stress
 IUSE=static
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://weather.ou.edu/~apw/projects/stress/stress-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=76c9a4f217fa75fdc6c9097aec482471
diff --git a/metadata/md5-cache/app-benchmarks/stress-1.0.3 b/metadata/md5-cache/app-benchmarks/stress-1.0.3
index 1986143a2d56..455e2c87f28e 100644
--- a/metadata/md5-cache/app-benchmarks/stress-1.0.3
+++ b/metadata/md5-cache/app-benchmarks/stress-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-apps/help2man || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/help2man || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Imposes stressful loads on different aspects of the system.
 HOMEPAGE=http://weather.ou.edu/~apw/projects/stress
 IUSE=static
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://weather.ou.edu/~apw/projects/stress/stress-1.0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=670e4529a0620273d2d0b182e5b564c6
diff --git a/metadata/md5-cache/app-benchmarks/stress-1.0.4 b/metadata/md5-cache/app-benchmarks/stress-1.0.4
index 81e570fa1ac0..a0211f9c38b5 100644
--- a/metadata/md5-cache/app-benchmarks/stress-1.0.4
+++ b/metadata/md5-cache/app-benchmarks/stress-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-apps/help2man || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/help2man || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Imposes stressful loads on different aspects of the system.
 HOMEPAGE=http://weather.ou.edu/~apw/projects/stress
 IUSE=static
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://weather.ou.edu/~apw/projects/stress/stress-1.0.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=491d6d93c10d7f69ce657865e0482029
diff --git a/metadata/md5-cache/app-benchmarks/sysbench-0.4.12-r1 b/metadata/md5-cache/app-benchmarks/sysbench-0.4.12-r1
index 42f609eb7e72..1d81c8b294cd 100644
--- a/metadata/md5-cache/app-benchmarks/sysbench-0.4.12-r1
+++ b/metadata/md5-cache/app-benchmarks/sysbench-0.4.12-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=mysql? ( virtual/mysql ) aio? ( dev-libs/libaio ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mysql? ( virtual/mysql ) aio? ( dev-libs/libaio ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=System performance benchmark
 EAPI=2
 HOMEPAGE=http://sysbench.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql ) aio? ( dev-libs/libaio )
 SLOT=0
 SRC_URI=mirror://sourceforge/sysbench/sysbench-0.4.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=77271be8962ad759cb658ef5d6ea1146
diff --git a/metadata/md5-cache/app-cdr/brasero-2.32.1-r1 b/metadata/md5-cache/app-cdr/brasero-2.32.1-r1
index ab2d9861d249..e3ddff5836dc 100644
--- a/metadata/md5-cache/app-cdr/brasero-2.32.1-r1
+++ b/metadata/md5-cache/app-cdr/brasero-2.32.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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/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.31.3 <gnome-base/nautilus-3 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1 ) app-text/gnome-doc-utils virtual/pkgconfig sys-devel/gettext dev-util/intltool gnome-base/gnome-common:3 >=dev-util/gtk-doc-am-1.12 test? ( app-text/docbook-xml-dtd:4.3 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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/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.31.3 <gnome-base/nautilus-3 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1 ) app-text/gnome-doc-utils virtual/pkgconfig sys-devel/gettext dev-util/intltool gnome-base/gnome-common:3 >=dev-util/gtk-doc-am-1.12 test? ( app-text/docbook-xml-dtd:4.3 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=CD/DVD burning application for the GNOME desktop
 EAPI=4
 HOMEPAGE=http://projects.gnome.org/brasero/
@@ -10,5 +10,5 @@ PDEPEND=gnome-base/gvfs
 RDEPEND=>=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/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.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 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/brasero/2.32/brasero-2.32.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b4ff234e8ece6d5a5a3b7c0f93a55985
diff --git a/metadata/md5-cache/app-cdr/cdw-0.7.1 b/metadata/md5-cache/app-cdr/cdw-0.7.1
index ac7ca984ed78..0c68e45acef8 100644
--- a/metadata/md5-cache/app-cdr/cdw-0.7.1
+++ b/metadata/md5-cache/app-cdr/cdw-0.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An ncurses based console frontend for cdrtools and dvd+rw-tools
 EAPI=2
 HOMEPAGE=http://cdw.sourceforge.net
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode]
 SLOT=0
 SRC_URI=mirror://sourceforge/cdw/cdw-0.7.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b86df5ed21057b30b1f457deaec1ecea
diff --git a/metadata/md5-cache/app-cdr/cdw-9999 b/metadata/md5-cache/app-cdr/cdw-9999
index 492c37ccab93..21659e19a49b 100644
--- a/metadata/md5-cache/app-cdr/cdw-9999
+++ b/metadata/md5-cache/app-cdr/cdw-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install prepare unpack
-DEPEND=virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/cvs
+DEPEND=virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/cvs
 DESCRIPTION=An ncurses based console frontend for cdrtools and dvd+rw-tools
 EAPI=2
 HOMEPAGE=http://cdw.sourceforge.net
 LICENSE=GPL-2
 RDEPEND=virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode]
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	cvs	39a3c20f6f84050321495248c23e26c4	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	cvs	39a3c20f6f84050321495248c23e26c4	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4212cb4692c154363a93242832086b1e
diff --git a/metadata/md5-cache/app-cdr/dvd95-1.6_p0 b/metadata/md5-cache/app-cdr/dvd95-1.6_p0
index a9ac0293b21f..74366cd77687 100644
--- a/metadata/md5-cache/app-cdr/dvd95-1.6_p0
+++ b/metadata/md5-cache/app-cdr/dvd95-1.6_p0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=gnome-base/libgnomeui-2 dev-libs/libxml2 media-libs/libdvdread mpeg? ( media-libs/libmpeg2 ) media-video/mplayer virtual/pkgconfig nls? ( sys-devel/gettext dev-util/intltool ) sys-apps/sed || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=gnome-base/libgnomeui-2 dev-libs/libxml2 media-libs/libdvdread mpeg? ( media-libs/libmpeg2 ) media-video/mplayer virtual/pkgconfig nls? ( sys-devel/gettext dev-util/intltool ) sys-apps/sed || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=DVD95 is a Gnome application to convert DVD9 to DVD5.
 EAPI=2
 HOMEPAGE=http://dvd95.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnome-base/libgnomeui-2 dev-libs/libxml2 media-libs/libdvdread mpeg? ( media-libs/libmpeg2 ) media-video/mplayer
 SLOT=0
 SRC_URI=mirror://sourceforge/dvd95/dvd95-1.6p0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8f541d86700aeb1753d0cd8ee3cc8b18
diff --git a/metadata/md5-cache/app-cdr/k3b-2.0.2-r4 b/metadata/md5-cache/app-cdr/k3b-2.0.2-r4
index 833ce0663a6b..0642679473ef 100644
--- a/metadata/md5-cache/app-cdr/k3b-2.0.2-r4
+++ b/metadata/md5-cache/app-cdr/k3b-2.0.2-r4
@@ -11,4 +11,4 @@ REQUIRED_USE=mp3? ( encode ) sox? ( encode )
 SLOT=4
 SRC_URI=mirror://sourceforge/k3b/k3b-2.0.2.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	bc8bbf26de246f74e2901a3696ad96d6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=86188a87bf659c837c3a70fc0c156847
+_md5_=9c8092a01fdd6bd3651427a946d2ca14
diff --git a/metadata/md5-cache/app-cdr/mirage2iso-0.3.1 b/metadata/md5-cache/app-cdr/mirage2iso-0.3.1
index a3d1069142a3..1ac2548c7a7d 100644
--- a/metadata/md5-cache/app-cdr/mirage2iso-0.3.1
+++ b/metadata/md5-cache/app-cdr/mirage2iso-0.3.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=<dev-libs/libmirage-2 dev-libs/glib:2 pinentry? ( dev-libs/libassuan ) pinentry? ( app-crypt/pinentry )
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/mirage2iso/downloads/mirage2iso-0.3.1.tar.bz2 test? ( mirror://bitbucket/mgorny/mirage2iso/downloads/mirage2iso-0.3-tests.tar.xz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=df805c88bac017bed43ddd0c59e1364a
diff --git a/metadata/md5-cache/app-cdr/mirage2iso-0.4 b/metadata/md5-cache/app-cdr/mirage2iso-0.4
index f18cc141e9e6..8829b112f621 100644
--- a/metadata/md5-cache/app-cdr/mirage2iso-0.4
+++ b/metadata/md5-cache/app-cdr/mirage2iso-0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libmirage-2.0.0 dev-libs/glib:2 pinentry? ( dev-libs/libassuan ) pinentry? ( app-crypt/pinentry )
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/mirage2iso/downloads/mirage2iso-0.4.tar.bz2 test? ( mirror://bitbucket/mgorny/mirage2iso/downloads/mirage2iso-0.3-tests.tar.xz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ddc46033de0b964d9a5e4862fb0a9ada
diff --git a/metadata/md5-cache/app-cdr/mirage2iso-9999 b/metadata/md5-cache/app-cdr/mirage2iso-9999
index 4ca2367153b9..8116fc88fc22 100644
--- a/metadata/md5-cache/app-cdr/mirage2iso-9999
+++ b/metadata/md5-cache/app-cdr/mirage2iso-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libmirage-2.0.0 dev-libs/glib:2 pinentry? ( dev-libs/libassuan ) virtual/pkgconfig test? ( app-arch/xz-utils ) dev-libs/libassuan dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libmirage-2.0.0 dev-libs/glib:2 pinentry? ( dev-libs/libassuan ) virtual/pkgconfig test? ( app-arch/xz-utils ) dev-libs/libassuan dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=CD/DVD image converter using libmirage
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/mirage2iso/
@@ -7,5 +7,5 @@ IUSE=pinentry test
 LICENSE=BSD
 RDEPEND=>=dev-libs/libmirage-2.0.0 dev-libs/glib:2 pinentry? ( dev-libs/libassuan ) pinentry? ( app-crypt/pinentry )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b1ed2f1acae1e150a0208cc803ab4eae
diff --git a/metadata/md5-cache/app-cdr/xfburn-0.4.3_p20121021 b/metadata/md5-cache/app-cdr/xfburn-0.4.3_p20121021
index 282bf1df771d..36a13815249c 100644
--- a/metadata/md5-cache/app-cdr/xfburn-0.4.3_p20121021
+++ b/metadata/md5-cache/app-cdr/xfburn-0.4.3_p20121021
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.30 >=dev-libs/libburn-0.4.2 >=dev-libs/libisofs-0.6.2 >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.10 gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 ) udev? ( virtual/udev[gudev] ) dev-libs/libxslt dev-util/intltool >=dev-util/xfce4-dev-tools-4.10 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.30 >=dev-libs/libburn-0.4.2 >=dev-libs/libisofs-0.6.2 >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.10 gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 ) udev? ( virtual/udev[gudev] ) dev-libs/libxslt dev-util/intltool >=dev-util/xfce4-dev-tools-4.10 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=GTK+ based CD and DVD burning application
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/applications/xfburn
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.30 >=dev-libs/libburn-0.4.2 >=dev-libs/libisofs-0.6.2 >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.10 gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 ) udev? ( virtual/udev[gudev] )
 SLOT=0
 SRC_URI=mirror://gentoo/xfburn-0.4.3_p20121021.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=5259ebe8c464d8a11febf53fb688ebfb
diff --git a/metadata/md5-cache/app-crypt/acr38u-1.7.10-r1 b/metadata/md5-cache/app-crypt/acr38u-1.7.10-r1
index 4d317585844a..c3835364dc35 100644
--- a/metadata/md5-cache/app-crypt/acr38u-1.7.10-r1
+++ b/metadata/md5-cache/app-crypt/acr38u-1.7.10-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-apps/pcsc-lite-1.6.4 dev-libs/libusb-compat virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=>=sys-apps/pcsc-lite-1.6.4 dev-libs/libusb-compat virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Non CCID driver for ACR38 AC1038-based Smart Card Reader.
 EAPI=3
 HOMEPAGE=http://www.acs.com.hk
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/pcsc-lite-1.6.4 dev-libs/libusb-compat
 SLOT=0
 SRC_URI=http://www.acs.com.hk/drivers/eng/ACR38U_driver_Lnx_1710_P.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=243692ed7abdb7a8a9c5030294ed9b7b
diff --git a/metadata/md5-cache/app-crypt/acr38u-1.7.11 b/metadata/md5-cache/app-crypt/acr38u-1.7.11
index 9e9306fd73b9..e8f1709b0f4f 100644
--- a/metadata/md5-cache/app-crypt/acr38u-1.7.11
+++ b/metadata/md5-cache/app-crypt/acr38u-1.7.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-apps/pcsc-lite-1.6.4 dev-libs/libusb-compat virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=>=sys-apps/pcsc-lite-1.6.4 dev-libs/libusb-compat virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Non CCID driver for ACR38 AC1038-based Smart Card Reader.
 EAPI=3
 HOMEPAGE=http://www.acs.com.hk
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/pcsc-lite-1.6.4 dev-libs/libusb-compat
 SLOT=0
 SRC_URI=http://www.linuxunderground.be/ACR38_LINUX_100711_P.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e7f81e39cb23b1bc55064ff159f712b0
diff --git a/metadata/md5-cache/app-crypt/acr38u-1.7.11-r1 b/metadata/md5-cache/app-crypt/acr38u-1.7.11-r1
index dbecae36ca00..7917f7b0bc60 100644
--- a/metadata/md5-cache/app-crypt/acr38u-1.7.11-r1
+++ b/metadata/md5-cache/app-crypt/acr38u-1.7.11-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-apps/pcsc-lite-1.6.4 virtual/libusb:0 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=>=sys-apps/pcsc-lite-1.6.4 virtual/libusb:0 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Non CCID driver for ACR38 AC1038-based Smart Card Reader.
 EAPI=4
 HOMEPAGE=http://www.acs.com.hk
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/pcsc-lite-1.6.4 virtual/libusb:0
 SLOT=0
 SRC_URI=http://www.linuxunderground.be/ACR38_LINUX_100711_P.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a6f0a7bba05b0d93725f196c5d6849db
diff --git a/metadata/md5-cache/app-crypt/bsign-0.4.5 b/metadata/md5-cache/app-crypt/bsign-0.4.5
index f31ed226e698..239c7928bf2d 100644
--- a/metadata/md5-cache/app-crypt/bsign-0.4.5
+++ b/metadata/md5-cache/app-crypt/bsign-0.4.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=embed secure hashes (SHA1) and digital signatures (GNU Privacy Guard) into files
 EAPI=2
 HOMEPAGE=http://packages.debian.org/sid/bsign
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ppc ~ppc-macos ~x86 ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/b/bsign/bsign_0.4.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4973ebe7b6a92aa861d6c67e80773f82
diff --git a/metadata/md5-cache/app-crypt/ccid-1.4.10 b/metadata/md5-cache/app-crypt/ccid-1.4.10
index eb41adf2e79d..dad50876c365 100644
--- a/metadata/md5-cache/app-crypt/ccid-1.4.10
+++ b/metadata/md5-cache/app-crypt/ccid-1.4.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
 SLOT=0
 SRC_URI=http://alioth.debian.org/download.php/3897/ccid-1.4.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=612db3add09b179f29b87fe6ff0c2c4a
diff --git a/metadata/md5-cache/app-crypt/dieharder-2.28.1 b/metadata/md5-cache/app-crypt/dieharder-2.28.1
index c53b407e6248..54778e6c1294 100644
--- a/metadata/md5-cache/app-crypt/dieharder-2.28.1
+++ b/metadata/md5-cache/app-crypt/dieharder-2.28.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=sci-libs/gsl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/gsl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An advanced suite for testing the randomness of RNG's
 EAPI=2
 HOMEPAGE=http://www.phy.duke.edu/~rgb/General/dieharder.php
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sci-libs/gsl
 SLOT=0
 SRC_URI=http://www.phy.duke.edu/~rgb/General/dieharder/dieharder-2.28.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=66fbabb98928c004b275b4d65dbc704d
diff --git a/metadata/md5-cache/app-crypt/gcr-3.4.1-r2 b/metadata/md5-cache/app-crypt/gcr-3.4.1-r2
index 9dd0f4923898..f427de90e887 100644
--- a/metadata/md5-cache/app-crypt/gcr-3.4.1-r2
+++ b/metadata/md5-cache/app-crypt/gcr-3.4.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=app-crypt/gnupg-2 >=app-crypt/p11-kit-0.6 >=dev-libs/glib-2.30:2 >=dev-libs/libgcrypt-1.2.2 >=dev-libs/libtasn1-1 >=sys-apps/dbus-1.0 >=x11-libs/gtk+-3.0:3 introspection? ( >=dev-libs/gobject-introspection-1.29 ) dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig dev-libs/gobject-introspection-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=app-crypt/gnupg-2 >=app-crypt/p11-kit-0.6 >=dev-libs/glib-2.30:2 >=dev-libs/libgcrypt-1.2.2 >=dev-libs/libtasn1-1 >=sys-apps/dbus-1.0 >=x11-libs/gtk+-3.0:3 introspection? ( >=dev-libs/gobject-introspection-1.29 ) dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig dev-libs/gobject-introspection-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Libraries for cryptographic UIs and accessing PKCS#11 modules
 EAPI=4
 HOMEPAGE=http://www.gnome.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=app-crypt/gnupg-2 >=app-crypt/p11-kit-0.6 >=dev-libs/glib-2.30:2 >=dev-libs/libgcrypt-1.2.2 >=dev-libs/libtasn1-1 >=sys-apps/dbus-1.0 >=x11-libs/gtk+-3.0:3 introspection? ( >=dev-libs/gobject-introspection-1.29 ) !<gnome-base/gnome-keyring-3.3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gcr/3.4/gcr-3.4.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=edac35d01f0f9c123f5e1698dd151e93
diff --git a/metadata/md5-cache/app-crypt/gpa-0.9.1_pre20100416 b/metadata/md5-cache/app-crypt/gpa-0.9.1_pre20100416
index 99c8faf4545f..8759c40fe12b 100644
--- a/metadata/md5-cache/app-crypt/gpa-0.9.1_pre20100416
+++ b/metadata/md5-cache/app-crypt/gpa-0.9.1_pre20100416
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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 virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG
 EAPI=3
 HOMEPAGE=http://gpa.wald.intevation.org
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://gentoo/gpa-0.9.1_pre20100416.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f591366c021ba791dc3ccff46dadcc57
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.3.0-r1 b/metadata/md5-cache/app-crypt/gpgme-1.3.0-r1
index aad66f3d73e6..f5f91b8a6bd4 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.3.0-r1
+++ b/metadata/md5-cache/app-crypt/gpgme-1.3.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
 EAPI=4
 HOMEPAGE=http://www.gnupg.org/related_software/gpgme
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-crypt/gnupg >=dev-libs/libassuan-1.1.0 >=dev-libs/libgpg-error-1.4 pth? ( >=dev-libs/pth-1.2 )
 SLOT=1
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ede143db27d1c09b0d1207cb235596bb
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.3.1 b/metadata/md5-cache/app-crypt/gpgme-1.3.1
index 48da9372831a..a86f3a890cbb 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.3.1
+++ b/metadata/md5-cache/app-crypt/gpgme-1.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
 EAPI=4
 HOMEPAGE=http://www.gnupg.org/related_software/gpgme
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-crypt/gnupg >=dev-libs/libassuan-2.0.2 >=dev-libs/libgpg-error-1.4 pth? ( >=dev-libs/pth-1.2 )
 SLOT=1
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2cfacac5967e3da42f317693c88475be
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.3.2 b/metadata/md5-cache/app-crypt/gpgme-1.3.2
index db37a9ea7601..870a4319b4ac 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.3.2
+++ b/metadata/md5-cache/app-crypt/gpgme-1.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=app-crypt/gnupg >=dev-libs/libassuan-2.0.2 >=dev-libs/libgpg-error-1.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-crypt/gnupg >=dev-libs/libassuan-2.0.2 >=dev-libs/libgpg-error-1.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
 EAPI=4
 HOMEPAGE=http://www.gnupg.org/related_software/gpgme
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-crypt/gnupg >=dev-libs/libassuan-2.0.2 >=dev-libs/libgpg-error-1.4
 SLOT=1
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.3.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6d0ad852f252e4be3d62c92a77b9f9d2
diff --git a/metadata/md5-cache/app-crypt/heimdal-1.5.3 b/metadata/md5-cache/app-crypt/heimdal-1.5.3
index 2994632a5c55..2e4e962a3e3f 100644
--- a/metadata/md5-cache/app-crypt/heimdal-1.5.3
+++ b/metadata/md5-cache/app-crypt/heimdal-1.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=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* virtual/pkgconfig >=sys-devel/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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* virtual/pkgconfig >=sys-devel/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Kerberos 5 implementation from KTH
 EAPI=4
 HOMEPAGE=http://www.h5l.org/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=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
 SLOT=0
 SRC_URI=http://www.h5l.org/dist/src/heimdal-1.5.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=9b6d967357d1065b7e07cdfa16f44dfb
diff --git a/metadata/md5-cache/app-crypt/ima-evm-utils-0.2 b/metadata/md5-cache/app-crypt/ima-evm-utils-0.2
index 7d8b78037538..ad9ad31c6b74 100644
--- a/metadata/md5-cache/app-crypt/ima-evm-utils-0.2
+++ b/metadata/md5-cache/app-crypt/ima-evm-utils-0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-apps/keyutils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/keyutils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Supporting tools for IMA and EVM
 EAPI=5
 HOMEPAGE=http://linux-ima.sourceforge.net
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/keyutils
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-ima/ima-evm-utils-0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=413a50673a61ac520b551878b3602cfc
diff --git a/metadata/md5-cache/app-crypt/loop-aes-losetup-2.21 b/metadata/md5-cache/app-crypt/loop-aes-losetup-2.21
index f002934edb08..83c25e8f278d 100644
--- a/metadata/md5-cache/app-crypt/loop-aes-losetup-2.21
+++ b/metadata/md5-cache/app-crypt/loop-aes-losetup-2.21
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=selinux? ( sys-libs/libselinux ) nls? ( sys-devel/gettext ) virtual/os-headers || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=selinux? ( sys-libs/libselinux ) nls? ( sys-devel/gettext ) virtual/os-headers || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Various useful Linux utilities
 EAPI=4
 HOMEPAGE=http://www.kernel.org/pub/linux/utils/util-linux/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.21/util-linux-2.21.tar.xz http://loop-aes.sourceforge.net/updates/util-linux-2.21-20120228.diff.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f82b3cac269ed43b3637666030d51165
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-appl-1.0.3 b/metadata/md5-cache/app-crypt/mit-krb5-appl-1.0.3
index 377d5896c366..5c13abb8a533 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-appl-1.0.3
+++ b/metadata/md5-cache/app-crypt/mit-krb5-appl-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=app-crypt/mit-krb5-1.8.0 sys-libs/e2fsprogs-libs sys-libs/ncurses virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-crypt/mit-krb5-1.8.0 sys-libs/e2fsprogs-libs sys-libs/ncurses virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Kerberized applications split from the main MIT Kerberos V distribution
 EAPI=4
 HOMEPAGE=http://web.mit.edu/kerberos/www/
@@ -8,5 +8,5 @@ LICENSE=openafs-krb5-a BSD
 RDEPEND=>=app-crypt/mit-krb5-1.8.0 sys-libs/e2fsprogs-libs sys-libs/ncurses
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5-appl/1.0/krb5-appl-1.0.3-signed.tar
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f14f058cbe7a8054438f3ebedc49e272
diff --git a/metadata/md5-cache/app-crypt/nwipe-0.12 b/metadata/md5-cache/app-crypt/nwipe-0.12
index 31884c74c6e0..4378aa502004 100644
--- a/metadata/md5-cache/app-crypt/nwipe-0.12
+++ b/metadata/md5-cache/app-crypt/nwipe-0.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=>=sys-block/parted-2.3 >=sys-libs/ncurses-5.7-r7 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-block/parted-2.3 >=sys-libs/ncurses-5.7-r7 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Securely erase disks using a variety of recognized methods
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/nwipe/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-block/parted-2.3 >=sys-libs/ncurses-5.7-r7
 SLOT=0
 SRC_URI=mirror://sourceforge/nwipe/nwipe-0.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=0dd70b68605972be8ff1d79e027e540d
diff --git a/metadata/md5-cache/app-crypt/nwipe-0.12-r1 b/metadata/md5-cache/app-crypt/nwipe-0.12-r1
index 58b8fb325fd5..e6f7a5a6ac34 100644
--- a/metadata/md5-cache/app-crypt/nwipe-0.12-r1
+++ b/metadata/md5-cache/app-crypt/nwipe-0.12-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=>=sys-block/parted-2.3 >=sys-libs/ncurses-5.7-r7 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-block/parted-2.3 >=sys-libs/ncurses-5.7-r7 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Securely erase disks using a variety of recognized methods
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/nwipe/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-block/parted-2.3 >=sys-libs/ncurses-5.7-r7
 SLOT=0
 SRC_URI=mirror://sourceforge/nwipe/nwipe-0.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=be07536b727f289609c95fee60ca6b3a
diff --git a/metadata/md5-cache/app-crypt/oclhashcat-lite-bin-0.15 b/metadata/md5-cache/app-crypt/oclhashcat-lite-bin-0.15
new file mode 100644
index 000000000000..39189e222d7e
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/oclhashcat-lite-bin-0.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install preinst test
+DEPEND=sys-libs/zlib video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-310.32 ) video_cards_fglrx? ( =x11-drivers/ati-drivers-13.1 ) app-arch/p7zip
+DESCRIPTION=An opencl hash cracker
+EAPI=5
+HOMEPAGE=http://hashcat.net/oclhashcat-lite/
+IUSE=virtualcl video_cards_fglrx video_cards_nvidia
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=hashcat
+RDEPEND=sys-libs/zlib video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-310.32 ) video_cards_fglrx? ( =x11-drivers/ati-drivers-13.1 )
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://hashcat.net/files/oclHashcat-lite-0.15.7z
+_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3ad8963b9a62f657e86781e2140ef42f
diff --git a/metadata/md5-cache/app-crypt/oclhashcat-plus-bin-0.13 b/metadata/md5-cache/app-crypt/oclhashcat-plus-bin-0.13
index 5455626fffd8..c50e75b369fc 100644
--- a/metadata/md5-cache/app-crypt/oclhashcat-plus-bin-0.13
+++ b/metadata/md5-cache/app-crypt/oclhashcat-plus-bin-0.13
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=install test
 DEPEND=sys-libs/zlib video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-310.32 ) video_cards_fglrx? ( =x11-drivers/ati-drivers-13.1 ) app-arch/p7zip
 DESCRIPTION=An opencl multihash cracker
 EAPI=5
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=http://hashcat.net/files/oclHashcat-plus-0.13.7z
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=aa0a238ac7ba48c43dd3c7c7e07c9b3c
+_md5_=450512e7c525c2cbf9c8aacf376c7cbb
diff --git a/metadata/md5-cache/app-crypt/oclhashcat-plus-bin-0.14 b/metadata/md5-cache/app-crypt/oclhashcat-plus-bin-0.14
new file mode 100644
index 000000000000..ac9e1b1b25e4
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/oclhashcat-plus-bin-0.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install preinst test
+DEPEND=sys-libs/zlib video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-310.32 ) video_cards_fglrx? ( =x11-drivers/ati-drivers-13.1 ) app-arch/p7zip
+DESCRIPTION=An opencl multihash cracker
+EAPI=5
+HOMEPAGE=http://hashcat.net/oclhashcat-plus/
+IUSE=virtualcl video_cards_fglrx video_cards_nvidia
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=hashcat
+RDEPEND=sys-libs/zlib video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-310.32 ) video_cards_fglrx? ( =x11-drivers/ati-drivers-13.1 )
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://hashcat.net/files/oclHashcat-plus-0.14.7z
+_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d029b3aa887af9ba526f95e2080ca5bf
diff --git a/metadata/md5-cache/app-crypt/onak-0.3.7 b/metadata/md5-cache/app-crypt/onak-0.3.7
index 54fcb1efe6cf..1753777f7781 100644
--- a/metadata/md5-cache/app-crypt/onak-0.3.7
+++ b/metadata/md5-cache/app-crypt/onak-0.3.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=berkdb? ( >=sys-libs/db-4 ) postgres? ( dev-db/postgresql-server ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=berkdb? ( >=sys-libs/db-4 ) postgres? ( dev-db/postgresql-server ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=onak is an OpenPGP keyserver
 EAPI=2
 HOMEPAGE=http://www.earth.li/projectpurple/progs/onak.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=berkdb? ( >=sys-libs/db-4 ) postgres? ( dev-db/postgresql-server )
 SLOT=0
 SRC_URI=http://www.earth.li/projectpurple/files/onak-0.3.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8f752429bc10f884625c63af76c2328e
diff --git a/metadata/md5-cache/app-crypt/onak-0.4.0 b/metadata/md5-cache/app-crypt/onak-0.4.0
index b81c951ad0f9..184748550100 100644
--- a/metadata/md5-cache/app-crypt/onak-0.4.0
+++ b/metadata/md5-cache/app-crypt/onak-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=berkdb? ( >=sys-libs/db-4 ) postgres? ( dev-db/postgresql-server ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=berkdb? ( >=sys-libs/db-4 ) postgres? ( dev-db/postgresql-server ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=onak is an OpenPGP keyserver
 EAPI=2
 HOMEPAGE=http://www.earth.li/projectpurple/progs/onak.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=berkdb? ( >=sys-libs/db-4 ) postgres? ( dev-db/postgresql-server )
 SLOT=0
 SRC_URI=http://www.earth.li/projectpurple/files/onak-0.4.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1bd04a932e011d3f8aa30882837d1e1a
diff --git a/metadata/md5-cache/app-crypt/opencdk-0.6.6 b/metadata/md5-cache/app-crypt/opencdk-0.6.6
index b742c6131175..0702a3f119e8 100644
--- a/metadata/md5-cache/app-crypt/opencdk-0.6.6
+++ b/metadata/md5-cache/app-crypt/opencdk-0.6.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=>=dev-libs/libgcrypt-1.2.0 >=dev-lang/perl-5.6 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libgcrypt-1.2.0 >=dev-lang/perl-5.6 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open Crypto Development Kit for basic OpenPGP message manipulation
 HOMEPAGE=http://www.gnutls.org/
 IUSE=doc test
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libgcrypt-1.2.0
 SLOT=0
 SRC_URI=ftp://ftp.gnutls.org/pub/gnutls/opencdk/opencdk-0.6.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=4d677cd00ddc1f9dc1e4b644cf44d832
diff --git a/metadata/md5-cache/app-crypt/p11-kit-0.12 b/metadata/md5-cache/app-crypt/p11-kit-0.12
index 3b7e3a9e5504..a86f5e054a91 100644
--- a/metadata/md5-cache/app-crypt/p11-kit-0.12
+++ b/metadata/md5-cache/app-crypt/p11-kit-0.12
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://p11-glue.freedesktop.org/releases/p11-kit-0.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2d93cbd28476824228dc2d75c3bc58e2
diff --git a/metadata/md5-cache/app-crypt/p11-kit-0.13 b/metadata/md5-cache/app-crypt/p11-kit-0.13
index 71aeb4faef11..eb74661075fc 100644
--- a/metadata/md5-cache/app-crypt/p11-kit-0.13
+++ b/metadata/md5-cache/app-crypt/p11-kit-0.13
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://p11-glue.freedesktop.org/releases/p11-kit-0.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=404da3f582287133d497a3f789ceb773
diff --git a/metadata/md5-cache/app-crypt/p11-kit-0.14 b/metadata/md5-cache/app-crypt/p11-kit-0.14
index 7210cb4d6d08..c3a8099c13a4 100644
--- a/metadata/md5-cache/app-crypt/p11-kit-0.14
+++ b/metadata/md5-cache/app-crypt/p11-kit-0.14
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://p11-glue.freedesktop.org/releases/p11-kit-0.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9f5002981a82f6f70238ad039be09f82
diff --git a/metadata/md5-cache/app-crypt/scute-1.4.0 b/metadata/md5-cache/app-crypt/scute-1.4.0
index 589ad3250a1f..4dfa83df38d1 100644
--- a/metadata/md5-cache/app-crypt/scute-1.4.0
+++ b/metadata/md5-cache/app-crypt/scute-1.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A PKCS #11 module for OpenPGP smartcards
 EAPI=4
 HOMEPAGE=http://www.scute.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=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]
 SLOT=0
 SRC_URI=ftp://ftp.gnupg.org/gcrypt/scute/scute-1.4.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=03437ab2ccf71f6eb41a8c65ebf0b8dd
diff --git a/metadata/md5-cache/app-crypt/shishi-1.0.1 b/metadata/md5-cache/app-crypt/shishi-1.0.1
index 9eb4c29ebbf0..4d7ec5ffafe3 100644
--- a/metadata/md5-cache/app-crypt/shishi-1.0.1
+++ b/metadata/md5-cache/app-crypt/shishi-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free implementation of the Kerberos 5 network security system
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/shishi/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) dev-libs/libtasn1 dev-libs/libgcrypt dev-libs/libgpg-error virtual/libiconv virtual/libintl
 SLOT=0
 SRC_URI=mirror://gnu/shishi/shishi-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5bad0e1e1d50827028a733bcadd16ede
diff --git a/metadata/md5-cache/app-crypt/shishi-1.0.1-r1 b/metadata/md5-cache/app-crypt/shishi-1.0.1-r1
index 316393548f79..73d79329c1cc 100644
--- a/metadata/md5-cache/app-crypt/shishi-1.0.1-r1
+++ b/metadata/md5-cache/app-crypt/shishi-1.0.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free implementation of the Kerberos 5 network security system
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/shishi/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) dev-libs/libtasn1 dev-libs/libgcrypt dev-libs/libgpg-error virtual/libiconv virtual/libintl
 SLOT=0
 SRC_URI=mirror://gnu/shishi/shishi-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=df6f0ffa3c329f1549d2ca704f4f6b58
diff --git a/metadata/md5-cache/app-crypt/shishi-1.0.1-r2 b/metadata/md5-cache/app-crypt/shishi-1.0.1-r2
index 1f6c638eaba8..6f1d6cdf4577 100644
--- a/metadata/md5-cache/app-crypt/shishi-1.0.1-r2
+++ b/metadata/md5-cache/app-crypt/shishi-1.0.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free implementation of the Kerberos 5 network security system
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/shishi/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) dev-libs/libtasn1 dev-libs/libgcrypt dev-libs/libgpg-error virtual/libiconv virtual/libintl
 SLOT=0
 SRC_URI=mirror://gnu/shishi/shishi-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=56bdc3c13e3e4f4ec5c180f6abecc2a1
diff --git a/metadata/md5-cache/app-crypt/shishi-1.0.2 b/metadata/md5-cache/app-crypt/shishi-1.0.2
index dd78fce18259..08bdc5178997 100644
--- a/metadata/md5-cache/app-crypt/shishi-1.0.2
+++ b/metadata/md5-cache/app-crypt/shishi-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free implementation of the Kerberos 5 network security system
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/shishi/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) dev-libs/libtasn1 dev-libs/libgcrypt dev-libs/libgpg-error virtual/libiconv virtual/libintl
 SLOT=0
 SRC_URI=mirror://gnu/shishi/shishi-1.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1772cf844fd84461ed7a6adfbd71ff93
diff --git a/metadata/md5-cache/app-crypt/stan-0.4.1 b/metadata/md5-cache/app-crypt/stan-0.4.1
index 8ac28f46da12..43735fea3c02 100644
--- a/metadata/md5-cache/app-crypt/stan-0.4.1
+++ b/metadata/md5-cache/app-crypt/stan-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Stan is a console application that analyzes binary streams and calculates statistical information.
 EAPI=2
 HOMEPAGE=http://www.roqe.org/stan/
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.roqe.org/stan/stan-0.4.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=34749f877c25175bef3c596fa3d6f0f8
diff --git a/metadata/md5-cache/app-crypt/tpm-tools-1.3.5 b/metadata/md5-cache/app-crypt/tpm-tools-1.3.5
index 0ead8a78ea60..bc21621466ec 100644
--- a/metadata/md5-cache/app-crypt/tpm-tools-1.3.5
+++ b/metadata/md5-cache/app-crypt/tpm-tools-1.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=app-crypt/trousers-0.3.0 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-crypt/trousers-0.3.0 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=TrouSerS' support tools for the Trusted Platform Modules
 EAPI=2
 HOMEPAGE=http://trousers.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=app-crypt/trousers-0.3.0 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/tpm-tools-1.3.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=f04a5724710d985352147e4900b2a03f
diff --git a/metadata/md5-cache/app-crypt/tpm-tools-1.3.5-r1 b/metadata/md5-cache/app-crypt/tpm-tools-1.3.5-r1
index f3f4c4a34b0a..694a5f5571c5 100644
--- a/metadata/md5-cache/app-crypt/tpm-tools-1.3.5-r1
+++ b/metadata/md5-cache/app-crypt/tpm-tools-1.3.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=app-crypt/trousers-0.3.0 dev-libs/openssl pkcs11? ( dev-libs/opencryptoki ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-crypt/trousers-0.3.0 dev-libs/openssl pkcs11? ( dev-libs/opencryptoki ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=TrouSerS' support tools for the Trusted Platform Modules
 EAPI=4
 HOMEPAGE=http://trousers.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=app-crypt/trousers-0.3.0 dev-libs/openssl pkcs11? ( dev-libs/opencryptoki ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/tpm-tools-1.3.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=779207811fb956aba416e50dfb3db5cb
diff --git a/metadata/md5-cache/app-crypt/trousers-0.3.10 b/metadata/md5-cache/app-crypt/trousers-0.3.10
index da7f6d5cfd24..c18626e548b1 100644
--- a/metadata/md5-cache/app-crypt/trousers-0.3.10
+++ b/metadata/md5-cache/app-crypt/trousers-0.3.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2 >=dev-libs/openssl-0.9.7:0 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2 >=dev-libs/openssl-0.9.7:0 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=An open-source TCG Software Stack (TSS) v1.1 implementation
 EAPI=4
 HOMEPAGE=http://trousers.sf.net
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=dev-libs/glib-2 >=dev-libs/openssl-0.9.7:0
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/trousers-0.3.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=99d169f20919e3ff2bcbb1708d3ff316
diff --git a/metadata/md5-cache/app-crypt/trousers-0.3.6 b/metadata/md5-cache/app-crypt/trousers-0.3.6
index cd9127ecf60b..ef2e142bef28 100644
--- a/metadata/md5-cache/app-crypt/trousers-0.3.6
+++ b/metadata/md5-cache/app-crypt/trousers-0.3.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2 >=dev-libs/openssl-0.9.7 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2 >=dev-libs/openssl-0.9.7 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An open-source TCG Software Stack (TSS) v1.1 implementation
 EAPI=3
 HOMEPAGE=http://trousers.sf.net
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=dev-libs/glib-2 >=dev-libs/openssl-0.9.7
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/trousers-0.3.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=af102f63c1a1dc848a9555f6c1e80c76
diff --git a/metadata/md5-cache/app-crypt/trousers-0.3.6-r1 b/metadata/md5-cache/app-crypt/trousers-0.3.6-r1
index 032be7c738d3..bc904ef6151a 100644
--- a/metadata/md5-cache/app-crypt/trousers-0.3.6-r1
+++ b/metadata/md5-cache/app-crypt/trousers-0.3.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2 >=dev-libs/openssl-0.9.7:0 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2 >=dev-libs/openssl-0.9.7:0 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=An open-source TCG Software Stack (TSS) v1.1 implementation
 EAPI=3
 HOMEPAGE=http://trousers.sf.net
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=dev-libs/glib-2 >=dev-libs/openssl-0.9.7:0
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/trousers-0.3.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ed10644287ebe518ac191598ae3a6d10
diff --git a/metadata/md5-cache/app-dicts/gjiten-2.6-r1 b/metadata/md5-cache/app-dicts/gjiten-2.6-r1
index 8c06ce0cd84c..71ab5ad13c63 100644
--- a/metadata/md5-cache/app-dicts/gjiten-2.6-r1
+++ b/metadata/md5-cache/app-dicts/gjiten-2.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A Japanese dictionary program for Gnome
 EAPI=2
 HOMEPAGE=http://gjiten.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/libgnome-2.2 >=gnome-base/libgnomeui-2.2 >=gnome-base/libgl
 RESTRICT=test
 SLOT=0
 SRC_URI=http://gjiten.sourceforge.net/gjiten-2.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=875bc82c045c8d7c1ac7ed07e352712d
diff --git a/metadata/md5-cache/app-dicts/gjiten-2.6-r2 b/metadata/md5-cache/app-dicts/gjiten-2.6-r2
index b27e08ba0c31..9e5d4a2d0e8b 100644
--- a/metadata/md5-cache/app-dicts/gjiten-2.6-r2
+++ b/metadata/md5-cache/app-dicts/gjiten-2.6-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A Japanese dictionary program for Gnome
 EAPI=2
 HOMEPAGE=http://gjiten.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/libgnome-2.2 >=gnome-base/libgnomeui-2.2 >=gnome-base/libgl
 RESTRICT=test
 SLOT=0
 SRC_URI=http://gjiten.sourceforge.net/gjiten-2.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=18621253c625fc1d03d5f9bbb0a1309c
diff --git a/metadata/md5-cache/app-dicts/ipadic-2.7.0-r1 b/metadata/md5-cache/app-dicts/ipadic-2.7.0-r1
index d36896c4efc2..d4b432da6630 100644
--- a/metadata/md5-cache/app-dicts/ipadic-2.7.0-r1
+++ b/metadata/md5-cache/app-dicts/ipadic-2.7.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=app-text/chasen-2.3.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-text/chasen-2.3.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Japanese dictionary for ChaSen
 EAPI=2
 HOMEPAGE=http://chasen.aist-nara.ac.jp/chasen/distribution.html.en
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=ipadic
 SLOT=0
 SRC_URI=http://chasen.aist-nara.ac.jp/stable/ipadic/ipadic-2.7.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aff9e0b4b849b2da0984c12ac84dec11
diff --git a/metadata/md5-cache/app-dicts/ipadic-2.7.0-r2 b/metadata/md5-cache/app-dicts/ipadic-2.7.0-r2
index e18e2ea56617..b228d4c3b574 100644
--- a/metadata/md5-cache/app-dicts/ipadic-2.7.0-r2
+++ b/metadata/md5-cache/app-dicts/ipadic-2.7.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=app-text/chasen-2.3.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-text/chasen-2.3.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Japanese dictionary for ChaSen
 EAPI=4
 HOMEPAGE=http://sourceforge.jp/projects/ipadic/
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=ipadic
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/ipadic/24435/ipadic-2.7.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f3da694363612dfe48dffe1a5c88b21d
diff --git a/metadata/md5-cache/app-dicts/wordnet-3.0-r2 b/metadata/md5-cache/app-dicts/wordnet-3.0-r2
index da7c3a82b0fa..07a5afefc457 100644
--- a/metadata/md5-cache/app-dicts/wordnet-3.0-r2
+++ b/metadata/md5-cache/app-dicts/wordnet-3.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-lang/tcl dev-lang/tk || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/tcl dev-lang/tk || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A lexical database for the English language
 HOMEPAGE=http://wordnet.princeton.edu/
 IUSE=doc
@@ -8,5 +8,5 @@ LICENSE=Princeton
 RDEPEND=dev-lang/tcl dev-lang/tk
 SLOT=0
 SRC_URI=ftp://ftp.cogsci.princeton.edu/pub/wordnet/3.0/WordNet-3.0.tar.gz mirror://gentoo/wordnet-3.0-patchset-1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c91514a8c73280687a1ee4229252155e
diff --git a/metadata/md5-cache/app-dicts/wordnet-3.0-r3 b/metadata/md5-cache/app-dicts/wordnet-3.0-r3
index 4cbdb2b5fb54..5f4a67f209c0 100644
--- a/metadata/md5-cache/app-dicts/wordnet-3.0-r3
+++ b/metadata/md5-cache/app-dicts/wordnet-3.0-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/tcl dev-lang/tk || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/tcl dev-lang/tk || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A lexical database for the English language
 EAPI=3
 HOMEPAGE=http://wordnet.princeton.edu/
@@ -9,5 +9,5 @@ LICENSE=Princeton
 RDEPEND=dev-lang/tcl dev-lang/tk
 SLOT=0
 SRC_URI=ftp://ftp.cogsci.princeton.edu/pub/wordnet/3.0/WordNet-3.0.tar.gz mirror://gentoo/wordnet-3.0-patchset-1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f6da6c6cddb8862d5a0ac023af5f8485
diff --git a/metadata/md5-cache/app-editors/adie-1.6.36 b/metadata/md5-cache/app-editors/adie-1.6.36
index b03347aac16b..f76aa7e1b5a1 100644
--- a/metadata/md5-cache/app-editors/adie-1.6.36
+++ b/metadata/md5-cache/app-editors/adie-1.6.36
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=x11-libs/fox:1.6 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+DEPEND=x11-libs/fox:1.6 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 DESCRIPTION=Text editor based on the FOX Toolkit
 EAPI=1
 HOMEPAGE=http://www.fox-toolkit.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/fox:1.6
 SLOT=0
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.6.36.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f4a03804165c3c8d1b2653b353d38a1a
diff --git a/metadata/md5-cache/app-editors/adie-1.7.32 b/metadata/md5-cache/app-editors/adie-1.7.32
index 1b91006de75a..c5225e42360f 100644
--- a/metadata/md5-cache/app-editors/adie-1.7.32
+++ b/metadata/md5-cache/app-editors/adie-1.7.32
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=~x11-libs/fox-1.7.32 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+DEPEND=~x11-libs/fox-1.7.32 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 DESCRIPTION=Text editor based on the FOX Toolkit
 EAPI=4
 HOMEPAGE=http://www.fox-toolkit.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=~x11-libs/fox-1.7.32
 SLOT=0
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.32.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=da6e58a73ac16d8bac5a1dcc20903f9b
diff --git a/metadata/md5-cache/app-editors/adie-1.7.33 b/metadata/md5-cache/app-editors/adie-1.7.33
index c6a6fe098f99..0845537d58e8 100644
--- a/metadata/md5-cache/app-editors/adie-1.7.33
+++ b/metadata/md5-cache/app-editors/adie-1.7.33
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=~x11-libs/fox-1.7.33 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+DEPEND=~x11-libs/fox-1.7.33 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 DESCRIPTION=Text editor based on the FOX Toolkit
 EAPI=4
 HOMEPAGE=http://www.fox-toolkit.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=~x11-libs/fox-1.7.33
 SLOT=0
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.33.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e1e1085f2c1fb99d842f4d40a2c449f2
diff --git a/metadata/md5-cache/app-editors/adie-1.7.37 b/metadata/md5-cache/app-editors/adie-1.7.37
index 9ca7037f0b57..0fcadc1784df 100644
--- a/metadata/md5-cache/app-editors/adie-1.7.37
+++ b/metadata/md5-cache/app-editors/adie-1.7.37
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=~x11-libs/fox-1.7.37 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+DEPEND=~x11-libs/fox-1.7.37 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 DESCRIPTION=Text editor based on the FOX Toolkit
 EAPI=4
 HOMEPAGE=http://www.fox-toolkit.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=~x11-libs/fox-1.7.37
 SLOT=0
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.37.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6fbaa58a675e6b168e198aef73fd72fe
diff --git a/metadata/md5-cache/app-editors/amyedit-1.0-r2 b/metadata/md5-cache/app-editors/amyedit-1.0-r2
index 5f3ca70ae2d6..8b9e28af6fff 100644
--- a/metadata/md5-cache/app-editors/amyedit-1.0-r2
+++ b/metadata/md5-cache/app-editors/amyedit-1.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=AmyEdit is a LaTeX editor
 EAPI=3
 HOMEPAGE=http://amyedit.sf.net
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://sourceforge/amyedit/amyedit-1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=320d94ed8f6f2367e59037f8096396d7
diff --git a/metadata/md5-cache/app-editors/cooledit-3.17.17-r1 b/metadata/md5-cache/app-editors/cooledit-3.17.17-r1
index 2d3291ef960d..da43b42cc8e1 100644
--- a/metadata/md5-cache/app-editors/cooledit-3.17.17-r1
+++ b/metadata/md5-cache/app-editors/cooledit-3.17.17-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXau x11-libs/libXpm || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXau x11-libs/libXpm || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Cooledit is a full featured multiple window text editor
 HOMEPAGE=http://freshmeat.net/projects/cooledit/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXau
 SLOT=0
 SRC_URI=ftp://ftp.ibiblio.org/pub/Linux/apps/editors/X/cooledit/cooledit-3.17.17.tar.gz http://dev.gentoo.org/~hwoarang/distfiles/cooledit-3.17.17-nopython.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=71a0ba6b1a3b70e8208f7d8e9b9a0d10
diff --git a/metadata/md5-cache/app-editors/emacs-21.4-r24 b/metadata/md5-cache/app-editors/emacs-21.4-r24
index 87fa366be195..443c3fedee15 100644
--- a/metadata/md5-cache/app-editors/emacs-21.4-r24
+++ b/metadata/md5-cache/app-editors/emacs-21.4-r24
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.1+ BSD HPND MIT
 RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 X? ( x11-libs/libXext x11-libs/libICE x11-libs/libSM x11-libs/libXmu x11-libs/libXpm x11-misc/xbitmaps >=media-libs/giflib-4.1.0.1b virtual/jpeg >=media-libs/tiff-3.5.5-r3 >=media-libs/libpng-1.4:0= Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( motif? ( >=x11-libs/motif-2.3:0 ) ) ) >=app-emacs/emacs-common-gentoo-1.3[X?] sendmail? ( virtual/mta )
 SLOT=21
 SRC_URI=mirror://gnu/emacs/emacs-21.4a.tar.gz mirror://gentoo/emacs-21.4-patches-13.tar.bz2 leim? ( mirror://gnu/emacs/leim-21.4.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7fc495eb47576c6fd7fcf60cb5da8f06
diff --git a/metadata/md5-cache/app-editors/emacs-22.3-r10 b/metadata/md5-cache/app-editors/emacs-22.3-r10
index b5ecda441323..57e5a2a99180 100644
--- a/metadata/md5-cache/app-editors/emacs-22.3-r10
+++ b/metadata/md5-cache/app-editors/emacs-22.3-r10
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.2+ BSD HPND MIT
 RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?] net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0= ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( motif? ( >=x11-libs/motif-2.3:0 ) ) ) )
 SLOT=22
 SRC_URI=mirror://gnu/emacs/emacs-22.3.tar.gz mirror://gentoo/emacs-22.3-patches-8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=74210179028deb0dc9833cbb8be355d4
diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r6 b/metadata/md5-cache/app-editors/emacs-23.4-r6
index e266034893f6..607ebce4f883 100644
--- a/metadata/md5-cache/app-editors/emacs-23.4-r6
+++ b/metadata/md5-cache/app-editors/emacs-23.4-r6
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 >=app-emacs/emacs-common-
 REQUIRED_USE=?? ( aqua X )
 SLOT=23
 SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 mirror://gentoo/emacs-23.4-patches-8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c50dab9c2aae36ee0df7b53303a09635
diff --git a/metadata/md5-cache/app-editors/emacs-24.2-r1 b/metadata/md5-cache/app-editors/emacs-24.2-r1
index 0aebc2d8e00c..d038cee75b5b 100644
--- a/metadata/md5-cache/app-editors/emacs-24.2-r1
+++ b/metadata/md5-cache/app-editors/emacs-24.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?] 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/motif-2.3:0 ) ) ) ) ) app-arch/xz-utils alsa? ( virtual/pkgconfig ) dbus? ( virtual/pkgconfig ) gnutls? ( virtual/pkgconfig ) libxml2? ( virtual/pkgconfig ) X? ( virtual/pkgconfig ) gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/paxctl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?] 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/motif-2.3:0 ) ) ) ) ) app-arch/xz-utils alsa? ( virtual/pkgconfig ) dbus? ( virtual/pkgconfig ) gnutls? ( virtual/pkgconfig ) libxml2? ( virtual/pkgconfig ) X? ( virtual/pkgconfig ) gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/paxctl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/emacs/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 >=app-emacs/emacs-common-
 REQUIRED_USE=aqua? ( !X )
 SLOT=24
 SRC_URI=mirror://gnu/emacs/emacs-24.2.tar.xz mirror://gentoo/emacs-24.2-patches-3.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=03339c5111a3308987ac82d9e5eb86ab
diff --git a/metadata/md5-cache/app-editors/emacs-24.3-r1 b/metadata/md5-cache/app-editors/emacs-24.3-r1
index 026dd859c9f8..4b385ce395e2 100644
--- a/metadata/md5-cache/app-editors/emacs-24.3-r1
+++ b/metadata/md5-cache/app-editors/emacs-24.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?] 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? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) app-arch/xz-utils alsa? ( virtual/pkgconfig ) dbus? ( virtual/pkgconfig ) gnutls? ( virtual/pkgconfig ) libxml2? ( virtual/pkgconfig ) X? ( virtual/pkgconfig ) gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/paxctl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?] 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? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) app-arch/xz-utils alsa? ( virtual/pkgconfig ) dbus? ( virtual/pkgconfig ) gnutls? ( virtual/pkgconfig ) libxml2? ( virtual/pkgconfig ) X? ( virtual/pkgconfig ) gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/paxctl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/emacs/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 >=app-emacs/emacs-common-
 REQUIRED_USE=?? ( aqua X )
 SLOT=24
 SRC_URI=mirror://gnu/emacs/emacs-24.3.tar.xz mirror://gentoo/emacs-24.3-patches-1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ff2c1a43b52df2b0a3b06e19a0e827a6
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-24.3.9999 b/metadata/md5-cache/app-editors/emacs-vcs-24.3.9999
index 61ea3d9db309..53cdabe4061b 100644
--- a/metadata/md5-cache/app-editors/emacs-vcs-24.3.9999
+++ b/metadata/md5-cache/app-editors/emacs-vcs-24.3.9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?] 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 ) acl? ( virtual/acl ) 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? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) alsa? ( virtual/pkgconfig ) dbus? ( virtual/pkgconfig ) gnutls? ( virtual/pkgconfig ) libxml2? ( virtual/pkgconfig ) X? ( virtual/pkgconfig ) gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/paxctl ) sys-apps/texinfo || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/bzr-2.0.1
+DEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?] 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 ) acl? ( virtual/acl ) 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? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) alsa? ( virtual/pkgconfig ) dbus? ( virtual/pkgconfig ) gnutls? ( virtual/pkgconfig ) libxml2? ( virtual/pkgconfig ) X? ( virtual/pkgconfig ) gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/paxctl ) sys-apps/texinfo || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/bzr-2.0.1
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/emacs/
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?] 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 ) acl? ( virtual/acl ) 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? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) )
 REQUIRED_USE=?? ( aqua X )
 SLOT=24
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bzr	876798528c0cd872742b74bf784738cf	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bzr	876798528c0cd872742b74bf784738cf	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=18ae1a087475db44330488b8eedd8c0b
diff --git a/metadata/md5-cache/app-editors/gphpedit-0.9.98_rc1 b/metadata/md5-cache/app-editors/gphpedit-0.9.98_rc1
index 8bfd8df16cc1..a09b27806599 100644
--- a/metadata/md5-cache/app-editors/gphpedit-0.9.98_rc1
+++ b/metadata/md5-cache/app-editors/gphpedit-0.9.98_rc1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-libs/gtk+-2.0:2 >=dev-libs/glib-2.0:2 gnome-base/gconf:2 >=gnome-base/libgnomeui-2.0 net-libs/webkit-gtk:2 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.0:2 >=dev-libs/glib-2.0:2 gnome-base/gconf:2 >=gnome-base/libgnomeui-2.0 net-libs/webkit-gtk:2 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Gnome2 PHP/HTML source editor
 EAPI=4
 HOMEPAGE=http://www.gphpedit.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.0:2 >=dev-libs/glib-2.0:2 gnome-base/gconf:2 >=gnome-base/libgnomeui-2.0 net-libs/webkit-gtk:2
 SLOT=0
 SRC_URI=http://www.gphpedit.org/sites/default/files/gphpedit-0.9.98RC1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9667a1ef8aaada2d590953aa82735794
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.266 b/metadata/md5-cache/app-editors/gvim-7.3.266
index 9f04e02259b5..bc756277507d 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.266
+++ b/metadata/md5-cache/app-editors/gvim-7.3.266
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.266 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.266.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=6375142621a9c42b50380aead53f2b39
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.409 b/metadata/md5-cache/app-editors/gvim-7.3.409
index 8eabb8955fc0..bf819e8b6613 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.409
+++ b/metadata/md5-cache/app-editors/gvim-7.3.409
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.409 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.409.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=5a469bebffb1ad4260769e190459910a
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.444 b/metadata/md5-cache/app-editors/gvim-7.3.444
index bb74659107a8..05e6cc8d0e8d 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.444
+++ b/metadata/md5-cache/app-editors/gvim-7.3.444
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.444 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.444.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=86fb332d10a61783fc2b4dca8251103c
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.456 b/metadata/md5-cache/app-editors/gvim-7.3.456
index 1732cefa60e8..05a1b983f66b 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.456
+++ b/metadata/md5-cache/app-editors/gvim-7.3.456
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.456 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.456.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=413c24a82fc216011a90c6c50fc08cef
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.462 b/metadata/md5-cache/app-editors/gvim-7.3.462
index f395fa7db547..0ebec0ee9c1a 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.462
+++ b/metadata/md5-cache/app-editors/gvim-7.3.462
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.462 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.462.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=542809498389ddb7bd65c587152bc0d6
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.487 b/metadata/md5-cache/app-editors/gvim-7.3.487
index b9b06197a5a2..deb1c921ac56 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.487
+++ b/metadata/md5-cache/app-editors/gvim-7.3.487
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.487 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.487.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=9a036cb4fb1a1119df1e8e02781fa6c3
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.498 b/metadata/md5-cache/app-editors/gvim-7.3.498
index c4f1e741fcdd..6ab184ae07a8 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.498
+++ b/metadata/md5-cache/app-editors/gvim-7.3.498
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.498 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.498.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=d5a684704408fd2aeac91f882a3d4acb
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.502 b/metadata/md5-cache/app-editors/gvim-7.3.502
index 08c3cb86d7d7..190437437492 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.502
+++ b/metadata/md5-cache/app-editors/gvim-7.3.502
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.502 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.502.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=268deead4078b6065d35848f29e5d1c9
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.515 b/metadata/md5-cache/app-editors/gvim-7.3.515
index 6910a54b8d27..aca07732e287 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.515
+++ b/metadata/md5-cache/app-editors/gvim-7.3.515
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.515 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.515.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=7e6da8a90d99900bb3325df5e6dff77d
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.537 b/metadata/md5-cache/app-editors/gvim-7.3.537
index 072fa3a297ed..37fbf98233d9 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.537
+++ b/metadata/md5-cache/app-editors/gvim-7.3.537
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.537 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.537.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=5599e55d655ed3c91b506ccd1190455b
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.556 b/metadata/md5-cache/app-editors/gvim-7.3.556
index 40f6bb991684..950edc3a6786 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.556
+++ b/metadata/md5-cache/app-editors/gvim-7.3.556
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.556 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.556.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=2d344e88f1b1d7213406d883e2c55c10
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.566 b/metadata/md5-cache/app-editors/gvim-7.3.566
index 7d3bfaaf3fe7..4480579f45a8 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.566
+++ b/metadata/md5-cache/app-editors/gvim-7.3.566
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.566 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.566.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=33181791600b7c69cea900671cf263d2
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.600 b/metadata/md5-cache/app-editors/gvim-7.3.600
index feaf3c829b94..38717f8ec49a 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.600
+++ b/metadata/md5-cache/app-editors/gvim-7.3.600
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.600 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.600.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=7731964d53036a23949c75c3180f3aa5
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.646 b/metadata/md5-cache/app-editors/gvim-7.3.646
index 331a75481e50..8f90f24f5954 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.646
+++ b/metadata/md5-cache/app-editors/gvim-7.3.646
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.646 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.646.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=256eaae11927cffcaf7c5e8f41052a83
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.762 b/metadata/md5-cache/app-editors/gvim-7.3.762
index f81d29805976..d69c5e49c8bf 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.762
+++ b/metadata/md5-cache/app-editors/gvim-7.3.762
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.762 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.762.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=cc038c46cba84e4ebabe9c5244c2404a
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.905 b/metadata/md5-cache/app-editors/gvim-7.3.905
index 85ce6acd09dd..45586be17dd1 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.905
+++ b/metadata/md5-cache/app-editors/gvim-7.3.905
@@ -1,14 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=app-admin/eselect-vi-1.1 sys-apps/gawk >=sys-apps/sed-4 sys-devel/autoconf >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[threads] ) python_targets_python2_6? ( dev-lang/python:2.6[threads] ) python_targets_python2_7? ( dev-lang/python:2.7[threads] ) python_targets_python3_1? ( dev-lang/python:3.1[threads] ) python_targets_python3_2? ( dev-lang/python:3.2[threads] ) python_targets_python3_3? ( dev-lang/python:3.3[threads] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) dev-util/ctags !aqua? ( gtk? ( virtual/pkgconfig ) )
+DEPEND=>=app-admin/eselect-vi-1.1 sys-apps/gawk >=sys-apps/sed-4 sys-devel/autoconf >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5[threads] ) python_single_target_python2_6? ( dev-lang/python:2.6[threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads] ) python_single_target_python3_1? ( dev-lang/python:3.1[threads] ) python_single_target_python3_2? ( dev-lang/python:3.2[threads] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) dev-util/ctags !aqua? ( gtk? ( virtual/pkgconfig ) )
 DESCRIPTION=GUI version of the Vim text editor
 EAPI=5
 HOMEPAGE=http://www.vim.org/
-IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 nls acl cscope debug gpm perl python ruby aqua gnome gtk motif neXt netbeans
+IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7 python_single_target_python3_1 python_single_target_python3_2 python_single_target_python3_3 nls acl cscope debug gpm perl python ruby aqua gnome gtk motif neXt netbeans
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=vim
-RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[threads] ) python_targets_python2_6? ( dev-lang/python:2.6[threads] ) python_targets_python2_7? ( dev-lang/python:2.7[threads] ) python_targets_python3_1? ( dev-lang/python:3.1[threads] ) python_targets_python3_2? ( dev-lang/python:3.2[threads] ) python_targets_python3_3? ( dev-lang/python:3.3[threads] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.905 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
-REQUIRED_USE=python? ( || ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 ) ?? ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 ) ?? ( python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 ) )
+RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5[threads] ) python_single_target_python2_6? ( dev-lang/python:2.6[threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads] ) python_single_target_python3_1? ( dev-lang/python:3.1[threads] ) python_single_target_python3_2? ( dev-lang/python:3.2[threads] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.905 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.905.patch.bz2 http://dev.gentoo.org/~radhermit/vim/vim-patches-7.3.905.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=6871dcd8ce30cf7d762f2288c31741ba
diff --git a/metadata/md5-cache/app-editors/mlview-0.9.0-r1 b/metadata/md5-cache/app-editors/mlview-0.9.0-r1
index e3b1c7da0b9a..6c54a6851264 100644
--- a/metadata/md5-cache/app-editors/mlview-0.9.0-r1
+++ b/metadata/md5-cache/app-editors/mlview-0.9.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 virtual/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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 virtual/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=XML editor for the GNOME environment
 EAPI=2
 HOMEPAGE=http://www.freespiders.org/projects/gmlview/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://gnome/sources/mlview/0.9/mlview-0.9.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5ab40a410a5933172f8670c87165fb26
diff --git a/metadata/md5-cache/app-editors/mousepad-0.3.0 b/metadata/md5-cache/app-editors/mousepad-0.3.0
index d04fda1be677..43696f1357e5 100644
--- a/metadata/md5-cache/app-editors/mousepad-0.3.0
+++ b/metadata/md5-cache/app-editors/mousepad-0.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.12 >=x11-libs/gtk+-2.20:2 x11-libs/gtksourceview:2.0 dbus? ( >=dev-libs/dbus-glib-0.100 )
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/mousepad/0.3/mousepad-0.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=a990f2c2cc4404029bc92f56e80943da
diff --git a/metadata/md5-cache/app-editors/nano-2.3.1-r1 b/metadata/md5-cache/app-editors/nano-2.3.1-r1
index e2d2117f5157..58ef1aeda4c1 100644
--- a/metadata/md5-cache/app-editors/nano-2.3.1-r1
+++ b/metadata/md5-cache/app-editors/nano-2.3.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=sys-libs/ncurses-5.9-r1[unicode?] nls? ( sys-devel/gettext ) !ncurses? ( slang? ( sys-libs/slang ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.9-r1[unicode?] nls? ( sys-devel/gettext ) !ncurses? ( slang? ( sys-libs/slang ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU GPL'd Pico clone with more functionality
 EAPI=3
 HOMEPAGE=http://www.nano-editor.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.9-r1[unicode?] nls? ( sys-devel/gettext ) !ncurses? ( slang? ( sys-libs/slang ) )
 SLOT=0
 SRC_URI=http://www.nano-editor.org/dist/v2.3/nano-2.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=86b4d590782eac22f92c2ff63fe9b0f5
diff --git a/metadata/md5-cache/app-editors/nano-2.3.1-r2 b/metadata/md5-cache/app-editors/nano-2.3.1-r2
index 2fea0e0ba3da..e050b8b75ec0 100644
--- a/metadata/md5-cache/app-editors/nano-2.3.1-r2
+++ b/metadata/md5-cache/app-editors/nano-2.3.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.9-r1[unicode?] magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.9-r1[unicode?] magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU GPL'd Pico clone with more functionality
 EAPI=3
 HOMEPAGE=http://www.nano-editor.org/ http://www.gentoo.org/doc/en/nano-basics-guide.xml
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.9-r1[unicode?] magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) )
 SLOT=0
 SRC_URI=http://www.nano-editor.org/dist/v2.3/nano-2.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1e5aedf2ced26de25938a3c41934f7db
diff --git a/metadata/md5-cache/app-editors/nano-2.3.2 b/metadata/md5-cache/app-editors/nano-2.3.2
index 3473b53b5e2d..29146cb9bb4a 100644
--- a/metadata/md5-cache/app-editors/nano-2.3.2
+++ b/metadata/md5-cache/app-editors/nano-2.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.9-r1[unicode?] magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.9-r1[unicode?] magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU GPL'd Pico clone with more functionality
 EAPI=3
 HOMEPAGE=http://www.nano-editor.org/ http://www.gentoo.org/doc/en/nano-basics-guide.xml
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.9-r1[unicode?] magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) )
 SLOT=0
 SRC_URI=http://www.nano-editor.org/dist/v2.3/nano-2.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9b22544578941fcb9eeeff961383e3c7
diff --git a/metadata/md5-cache/app-editors/nvi-1.81.6-r3 b/metadata/md5-cache/app-editors/nvi-1.81.6-r3
index 8949991b557f..ee998bc11652 100644
--- a/metadata/md5-cache/app-editors/nvi-1.81.6-r3
+++ b/metadata/md5-cache/app-editors/nvi-1.81.6-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=|| ( >=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Vi clone
 EAPI=1
 HOMEPAGE=https://sites.google.com/a/bostic.com/keithbostic/nvi
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=|| ( >=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
 SLOT=0
 SRC_URI=http://www.kotnet.org/~skimo/nvi/devel/nvi-1.81.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=36f2aa952641bfa2d18ea9a1385d0214
diff --git a/metadata/md5-cache/app-editors/vim-7.3.266 b/metadata/md5-cache/app-editors/vim-7.3.266
index 65593b3d6f0e..95b544d0cd85 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.266
+++ b/metadata/md5-cache/app-editors/vim-7.3.266
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.266 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.266.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=de62f056968408e8fb785b7b0c97e649
diff --git a/metadata/md5-cache/app-editors/vim-7.3.409 b/metadata/md5-cache/app-editors/vim-7.3.409
index e0e80c2b8913..d6f1e33f6288 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.409
+++ b/metadata/md5-cache/app-editors/vim-7.3.409
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.409 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.409.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=973bcc3a7990f954bff68f82a5b32461
diff --git a/metadata/md5-cache/app-editors/vim-7.3.444 b/metadata/md5-cache/app-editors/vim-7.3.444
index 763b8467b54b..39c536c92b2e 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.444
+++ b/metadata/md5-cache/app-editors/vim-7.3.444
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.444 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.444.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=851e37480b80e34bbb94d07fb3fe35f4
diff --git a/metadata/md5-cache/app-editors/vim-7.3.456 b/metadata/md5-cache/app-editors/vim-7.3.456
index 3517db868b20..bcd255a10e5e 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.456
+++ b/metadata/md5-cache/app-editors/vim-7.3.456
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.456 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.456.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=130f70c6fd25a4b421bb0de8b1def2c7
diff --git a/metadata/md5-cache/app-editors/vim-7.3.462 b/metadata/md5-cache/app-editors/vim-7.3.462
index c470668b1453..cc0fef88dd63 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.462
+++ b/metadata/md5-cache/app-editors/vim-7.3.462
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.462 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.462.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=ff9e64ff0d72b5cda2629f62a9a0012d
diff --git a/metadata/md5-cache/app-editors/vim-7.3.487 b/metadata/md5-cache/app-editors/vim-7.3.487
index 323497b9b106..8e7c780b72e7 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.487
+++ b/metadata/md5-cache/app-editors/vim-7.3.487
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.487 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.487.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=79800640a0ac220f66bc44994f1c06eb
diff --git a/metadata/md5-cache/app-editors/vim-7.3.498 b/metadata/md5-cache/app-editors/vim-7.3.498
index 673e4e753060..a0b1e2f5a9da 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.498
+++ b/metadata/md5-cache/app-editors/vim-7.3.498
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.498 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.498.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=abf370046d861f132a35d9c0e8afc0a3
diff --git a/metadata/md5-cache/app-editors/vim-7.3.502 b/metadata/md5-cache/app-editors/vim-7.3.502
index 2e77a02aae95..70e6c1fdea5c 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.502
+++ b/metadata/md5-cache/app-editors/vim-7.3.502
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.502 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.502.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=2f51f8669d329e773bc95e714fbbf133
diff --git a/metadata/md5-cache/app-editors/vim-7.3.515 b/metadata/md5-cache/app-editors/vim-7.3.515
index 174d072f6ec5..2f63b6b5ebc6 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.515
+++ b/metadata/md5-cache/app-editors/vim-7.3.515
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.515 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.515.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=16ebb54fed16a1d5fcf53ddd0ac1ceac
diff --git a/metadata/md5-cache/app-editors/vim-7.3.537 b/metadata/md5-cache/app-editors/vim-7.3.537
index 635be43c31af..75caeb612fe6 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.537
+++ b/metadata/md5-cache/app-editors/vim-7.3.537
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.537 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.537.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=b894a78e8e48eafbde6163fc8fb9a0e3
diff --git a/metadata/md5-cache/app-editors/vim-7.3.556 b/metadata/md5-cache/app-editors/vim-7.3.556
index 2699d144138a..b77046ce6809 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.556
+++ b/metadata/md5-cache/app-editors/vim-7.3.556
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.556 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.556.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=686b635f7964a5033a41dc62805e71ea
diff --git a/metadata/md5-cache/app-editors/vim-7.3.566 b/metadata/md5-cache/app-editors/vim-7.3.566
index be07b2d4a826..b8ad3a0bc4e9 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.566
+++ b/metadata/md5-cache/app-editors/vim-7.3.566
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.566 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.566.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=c013f8aba56bf91c1e3e88ae44f732b9
diff --git a/metadata/md5-cache/app-editors/vim-7.3.600 b/metadata/md5-cache/app-editors/vim-7.3.600
index 3630a04f532b..089cf63a4829 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.600
+++ b/metadata/md5-cache/app-editors/vim-7.3.600
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.600 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.600.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=1a989f9284a665cb196a514a8e168085
diff --git a/metadata/md5-cache/app-editors/vim-7.3.646 b/metadata/md5-cache/app-editors/vim-7.3.646
index 2fb753465257..0c54a7af7a0f 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.646
+++ b/metadata/md5-cache/app-editors/vim-7.3.646
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.646 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.646.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=00fa8f789dbad8a7e95a75c145fc83a9
diff --git a/metadata/md5-cache/app-editors/vim-7.3.762 b/metadata/md5-cache/app-editors/vim-7.3.762
index 1a4f914982fa..8f11b2b51dfb 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.762
+++ b/metadata/md5-cache/app-editors/vim-7.3.762
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.762 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.762.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=7b03dc8c36cba7860535c498925c4871
diff --git a/metadata/md5-cache/app-editors/vim-7.3.905 b/metadata/md5-cache/app-editors/vim-7.3.905
index b75f5b917ab8..043d737bdd53 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.905
+++ b/metadata/md5-cache/app-editors/vim-7.3.905
@@ -1,14 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=app-admin/eselect-vi-1.1 sys-apps/gawk >=sys-apps/sed-4 sys-devel/autoconf >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[threads] ) python_targets_python2_6? ( dev-lang/python:2.6[threads] ) python_targets_python2_7? ( dev-lang/python:2.7[threads] ) python_targets_python3_1? ( dev-lang/python:3.1[threads] ) python_targets_python3_2? ( dev-lang/python:3.2[threads] ) python_targets_python3_3? ( dev-lang/python:3.3[threads] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) X? ( x11-libs/libXt x11-libs/libX11 x11-libs/libSM x11-proto/xproto ) !minimal? ( dev-util/ctags )
+DEPEND=>=app-admin/eselect-vi-1.1 sys-apps/gawk >=sys-apps/sed-4 sys-devel/autoconf >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5[threads] ) python_single_target_python2_6? ( dev-lang/python:2.6[threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads] ) python_single_target_python3_1? ( dev-lang/python:3.1[threads] ) python_single_target_python3_2? ( dev-lang/python:3.2[threads] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) X? ( x11-libs/libXt x11-libs/libX11 x11-libs/libSM x11-proto/xproto ) !minimal? ( dev-util/ctags )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=5
 HOMEPAGE=http://www.vim.org/
-IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 nls acl cscope debug gpm perl python ruby X minimal vim-pager
+IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7 python_single_target_python3_1 python_single_target_python3_2 python_single_target_python3_3 nls acl cscope debug gpm perl python ruby X minimal vim-pager
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
-RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[threads] ) python_targets_python2_6? ( dev-lang/python:2.6[threads] ) python_targets_python2_7? ( dev-lang/python:2.7[threads] ) python_targets_python3_1? ( dev-lang/python:3.1[threads] ) python_targets_python3_2? ( dev-lang/python:3.2[threads] ) python_targets_python3_3? ( dev-lang/python:3.3[threads] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.905 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
-REQUIRED_USE=python? ( || ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 ) ?? ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 ) ?? ( python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 ) )
+RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5[threads] ) python_single_target_python2_6? ( dev-lang/python:2.6[threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads] ) python_single_target_python3_1? ( dev-lang/python:3.1[threads] ) python_single_target_python3_2? ( dev-lang/python:3.2[threads] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.905 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.905.patch.bz2 http://dev.gentoo.org/~radhermit/vim/vim-patches-7.3.905.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=6ed3f3d935685771a72036c10329fc00
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.266 b/metadata/md5-cache/app-editors/vim-core-7.3.266
index 03ce61d546e3..01117c210ce8 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.266
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.266
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.266.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=319e9326c21fb8e40822607b21e356ba
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.409 b/metadata/md5-cache/app-editors/vim-core-7.3.409
index 04bb72cc306a..00b222c85184 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.409
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.409
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.409.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=dcf96d6f244e9f634fa7e0ece7008d87
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.444 b/metadata/md5-cache/app-editors/vim-core-7.3.444
index fd7a65f22644..5c04cb1d06de 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.444
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.444
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.444.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=0d46db4884f59dd273e98df4cfac14bd
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.456 b/metadata/md5-cache/app-editors/vim-core-7.3.456
index 6fe9fd1897aa..cabb9e9600eb 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.456
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.456
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.456.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=4cf6d922dffdc1b8953fb39dbcee6f28
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.462 b/metadata/md5-cache/app-editors/vim-core-7.3.462
index 7006dba3ed1c..01e8600cc565 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.462
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.462
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.462.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=b34fd0bd8fa8cf34e06f7bdb58df0384
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.487 b/metadata/md5-cache/app-editors/vim-core-7.3.487
index f6c8b2e4ea26..91a6f198e7a5 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.487
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.487
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.487.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=641613c5438c26601c6c73bfcea910ee
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.498 b/metadata/md5-cache/app-editors/vim-core-7.3.498
index 6af6f08132e2..bda4fee43bcf 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.498
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.498
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.498.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=8458f9598fc578659a30cdd991160a86
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.502 b/metadata/md5-cache/app-editors/vim-core-7.3.502
index a913dc5d5e59..a5626117f400 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.502
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.502
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.502.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=e16c0d02c308be2eb4387c8da3827abe
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.515 b/metadata/md5-cache/app-editors/vim-core-7.3.515
index 7cce7502f4b4..45417792653a 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.515
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.515
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.515.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=23e3f8bb9bd50f6100bca2274905a426
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.537 b/metadata/md5-cache/app-editors/vim-core-7.3.537
index 58882450445a..a2d21965fe8d 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.537
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.537
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.537.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=0ef6b7843062320c667780d2ed583a71
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.556 b/metadata/md5-cache/app-editors/vim-core-7.3.556
index 6ecbccdcfc89..731ffa68567e 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.556
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.556
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.556.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=af31745bfd5ac50ec6ff9c52d247b0f1
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.566 b/metadata/md5-cache/app-editors/vim-core-7.3.566
index ca94a204f499..467e9de2ba53 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.566
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.566
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.566.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=ffc2d5a7a31ea0aa703adf6112ed8610
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.600 b/metadata/md5-cache/app-editors/vim-core-7.3.600
index e539e1cd7392..e165c433e334 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.600
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.600
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.600.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=79402a9fb2ab4ce5280f8ce36250019a
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.646 b/metadata/md5-cache/app-editors/vim-core-7.3.646
index 54796b0bd95a..ace4c8aea479 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.646
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.646
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.646.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=19e6d82ccdf1e089a5b5c3c7617ee7d4
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.762 b/metadata/md5-cache/app-editors/vim-core-7.3.762
index e988642fe1f5..bad9dd2c6d95 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.762
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.762
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r2.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.762.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=5c862bc950762f1c18708b7f95ff8fc5
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.905 b/metadata/md5-cache/app-editors/vim-core-7.3.905
index 9472d6240aae..b6f59920b09d 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.905
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.905
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r2.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.905.patch.bz2 http://dev.gentoo.org/~radhermit/vim/vim-patches-7.3.905.patch.bz2
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	f297132976d2cca33152ab8cc344d60f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	deb59928961952ba365458182b489706	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=4d8b58120dd68c204b916557f347d281
diff --git a/metadata/md5-cache/app-editors/xemacs-21.4.22-r2 b/metadata/md5-cache/app-editors/xemacs-21.4.22-r2
index 5ff6d92869ad..81fac2d0f4ee 100644
--- a/metadata/md5-cache/app-editors/xemacs-21.4.22-r2
+++ b/metadata/md5-cache/app-editors/xemacs-21.4.22-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=highly customizable open source text editor and application development system
 EAPI=1
 HOMEPAGE=http://www.xemacs.org/
@@ -10,5 +10,5 @@ PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
 RDEPEND=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/motif-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
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/xemacs-21.4/xemacs-21.4.22.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0a76a9a4a31c62f78a757d3b1bd4fd60
diff --git a/metadata/md5-cache/app-editors/xmlcopyeditor-1.2.0.6 b/metadata/md5-cache/app-editors/xmlcopyeditor-1.2.0.6
index 5a197ead52b2..3802ea605707 100644
--- a/metadata/md5-cache/app-editors/xmlcopyeditor-1.2.0.6
+++ b/metadata/md5-cache/app-editors/xmlcopyeditor-1.2.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=dev-libs/libxml2-2.7.3-r1 dev-libs/libxslt dev-libs/xerces-c[icu] dev-libs/libpcre app-text/aspell !aqua? ( x11-libs/wxGTK:2.8[X] ) aqua? ( x11-libs/wxGTK:2.8[aqua] ) dev-libs/boost || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libxml2-2.7.3-r1 dev-libs/libxslt dev-libs/xerces-c[icu] dev-libs/libpcre app-text/aspell !aqua? ( x11-libs/wxGTK:2.8[X] ) aqua? ( x11-libs/wxGTK:2.8[aqua] ) dev-libs/boost || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=XML Copy Editor is a fast, free, validating XML editor
 EAPI=4
 HOMEPAGE=http://xml-copy-editor.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.7.3-r1 dev-libs/libxslt dev-libs/xerces-c[icu] dev-libs/libpcre app-text/aspell !aqua? ( x11-libs/wxGTK:2.8[X] ) aqua? ( x11-libs/wxGTK:2.8[aqua] )
 SLOT=0
 SRC_URI=mirror://sourceforge/xml-copy-editor/xmlcopyeditor-1.2.0.6-2.tar.gz guidexml? ( mirror://gentoo/GuideXML-templates.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=39f8454578672d161a7e2b052c74e276
diff --git a/metadata/md5-cache/app-editors/xmlcopyeditor-1.2.0.9 b/metadata/md5-cache/app-editors/xmlcopyeditor-1.2.0.9
index 5db2cce6be40..3d670e5c6c08 100644
--- a/metadata/md5-cache/app-editors/xmlcopyeditor-1.2.0.9
+++ b/metadata/md5-cache/app-editors/xmlcopyeditor-1.2.0.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=app-text/aspell >=dev-libs/libxml2-2.7.3-r1 dev-libs/libxslt dev-libs/xerces-c[icu] dev-libs/libpcre !aqua? ( x11-libs/wxGTK:2.8[X] ) aqua? ( x11-libs/wxGTK:2.8[aqua] ) dev-libs/boost || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-text/aspell >=dev-libs/libxml2-2.7.3-r1 dev-libs/libxslt dev-libs/xerces-c[icu] dev-libs/libpcre !aqua? ( x11-libs/wxGTK:2.8[X] ) aqua? ( x11-libs/wxGTK:2.8[aqua] ) dev-libs/boost || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=XML Copy Editor is a fast, free, validating XML editor
 EAPI=4
 HOMEPAGE=http://xml-copy-editor.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/aspell >=dev-libs/libxml2-2.7.3-r1 dev-libs/libxslt dev-libs/xerces-c[icu] dev-libs/libpcre !aqua? ( x11-libs/wxGTK:2.8[X] ) aqua? ( x11-libs/wxGTK:2.8[aqua] )
 SLOT=0
 SRC_URI=mirror://sourceforge/xml-copy-editor/xmlcopyeditor-1.2.0.9.tar.gz guidexml? ( mirror://gentoo/GuideXML-templates.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=71c5d49458811a2fe3f43415c23a0cd8
diff --git a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.437_pre20110310 b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.437_pre20110310
index 3e3179641bc8..2fd720d7b01b 100644
--- a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.437_pre20110310
+++ b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.437_pre20110310
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=virtual/w3m >=virtual/emacs-21 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/w3m >=virtual/emacs-21 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=emacs-w3m is an interface program of w3m on Emacs
 EAPI=3
 HOMEPAGE=http://emacs-w3m.namazu.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/w3m >=virtual/emacs-21
 SLOT=0
 SRC_URI=mirror://gentoo/emacs-w3m-1.4.437_pre20110310.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=50fd01d806fd412ab99975e5b287d5b6
diff --git a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.513_pre20130204 b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.513_pre20130204
index 88ca27b3adb5..5259b2e8ab3d 100644
--- a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.513_pre20130204
+++ b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.513_pre20130204
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=virtual/w3m >=virtual/emacs-21 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/w3m >=virtual/emacs-21 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=emacs-w3m is an interface program of w3m on Emacs
 EAPI=5
 HOMEPAGE=http://emacs-w3m.namazu.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/w3m >=virtual/emacs-21
 SLOT=0
 SRC_URI=mirror://gentoo/emacs-w3m-1.4.513_pre20130204.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ff2e608f4074416ebe932aa3de68d31a
diff --git a/metadata/md5-cache/app-emacs/mailcrypt-3.5.9 b/metadata/md5-cache/app-emacs/mailcrypt-3.5.9
index d6564c5f6e2b..5e0f0469785e 100644
--- a/metadata/md5-cache/app-emacs/mailcrypt-3.5.9
+++ b/metadata/md5-cache/app-emacs/mailcrypt-3.5.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-21 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=virtual/emacs-21 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Provides a simple interface to public key cryptography with OpenPGP
 EAPI=3
 HOMEPAGE=http://mailcrypt.sourceforge.net/
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg >=virtual/emacs-21
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/mailcrypt/mailcrypt-3.5.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3a8ae11be72e06777e1836e3e1f94948
diff --git a/metadata/md5-cache/app-emulation/dinero-4.7-r1 b/metadata/md5-cache/app-emulation/dinero-4.7-r1
index 90efaa725f77..08c185aae8c3 100644
--- a/metadata/md5-cache/app-emulation/dinero-4.7-r1
+++ b/metadata/md5-cache/app-emulation/dinero-4.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Cache simulator
 EAPI=4
 HOMEPAGE=http://www.cs.wisc.edu/~markhill/DineroIV/
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=free-noncomm
 SLOT=0
 SRC_URI=ftp://ftp.cs.wisc.edu/markhill/DineroIV/d4-7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=bba6efe33b2653c9197bf76798ee6e21
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-java-1.6.0.45 b/metadata/md5-cache/app-emulation/emul-linux-x86-java-1.6.0.45
index 70579629b3dc..e560e694e400 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-java-1.6.0.45
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-java-1.6.0.45
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle's Java SE Runtime Environment (32bit)
 EAPI=5
 HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
 IUSE=+X alsa nsplugin pax_kernel
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=Oracle-BCLA-JavaSE
 RDEPEND=X? ( app-emulation/emul-linux-x86-xlibs ) alsa? ( app-emulation/emul-linux-x86-soundlibs ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 RESTRICT=fetch strip
 SLOT=1.6
 SRC_URI=jre-6u45-linux-i586.bin
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b28966a0a8d3518ef4b8226e96d44ced
+_md5_=a929dc467071db16ddf8746d684d3e48
diff --git a/metadata/md5-cache/app-emulation/fuse-utils-1.0.0 b/metadata/md5-cache/app-emulation/fuse-utils-1.0.0
index 891b806cbc7d..00fc20064a5a 100644
--- a/metadata/md5-cache/app-emulation/fuse-utils-1.0.0
+++ b/metadata/md5-cache/app-emulation/fuse-utils-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=~app-emulation/libspectrum-1.0.0[gcrypt?] audiofile? ( >=media-libs/audiofile-0.2.3 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=~app-emulation/libspectrum-1.0.0[gcrypt?] audiofile? ( >=media-libs/audiofile-0.2.3 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utils for the Free Unix Spectrum Emulator by Philip Kendall
 EAPI=3
 HOMEPAGE=http://fuse-emulator.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=~app-emulation/libspectrum-1.0.0[gcrypt?] audiofile? ( >=media-libs/audiofile-0.2.3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fuse-emulator/fuse-utils-1.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c5cc16c26a6f1726574351ba77dfc9be
diff --git a/metadata/md5-cache/app-emulation/ganeti-1.2.9 b/metadata/md5-cache/app-emulation/ganeti-1.2.9
index 7fa1dc799932..869b737d07f1 100644
--- a/metadata/md5-cache/app-emulation/ganeti-1.2.9
+++ b/metadata/md5-cache/app-emulation/ganeti-1.2.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Ganeti is a virtual server management software tool built upon Xen
 HOMEPAGE=http://code.google.com/p/ganeti/
 KEYWORDS=~x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-emulation/xen-3.0 dev-libs/openssl dev-python/pyopenssl virtual/pyparsing dev-python/simplejson dev-python/twisted net-analyzer/arping net-misc/bridge-utils net-misc/openssh sys-apps/iproute2 sys-cluster/drbd sys-fs/lvm2 sys-fs/mdadm =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://ganeti.googlecode.com/files/ganeti-1.2.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=917e9fef39e36b4542716da1aac558ca
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.16.34 b/metadata/md5-cache/app-emulation/libguestfs-1.16.34
index 6e71593ddb25..1d21f21b8e50 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.16.34
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.16.34
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-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 ) sys-apps/sed dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+DEPEND=>=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-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 ) sys-apps/sed dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 DESCRIPTION=Tools for accessing, inspect and modifying virtual machine (VM) disk images
 EAPI=5
 HOMEPAGE=http://libguestfs.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-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 ) app-emulation/libguestfs-appliance dev-lang/perl[-build]
 SLOT=0/1.16
 SRC_URI=http://libguestfs.org/download/1.16-stable/libguestfs-1.16.34.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cbddbb8e857a9cea99c8bcc5a78e844e
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.18.11 b/metadata/md5-cache/app-emulation/libguestfs-1.18.11
index 5a1aae170527..731276c3912b 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.18.11
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.18.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-libs/ncurses sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64,tci,systemtap?] 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 ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+DEPEND=sys-libs/ncurses sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64,tci,systemtap?] 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 ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 DESCRIPTION=Tools for accessing, inspect and modifying virtual machine (VM) disk images
 EAPI=5
 HOMEPAGE=http://libguestfs.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=sys-libs/ncurses sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64,tci,systemtap?] 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 ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) app-emulation/libguestfs-appliance dev-lang/perl[-build]
 SLOT=0/1.18
 SRC_URI=http://libguestfs.org/download/1.18-stable/libguestfs-1.18.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f38c7c5dcdd7f29a705c80eaf75a13af
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.20.4 b/metadata/md5-cache/app-emulation/libguestfs-1.20.4
index 40649e1d03ee..dd419f09b263 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.20.4
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.20.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-libs/ncurses sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-1.2.2[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64,tci,systemtap?,selinux?,filecaps] 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] dev-ml/ocaml-gettext ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+DEPEND=sys-libs/ncurses sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-1.2.2[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64,tci,systemtap?,selinux?,filecaps] 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] dev-ml/ocaml-gettext ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 DESCRIPTION=Tools for accessing, inspect and modifying virtual machine (VM) disk images
 EAPI=5
 HOMEPAGE=http://libguestfs.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=sys-libs/ncurses sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-1.2.2[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64,tci,systemtap?,selinux?,filecaps] 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] dev-ml/ocaml-gettext ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap app-emulation/libguestfs-appliance dev-lang/perl[-build]
 SLOT=0/1.20
 SRC_URI=http://libguestfs.org/download/1.20-stable/libguestfs-1.20.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d38520eae8a48ab6141d2be67f5dee7c
diff --git a/metadata/md5-cache/app-emulation/libspectrum-0.5.0.1 b/metadata/md5-cache/app-emulation/libspectrum-0.5.0.1
index 066180f383f0..8a2ba75418b9 100644
--- a/metadata/md5-cache/app-emulation/libspectrum-0.5.0.1
+++ b/metadata/md5-cache/app-emulation/libspectrum-0.5.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=zlib? ( sys-libs/zlib ) bzip2? ( >=app-arch/bzip2-1.0 ) >=dev-libs/glib-2 audiofile? ( >=media-libs/audiofile-0.2.3 ) dev-lang/perl virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=zlib? ( sys-libs/zlib ) bzip2? ( >=app-arch/bzip2-1.0 ) >=dev-libs/glib-2 audiofile? ( >=media-libs/audiofile-0.2.3 ) dev-lang/perl virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Spectrum emulation library
 HOMEPAGE=http://fuse-emulator.sourceforge.net/libspectrum.php
 IUSE=audiofile bzip2 zlib
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=zlib? ( sys-libs/zlib ) bzip2? ( >=app-arch/bzip2-1.0 ) >=dev-libs/glib-2 audiofile? ( >=media-libs/audiofile-0.2.3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fuse-emulator/libspectrum-0.5.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bdd916aea4fcaf2d27b7c070f074a51b
diff --git a/metadata/md5-cache/app-emulation/libvirt-1.0.0 b/metadata/md5-cache/app-emulation/libvirt-1.0.0
index 598ee44c5ad3..83f90e350fd5 100644
--- a/metadata/md5-cache/app-emulation/libvirt-1.0.0
+++ b/metadata/md5-cache/app-emulation/libvirt-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) 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? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 dev-libs/libxslt =dev-lang/python-2* python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) 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? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 dev-libs/libxslt =dev-lang/python-2* python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=4
 HOMEPAGE=http://www.libvirt.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgc
 REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virtualbox? ( libvirtd ) xen? ( libvirtd ) virt-network? ( libvirtd ) firewalld? ( virt-network )
 SLOT=0
 SRC_URI=http://libvirt.org/sources/libvirt-1.0.0.tar.gz ftp://libvirt.org/libvirt/libvirt-1.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a08fe1950afcbb3316e81238844bc6ba
diff --git a/metadata/md5-cache/app-emulation/libvirt-1.0.2-r2 b/metadata/md5-cache/app-emulation/libvirt-1.0.2-r2
index 12082c662a3e..26b1c65ad17d 100644
--- a/metadata/md5-cache/app-emulation/libvirt-1.0.2-r2
+++ b/metadata/md5-cache/app-emulation/libvirt-1.0.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) 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? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 dev-libs/libxslt =dev-lang/python-2* python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) 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? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 dev-libs/libxslt =dev-lang/python-2* python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=5
 HOMEPAGE=http://www.libvirt.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgc
 REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virtualbox? ( libvirtd ) xen? ( libvirtd ) virt-network? ( libvirtd ) firewalld? ( virt-network )
 SLOT=0
 SRC_URI=http://libvirt.org/sources/libvirt-1.0.2.tar.gz ftp://libvirt.org/libvirt/libvirt-1.0.2.tar.gz http://dev.gentoo.org/~cardoe/distfiles/libvirt-1.0.2-1b2f2439.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5682387a3c5165f9ced23e6c634bfa3a
diff --git a/metadata/md5-cache/app-emulation/libvirt-1.0.3-r1 b/metadata/md5-cache/app-emulation/libvirt-1.0.3-r1
index 06e90c524cf2..a12e5a6376fc 100644
--- a/metadata/md5-cache/app-emulation/libvirt-1.0.3-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) 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? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 dev-libs/libxslt =dev-lang/python-2* python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) 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? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 dev-libs/libxslt =dev-lang/python-2* python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=5
 HOMEPAGE=http://www.libvirt.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgc
 REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virtualbox? ( libvirtd ) xen? ( libvirtd ) virt-network? ( libvirtd ) firewalld? ( virt-network )
 SLOT=0
 SRC_URI=http://libvirt.org/sources/libvirt-1.0.3.tar.gz ftp://libvirt.org/libvirt/libvirt-1.0.3.tar.gz http://dev.gentoo.org/~cardoe/distfiles/libvirt-1.0.3-2102e03d.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ceaffbdb8c426b733459952d971d1a1f
diff --git a/metadata/md5-cache/app-emulation/libvirt-1.0.3-r2 b/metadata/md5-cache/app-emulation/libvirt-1.0.3-r2
index 768872ee312c..e67ac8d045c3 100644
--- a/metadata/md5-cache/app-emulation/libvirt-1.0.3-r2
+++ b/metadata/md5-cache/app-emulation/libvirt-1.0.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) 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? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 dev-libs/libxslt =dev-lang/python-2* python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) 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? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 dev-libs/libxslt =dev-lang/python-2* python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=5
 HOMEPAGE=http://www.libvirt.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgc
 REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virtualbox? ( libvirtd ) xen? ( libvirtd ) virt-network? ( libvirtd ) firewalld? ( virt-network )
 SLOT=0
 SRC_URI=http://libvirt.org/sources/libvirt-1.0.3.tar.gz ftp://libvirt.org/libvirt/libvirt-1.0.3.tar.gz http://dev.gentoo.org/~cardoe/distfiles/libvirt-1.0.3-9bf6bec4.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5aa71efcc3e582177288b62726268f29
diff --git a/metadata/md5-cache/app-emulation/libvirt-1.0.4 b/metadata/md5-cache/app-emulation/libvirt-1.0.4
index 9f652fc04f67..0e06c3dd31a6 100644
--- a/metadata/md5-cache/app-emulation/libvirt-1.0.4
+++ b/metadata/md5-cache/app-emulation/libvirt-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) 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? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 dev-libs/libxslt =dev-lang/python-2* python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) 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? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 dev-libs/libxslt =dev-lang/python-2* python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=5
 HOMEPAGE=http://www.libvirt.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgc
 REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virtualbox? ( libvirtd ) xen? ( libvirtd ) virt-network? ( libvirtd ) firewalld? ( virt-network )
 SLOT=0
 SRC_URI=http://libvirt.org/sources/libvirt-1.0.4.tar.gz ftp://libvirt.org/libvirt/libvirt-1.0.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=12aab2d843f0c9c7b77be1d150d576ac
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index 12a68559b4af..260ec45ccaa4 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test unpack
-DEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) 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? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 dev-libs/libxslt =dev-lang/python-2* python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) 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? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 dev-libs/libxslt =dev-lang/python-2* python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=5
 HOMEPAGE=http://www.libvirt.org/
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) 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? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) 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* ) )
 REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virtualbox? ( libvirtd ) xen? ( libvirtd ) virt-network? ( libvirtd ) firewalld? ( virt-network )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4f4879afef8daa550be26a0bd9eca6fe
diff --git a/metadata/md5-cache/app-emulation/lxc-0.8.0-r1 b/metadata/md5-cache/app-emulation/lxc-0.8.0-r1
index cb2c3cb6ab0f..2900aed1bd28 100644
--- a/metadata/md5-cache/app-emulation/lxc-0.8.0-r1
+++ b/metadata/md5-cache/app-emulation/lxc-0.8.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/libcap app-text/docbook-sgml-utils >=sys-kernel/linux-headers-3.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/libcap app-text/docbook-sgml-utils >=sys-kernel/linux-headers-3.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LinuX Containers userspace utilities
 EAPI=4
 HOMEPAGE=http://lxc.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=sys-libs/libcap sys-apps/util-linux app-misc/pax-utils >=sys-apps/openrc-0.9.9.1 virtual/awk
 SLOT=0
 SRC_URI=http://lxc.sourceforge.net/download/lxc/lxc-0.8.0.tar.gz http://dev.gentoo.org/~flameeyes/lxc/lxc-0.8.0-backports-1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0869a18fb284a301e8fd1a380a1ee315
diff --git a/metadata/md5-cache/app-emulation/lxc-0.8.0_rc2-r1 b/metadata/md5-cache/app-emulation/lxc-0.8.0_rc2-r1
index d09ed37c7fc3..2953c0120362 100644
--- a/metadata/md5-cache/app-emulation/lxc-0.8.0_rc2-r1
+++ b/metadata/md5-cache/app-emulation/lxc-0.8.0_rc2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/libcap app-text/docbook-sgml-utils >=sys-kernel/linux-headers-3.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/libcap app-text/docbook-sgml-utils >=sys-kernel/linux-headers-3.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LinuX Containers userspace utilities
 EAPI=4
 HOMEPAGE=http://lxc.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=sys-libs/libcap !vanilla? ( sys-apps/util-linux app-misc/pax-utils >=sys-apps/openrc-0.9.9.1 virtual/awk )
 SLOT=0
 SRC_URI=http://lxc.sourceforge.net/download/lxc/lxc-0.8.0-rc2.tar.gz http://dev.gentoo.org/~flameeyes/lxc/lxc-0.8.0-rc2-backports-2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=31d9add2dde7592469cf8225e161b2aa
diff --git a/metadata/md5-cache/app-emulation/qenv-0.1 b/metadata/md5-cache/app-emulation/qenv-0.1
index 66f0d71a9543..57389de076e6 100644
--- a/metadata/md5-cache/app-emulation/qenv-0.1
+++ b/metadata/md5-cache/app-emulation/qenv-0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Pool of machines handler for QEMU
 HOMEPAGE=http://virutass.net/software/qemu/
 KEYWORDS=~x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-emulation/qemu-0.7.2 net-firewall/iptables net-misc/bridge-utils app-admin/sudo net-dns/dnsmasq
 SLOT=0
 SRC_URI=http://virutass.net/software/qemu/qenv-0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0ecc6d33d4dc40d2baf88a8d68fac019
diff --git a/metadata/md5-cache/app-emulation/ski-1.3.2 b/metadata/md5-cache/app-emulation/ski-1.3.2
index c590cda502ba..2210618ba50a 100644
--- a/metadata/md5-cache/app-emulation/ski-1.3.2
+++ b/metadata/md5-cache/app-emulation/ski-1.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=sys-devel/libtool || ( dev-libs/elfutils dev-libs/libelf ) sys-libs/ncurses gtk? ( x11-libs/gtk+:2 ) motif? ( x11-libs/motif ) sys-devel/bison sys-devel/flex dev-util/gperf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-devel/libtool || ( dev-libs/elfutils dev-libs/libelf ) sys-libs/ncurses gtk? ( x11-libs/gtk+:2 ) motif? ( x11-libs/motif ) sys-devel/bison sys-devel/flex dev-util/gperf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ia64 instruction set simulator
 EAPI=4
 HOMEPAGE=http://ski.sourceforge.net/ http://www.gelato.unsw.edu.au/IA64wiki/SkiSimulator
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/libtool || ( dev-libs/elfutils dev-libs/libelf ) sys-libs/ncurses gtk? ( x11-libs/gtk+:2 ) motif? ( x11-libs/motif )
 SLOT=0
 SRC_URI=mirror://sourceforge/ski/ski-1.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8def7395c1f3c38bcc91ffce13a91d6b
diff --git a/metadata/md5-cache/app-emulation/spectemu-0.99.3-r1 b/metadata/md5-cache/app-emulation/spectemu-0.99.3-r1
index 2990d08ce414..4ad84e453d74 100644
--- a/metadata/md5-cache/app-emulation/spectemu-0.99.3-r1
+++ b/metadata/md5-cache/app-emulation/spectemu-0.99.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=X? ( >=x11-proto/xf86vidmodeproto-2.2.2 >=x11-proto/xextproto-7.0.2 >=x11-proto/xproto-7.0.4 >=x11-libs/libX11-1.0.0 >=x11-libs/libXext-1.0.0 >=x11-libs/libXxf86vm-1.0.0 ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=X? ( >=x11-proto/xf86vidmodeproto-2.2.2 >=x11-proto/xextproto-7.0.2 >=x11-proto/xproto-7.0.4 >=x11-libs/libX11-1.0.0 >=x11-libs/libXext-1.0.0 >=x11-libs/libXxf86vm-1.0.0 ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=48k ZX Spectrum Emulator
 EAPI=4
 HOMEPAGE=http://kempelen.iit.bme.hu/~mszeredi/spectemu/spectemu.html
@@ -10,5 +10,5 @@ RDEPEND=X? ( >=x11-proto/xf86vidmodeproto-2.2.2 >=x11-proto/xextproto-7.0.2 >=x1
 REQUIRED_USE=|| ( svga X )
 SLOT=0
 SRC_URI=http://www.inf.bme.hu/~mszeredi/spectemu/spectemu-0.99.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8eb7802607a6ad35a1985c11a8a02446
diff --git a/metadata/md5-cache/app-emulation/vice-2.3 b/metadata/md5-cache/app-emulation/vice-2.3
index e33babaceaba..25e6a664e16e 100644
--- a/metadata/md5-cache/app-emulation/vice-2.3
+++ b/metadata/md5-cache/app-emulation/vice-2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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 ) virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Versatile Commodore 8-bit Emulator
 EAPI=2
 HOMEPAGE=http://vice-emu.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=142af7eed6b16c4f907f6a650d7bf1a9
diff --git a/metadata/md5-cache/app-emulation/vice-2.4 b/metadata/md5-cache/app-emulation/vice-2.4
index a27982ab738f..db4d9abaf39d 100644
--- a/metadata/md5-cache/app-emulation/vice-2.4
+++ b/metadata/md5-cache/app-emulation/vice-2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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 x11-libs/vte:0 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:0 ) 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 ) virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 x11-libs/vte:0 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:0 ) 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 ) virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Versatile Commodore 8-bit Emulator
 EAPI=5
 HOMEPAGE=http://vice-emu.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 x11-libs/vte:0 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:0 ) 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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vice-emu/releases/vice-2.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d5056bc8de03f88e0662693a2fbc510d
diff --git a/metadata/md5-cache/app-emulation/virt-manager-9999 b/metadata/md5-cache/app-emulation/virt-manager-9999
index 67f271e0dc61..9c0f08185ed2 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-9999
+++ b/metadata/md5-cache/app-emulation/virt-manager-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A graphical tool for administering virtual machines (KVM/Xen)
 EAPI=4
 HOMEPAGE=http://virt-manager.org/
@@ -7,5 +7,5 @@ IUSE=gnome-keyring policykit sasl spice
 LICENSE=GPL-2
 RDEPEND=>=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* )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f7715e46c76dbaf2fef88401baf8bafb
diff --git a/metadata/md5-cache/app-emulation/virt-what-1.11 b/metadata/md5-cache/app-emulation/virt-what-1.11
index 4363554e022e..b0b358443a05 100644
--- a/metadata/md5-cache/app-emulation/virt-what-1.11
+++ b/metadata/md5-cache/app-emulation/virt-what-1.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-lang/perl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Detects if the current machine is running in a virtual machine
 EAPI=3
 HOMEPAGE=http://people.redhat.com/~rjones/virt-what/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-shells/bash sys-apps/dmidecode
 SLOT=0
 SRC_URI=http://people.redhat.com/~rjones/virt-what/files/virt-what-1.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b0c5c079f2091a62d2d03df975cbbe6b
diff --git a/metadata/md5-cache/app-emulation/virt-what-1.12 b/metadata/md5-cache/app-emulation/virt-what-1.12
index de7da379636e..106454ee9509 100644
--- a/metadata/md5-cache/app-emulation/virt-what-1.12
+++ b/metadata/md5-cache/app-emulation/virt-what-1.12
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Detects if the current machine is running in a virtual machine
 EAPI=4
 HOMEPAGE=http://people.redhat.com/~rjones/virt-what/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-shells/bash sys-apps/dmidecode
 SLOT=0
 SRC_URI=http://people.redhat.com/~rjones/virt-what/files/virt-what-1.12.tar.gz
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0be41bc0ec80e0c7f511cab7a547c3be
+_md5_=06fb0175237afe3826b4b89f7dfffae8
diff --git a/metadata/md5-cache/app-emulation/virt-what-1.2 b/metadata/md5-cache/app-emulation/virt-what-1.2
index c6e1c3bee70a..2244ec8cd9b1 100644
--- a/metadata/md5-cache/app-emulation/virt-what-1.2
+++ b/metadata/md5-cache/app-emulation/virt-what-1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-lang/perl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Detects if the current machine is running in a virtual machine
 EAPI=3
 HOMEPAGE=http://people.redhat.com/~rjones/virt-what/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-shells/bash sys-apps/dmidecode
 SLOT=0
 SRC_URI=http://people.redhat.com/~rjones/virt-what/files/virt-what-1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f49c69f1f44cb2923df613a915ad0a38
diff --git a/metadata/md5-cache/app-emulation/vmware-view-open-client-4.5.0.297975-r1 b/metadata/md5-cache/app-emulation/vmware-view-open-client-4.5.0.297975-r1
index b5198994c785..ab6bd161c9a2 100644
--- a/metadata/md5-cache/app-emulation/vmware-view-open-client-4.5.0.297975-r1
+++ b/metadata/md5-cache/app-emulation/vmware-view-open-client-4.5.0.297975-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open Source VMware View Client
 EAPI=4
 HOMEPAGE=http://code.google.com/p/vmware-view-open-client/
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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
 SLOT=0
 SRC_URI=http://vmware-view-open-client.googlecode.com/files/VMware-view-open-client-source-4.5.0-297975.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b477ba605410dafa535e5a2082eda6c2
diff --git a/metadata/md5-cache/app-emulation/wine-1.2.3 b/metadata/md5-cache/app-emulation/wine-1.2.3
index 1d99d744bafd..3d57f2557da2 100644
--- a/metadata/md5-cache/app-emulation/wine-1.2.3
+++ b/metadata/md5-cache/app-emulation/wine-1.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=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 ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) 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:0= ) png? ( media-libs/libpng:0= ) 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 ) pulseaudio? ( || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex
+DEPEND=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 ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) 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:0= ) png? ( media-libs/libpng:0= ) 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 ) pulseaudio? ( || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.2.3.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.0.0-x86/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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cf478b2dedfebf590bb69c67e8f16335
diff --git a/metadata/md5-cache/app-emulation/wine-1.4 b/metadata/md5-cache/app-emulation/wine-1.4
index 14d94787a23d..6fbddb1e750b 100644
--- a/metadata/md5-cache/app-emulation/wine-1.4
+++ b/metadata/md5-cache/app-emulation/wine-1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:0 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) 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:0= ) png? ( media-libs/libpng:0= ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:0 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) 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:0= ) png? ( media-libs/libpng:0= ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.4.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.4/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.4/wine_gecko-1.4-x86_64.msi ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=29d881e84cabac27efc55e9ae8162e20
diff --git a/metadata/md5-cache/app-emulation/wine-1.4.1 b/metadata/md5-cache/app-emulation/wine-1.4.1
index e081600cb0d9..216e1eaa42fb 100644
--- a/metadata/md5-cache/app-emulation/wine-1.4.1
+++ b/metadata/md5-cache/app-emulation/wine-1.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:0 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) 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:0= ) png? ( media-libs/libpng:0= ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:0 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) 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:0= ) png? ( media-libs/libpng:0= ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.4.1.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.4/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.4/wine_gecko-1.4-x86_64.msi ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=22b1c3fc4c4fa5cd3bb3349d82b465ff
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.0 b/metadata/md5-cache/app-emulation/wine-1.5.0
index 8367a0f55897..a4f549a79a77 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.0
+++ b/metadata/md5-cache/app-emulation/wine-1.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:0 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:0 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.0.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86_64.msi ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7b170c9f2d5a648a6f7cba7512cf4c6d
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.1 b/metadata/md5-cache/app-emulation/wine-1.5.1
index c8f70016f76b..ee9885776a90 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.1
+++ b/metadata/md5-cache/app-emulation/wine-1.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:0 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) 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:0= ) png? ( media-libs/libpng:0= ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:0 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) 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:0= ) png? ( media-libs/libpng:0= ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.1.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86_64.msi ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7495ecab0d4c44727e633d314f58c741
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.10-r1 b/metadata/md5-cache/app-emulation/wine-1.5.10-r1
index cb699717d7f7..5372c8e3bf57 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.10-r1
+++ b/metadata/md5-cache/app-emulation/wine-1.5.10-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( op
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.10.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.7/wine_gecko-1.7-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.7/wine_gecko-1.7-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.4/wine-mono-0.0.4.msi ) http://source.winehq.org/patches/data/87234 -> winepulse-2012.06.15.patch
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9ff8d2dbc86ad3de58718a8d2130bfa2
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.11-r1 b/metadata/md5-cache/app-emulation/wine-1.5.11-r1
index f225f088f73a..746fc8ef65cc 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.11-r1
+++ b/metadata/md5-cache/app-emulation/wine-1.5.11-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( op
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.11.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.7/wine_gecko-1.7-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.7/wine_gecko-1.7-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.4/wine-mono-0.0.4.msi ) http://source.winehq.org/patches/data/87234 -> winepulse-2012.06.15.patch
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=77f2659e32f33682f672aa12cb13fbbd
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.12-r1 b/metadata/md5-cache/app-emulation/wine-1.5.12-r1
index bf68080060a9..e4015cab49fe 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.12-r1
+++ b/metadata/md5-cache/app-emulation/wine-1.5.12-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( op
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.12.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.7/wine_gecko-1.7-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.7/wine_gecko-1.7-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.4/wine-mono-0.0.4.msi ) http://source.winehq.org/patches/data/87234 -> winepulse-2012.06.15.patch
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bab035add044f68532f87406259f8611
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.13-r1 b/metadata/md5-cache/app-emulation/wine-1.5.13-r1
index b0123cb5349d..114149a78dd1 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.13-r1
+++ b/metadata/md5-cache/app-emulation/wine-1.5.13-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( op
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.13.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.7/wine_gecko-1.7-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.7/wine_gecko-1.7-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.4/wine-mono-0.0.4.msi ) http://source.winehq.org/patches/data/87234 -> winepulse-2012.06.15.patch
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c19a7383819c18f94acb9ad28924c972
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.14-r1 b/metadata/md5-cache/app-emulation/wine-1.5.14-r1
index 5e8cfcc2c758..4a9345e524fe 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.14-r1
+++ b/metadata/md5-cache/app-emulation/wine-1.5.14-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( op
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.14.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.7/wine_gecko-1.7-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.7/wine_gecko-1.7-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.4/wine-mono-0.0.4.msi ) http://source.winehq.org/patches/data/87234 -> winepulse-2012.06.15.patch
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=068640edc4bf2369689de0fb20e1ef7c
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.15-r2 b/metadata/md5-cache/app-emulation/wine-1.5.15-r2
index 0bf3da9130de..e138db58db90 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.15-r2
+++ b/metadata/md5-cache/app-emulation/wine-1.5.15-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( op
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.15.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.8/wine_gecko-1.8-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.8/wine_gecko-1.8-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.4/wine-mono-0.0.4.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.5.15.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7b74d09c0ee95ea925aa448022c14cab
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.16-r1 b/metadata/md5-cache/app-emulation/wine-1.5.16-r1
index 40c278e67547..11f75cbea694 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.16-r1
+++ b/metadata/md5-cache/app-emulation/wine-1.5.16-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( op
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.16.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.8/wine_gecko-1.8-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.8/wine_gecko-1.8-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.5.16.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c2329ad5983bf90364361c7cb3d51698
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.17 b/metadata/md5-cache/app-emulation/wine-1.5.17
index 6992fa08d4ac..564ba717c209 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.17
+++ b/metadata/md5-cache/app-emulation/wine-1.5.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( op
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.17.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.8/wine_gecko-1.8-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.8/wine_gecko-1.8-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.5.17.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6a0dfefea2fe5046cde39cba2b1ee3c2
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.18 b/metadata/md5-cache/app-emulation/wine-1.5.18
index 303463b238a9..69f10dabf320 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.18
+++ b/metadata/md5-cache/app-emulation/wine-1.5.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( op
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.18.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.8/wine_gecko-1.8-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.8/wine_gecko-1.8-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.5.18.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2012.11.24.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ca061b6c9c4469a8432a8a746d33311f
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.19 b/metadata/md5-cache/app-emulation/wine-1.5.19
index 720d5d24e7c5..2841cba91876 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.19
+++ b/metadata/md5-cache/app-emulation/wine-1.5.19
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( op
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.19.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.8/wine_gecko-1.8-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.8/wine_gecko-1.8-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.5.19.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2012.11.24.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=de2fdadca270f63afb812ed8e5933b61
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.2 b/metadata/md5-cache/app-emulation/wine-1.5.2
index a2879e179de0..585ac6471110 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.2
+++ b/metadata/md5-cache/app-emulation/wine-1.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:0 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:0 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.2.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86_64.msi ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6abd598c195f9604a9903dc72e0d0b19
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.20 b/metadata/md5-cache/app-emulation/wine-1.5.20
index 862e4a087f36..1d829ea13738 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.20
+++ b/metadata/md5-cache/app-emulation/wine-1.5.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( media-sound/pulseaudio sys-auth/rtkit ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( media-sound/pulseaudio sys-auth/rtkit ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( op
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.20.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.8/wine_gecko-1.8-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.8/wine_gecko-1.8-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.5.20_pre20121207.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2012.11.24.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=41404b00ef92f14bb3e86618f1b97845
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.21 b/metadata/md5-cache/app-emulation/wine-1.5.21
index c9b1f9643054..b438b1c6d530 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.21
+++ b/metadata/md5-cache/app-emulation/wine-1.5.21
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( media-sound/pulseaudio sys-auth/rtkit ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( media-sound/pulseaudio sys-auth/rtkit ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( op
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.21.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.8/wine_gecko-1.8-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.8/wine_gecko-1.8-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.5.21.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2012.11.24.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6d743f362110a85fbb6b825e4d781493
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.22 b/metadata/md5-cache/app-emulation/wine-1.5.22
index 504a2edda7bd..eb2238a3cd1a 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.22
+++ b/metadata/md5-cache/app-emulation/wine-1.5.22
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( media-sound/pulseaudio sys-auth/rtkit ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( media-sound/pulseaudio sys-auth/rtkit ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( op
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.22.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.5.22.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2012.11.24.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=feb38c1864036db31397c51b78b8c3d4
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.23-r1 b/metadata/md5-cache/app-emulation/wine-1.5.23-r1
index ed0fa8c7a506..bd1f6f782f84 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.23-r1
+++ b/metadata/md5-cache/app-emulation/wine-1.5.23-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=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:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) 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:0= net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( media-sound/pulseaudio sys-auth/rtkit ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=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:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) 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:0= net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( media-sound/pulseaudio sys-auth/rtkit ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( op
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.23.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.5.23.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2012.11.24.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4e2c2a7fcf7b9eb9e6f9c494f54e8954
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.24 b/metadata/md5-cache/app-emulation/wine-1.5.24
index 2b6ee4d8f3b0..6785d65d9d18 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.24
+++ b/metadata/md5-cache/app-emulation/wine-1.5.24
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=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:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) 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:0= net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( media-sound/pulseaudio sys-auth/rtkit ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=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:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) 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:0= net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) 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? ( media-sound/pulseaudio sys-auth/rtkit ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( op
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.24.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.5.23.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2012.11.24.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a8ef78b82e2bcd472b23432f94d00661
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.25 b/metadata/md5-cache/app-emulation/wine-1.5.25
index 64ffb5595c5c..11b2f9bd7ffd 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.25
+++ b/metadata/md5-cache/app-emulation/wine-1.5.25
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=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:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) 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:0= net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) amd64? ( abi_x86_32? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] >=app-emulation/emul-linux-x86-soundlibs-2.1[development] ) mp3? ( app-emulation/emul-linux-x86-soundlibs[development] ) odbc? ( app-emulation/emul-linux-x86-db[development] ) openal? ( app-emulation/emul-linux-x86-sdl[development] ) opengl? ( app-emulation/emul-linux-x86-opengl[development] ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) v4l? ( app-emulation/emul-linux-x86-medialibs[development] ) >=app-emulation/emul-linux-x86-baselibs-20130224[development] >=sys-kernel/linux-headers-2.6 ) ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=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:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) 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:0= net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) amd64? ( abi_x86_32? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] >=app-emulation/emul-linux-x86-soundlibs-2.1[development] ) mp3? ( app-emulation/emul-linux-x86-soundlibs[development] ) odbc? ( app-emulation/emul-linux-x86-db[development] ) openal? ( app-emulation/emul-linux-x86-sdl[development] ) opengl? ( app-emulation/emul-linux-x86-opengl[development] ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) v4l? ( app-emulation/emul-linux-x86-medialibs[development] ) >=app-emulation/emul-linux-x86-baselibs-20130224[development] >=sys-kernel/linux-headers-2.6 ) ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.25.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.5.25.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2012.11.24.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=621dfad718e8a1305de9e7cbd7b98028
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.26 b/metadata/md5-cache/app-emulation/wine-1.5.26
index 98d2f2cac74e..6c63b1fb3c31 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.26
+++ b/metadata/md5-cache/app-emulation/wine-1.5.26
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=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:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) 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:0= net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) amd64? ( abi_x86_32? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] >=app-emulation/emul-linux-x86-soundlibs-2.1[development] ) mp3? ( app-emulation/emul-linux-x86-soundlibs[development] ) odbc? ( app-emulation/emul-linux-x86-db[development] ) openal? ( app-emulation/emul-linux-x86-sdl[development] ) opengl? ( app-emulation/emul-linux-x86-opengl[development] ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) v4l? ( app-emulation/emul-linux-x86-medialibs[development] ) >=app-emulation/emul-linux-x86-baselibs-20130224[development] >=sys-kernel/linux-headers-2.6 ) ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=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:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) 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:0= net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) amd64? ( abi_x86_32? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] >=app-emulation/emul-linux-x86-soundlibs-2.1[development] ) mp3? ( app-emulation/emul-linux-x86-soundlibs[development] ) odbc? ( app-emulation/emul-linux-x86-db[development] ) openal? ( app-emulation/emul-linux-x86-sdl[development] ) opengl? ( app-emulation/emul-linux-x86-opengl[development] ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) v4l? ( app-emulation/emul-linux-x86-medialibs[development] ) >=app-emulation/emul-linux-x86-baselibs-20130224[development] >=sys-kernel/linux-headers-2.6 ) ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.26.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.5.25.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2012.11.24.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=93cdc8eb6a251954100f5ed2d7b213be
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.27 b/metadata/md5-cache/app-emulation/wine-1.5.27
index 4b90133621a1..0fd187b4d97a 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.27
+++ b/metadata/md5-cache/app-emulation/wine-1.5.27
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=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:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) 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:0= net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) amd64? ( abi_x86_32? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] >=app-emulation/emul-linux-x86-soundlibs-2.1[development] ) mp3? ( app-emulation/emul-linux-x86-soundlibs[development] ) odbc? ( app-emulation/emul-linux-x86-db[development] ) openal? ( app-emulation/emul-linux-x86-sdl[development] ) opengl? ( app-emulation/emul-linux-x86-opengl[development] ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) v4l? ( app-emulation/emul-linux-x86-medialibs[development] ) >=app-emulation/emul-linux-x86-baselibs-20130224[development] >=sys-kernel/linux-headers-2.6 ) ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=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:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) 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:0= net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) amd64? ( abi_x86_32? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] >=app-emulation/emul-linux-x86-soundlibs-2.1[development] ) mp3? ( app-emulation/emul-linux-x86-soundlibs[development] ) odbc? ( app-emulation/emul-linux-x86-db[development] ) openal? ( app-emulation/emul-linux-x86-sdl[development] ) opengl? ( app-emulation/emul-linux-x86-opengl[development] ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) v4l? ( app-emulation/emul-linux-x86-medialibs[development] ) >=app-emulation/emul-linux-x86-baselibs-20130224[development] >=sys-kernel/linux-headers-2.6 ) ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.27.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.5.25.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2012.11.24.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=011f05e7c4c9e20cc690965346e5c2d5
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.28 b/metadata/md5-cache/app-emulation/wine-1.5.28
index ea69b66b1b48..753d1abf1e61 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.28
+++ b/metadata/md5-cache/app-emulation/wine-1.5.28
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=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:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) 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? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) amd64? ( abi_x86_32? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] >=app-emulation/emul-linux-x86-soundlibs-2.1[development] ) mp3? ( app-emulation/emul-linux-x86-soundlibs[development] ) odbc? ( app-emulation/emul-linux-x86-db[development] ) openal? ( app-emulation/emul-linux-x86-sdl[development] ) opengl? ( app-emulation/emul-linux-x86-opengl[development] ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) v4l? ( app-emulation/emul-linux-x86-medialibs[development] ) >=app-emulation/emul-linux-x86-baselibs-20130224[development] >=sys-kernel/linux-headers-2.6 ) ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=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:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) 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? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) amd64? ( abi_x86_32? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] >=app-emulation/emul-linux-x86-soundlibs-2.1[development] ) mp3? ( app-emulation/emul-linux-x86-soundlibs[development] ) odbc? ( app-emulation/emul-linux-x86-db[development] ) openal? ( app-emulation/emul-linux-x86-sdl[development] ) opengl? ( app-emulation/emul-linux-x86-opengl[development] ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) v4l? ( app-emulation/emul-linux-x86-medialibs[development] ) >=app-emulation/emul-linux-x86-baselibs-20130224[development] >=sys-kernel/linux-headers-2.6 ) ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.28.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.5.25.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2012.11.24.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=3728872d0d3009f54202d11fcfb870da
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.3 b/metadata/md5-cache/app-emulation/wine-1.5.3
index 9e1cd75a0dde..762fff70f1e6 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.3
+++ b/metadata/md5-cache/app-emulation/wine-1.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:0 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:0 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.3.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86_64.msi ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c1a2c265529d5e501fd1bcd5e87273c4
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.4 b/metadata/md5-cache/app-emulation/wine-1.5.4
index 1e3c8db7b2cf..7b50e420ac9d 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.4
+++ b/metadata/md5-cache/app-emulation/wine-1.5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:0 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:0 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.4.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86_64.msi ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=38a77a2903b439d414f3b54fd61d3893
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.5 b/metadata/md5-cache/app-emulation/wine-1.5.5
index eef15473e2e4..bffabb9dbc8d 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.5
+++ b/metadata/md5-cache/app-emulation/wine-1.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:0 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) 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:0= ) png? ( media-libs/libpng:0= ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:0 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) 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:0= ) png? ( media-libs/libpng:0= ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.5.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86_64.msi ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e468b82079eb9ee173f64600f1efa37c
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.6 b/metadata/md5-cache/app-emulation/wine-1.5.6
index 6571bc0bf3ce..978a79a36c35 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.6
+++ b/metadata/md5-cache/app-emulation/wine-1.5.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:0 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:0 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.6.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.4/wine-mono-0.0.4.msi )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dbc8a38e7f8a5c822eed710569da21e1
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.7 b/metadata/md5-cache/app-emulation/wine-1.5.7
index 292434150c4b..d3b7639d3c75 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.7
+++ b/metadata/md5-cache/app-emulation/wine-1.5.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) pulseaudio? ( media-sound/pulseaudio ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) pulseaudio? ( media-sound/pulseaudio ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.7.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.6/wine_gecko-1.6-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.6/wine_gecko-1.6-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.4/wine-mono-0.0.4.msi ) http://source.winehq.org/patches/data/87234 -> winepulse-2012.06.15.patch
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a39da05f2a2f85018b5e2766e193af30
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.8 b/metadata/md5-cache/app-emulation/wine-1.5.8
index 88a92c81152b..42ed751f26a2 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.8
+++ b/metadata/md5-cache/app-emulation/wine-1.5.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) pulseaudio? ( media-sound/pulseaudio ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) pulseaudio? ( media-sound/pulseaudio ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.8.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.6/wine_gecko-1.6-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.6/wine_gecko-1.6-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.4/wine-mono-0.0.4.msi ) http://source.winehq.org/patches/data/87234 -> winepulse-2012.06.15.patch
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=70ccd94aa6af5d4c66ed3fb825b548b5
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.9 b/metadata/md5-cache/app-emulation/wine-1.5.9
index 7204f66ec8c6..a75ef98a4dff 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.9
+++ b/metadata/md5-cache/app-emulation/wine-1.5.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) pulseaudio? ( media-sound/pulseaudio ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:2 ) gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) pulseaudio? ( media-sound/pulseaudio ) 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:0= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) 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 ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.9.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.6/wine_gecko-1.6-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.6/wine_gecko-1.6-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.4/wine-mono-0.0.4.msi ) http://source.winehq.org/patches/data/87234 -> winepulse-2012.06.15.patch
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=745e82fad2ee0f07acf43a82d5213865
diff --git a/metadata/md5-cache/app-emulation/wine-9999 b/metadata/md5-cache/app-emulation/wine-9999
index 6ad891595baa..1b55ebf2ce08 100644
--- a/metadata/md5-cache/app-emulation/wine-9999
+++ b/metadata/md5-cache/app-emulation/wine-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=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:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) 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? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) amd64? ( abi_x86_32? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] >=app-emulation/emul-linux-x86-soundlibs-2.1[development] ) mp3? ( app-emulation/emul-linux-x86-soundlibs[development] ) odbc? ( app-emulation/emul-linux-x86-db[development] ) openal? ( app-emulation/emul-linux-x86-sdl[development] ) opengl? ( app-emulation/emul-linux-x86-opengl[development] ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) v4l? ( app-emulation/emul-linux-x86-medialibs[development] ) >=app-emulation/emul-linux-x86-baselibs-20130224[development] >=sys-kernel/linux-headers-2.6 ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-vcs/git
+DEPEND=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:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) 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? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) amd64? ( abi_x86_32? ( gstreamer? ( app-emulation/emul-linux-x86-gstplugins ) truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] >=app-emulation/emul-linux-x86-soundlibs-2.1[development] ) mp3? ( app-emulation/emul-linux-x86-soundlibs[development] ) odbc? ( app-emulation/emul-linux-x86-db[development] ) openal? ( app-emulation/emul-linux-x86-sdl[development] ) opengl? ( app-emulation/emul-linux-x86-opengl[development] ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) v4l? ( app-emulation/emul-linux-x86-medialibs[development] ) >=app-emulation/emul-linux-x86-baselibs-20130224[development] >=sys-kernel/linux-headers-2.6 ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-vcs/git
 DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=5
 HOMEPAGE=http://www.winehq.org/
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.5.25.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2012.11.24.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=6cdfe417f12b1669376492639182d25d
diff --git a/metadata/md5-cache/app-emulation/x48-0.6.4 b/metadata/md5-cache/app-emulation/x48-0.6.4
index c853dec26a1e..c5bf1bc0d2ff 100644
--- a/metadata/md5-cache/app-emulation/x48-0.6.4
+++ b/metadata/md5-cache/app-emulation/x48-0.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext readline? ( sys-libs/readline ) virtual/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 x11-libs/libXext readline? ( sys-libs/readline ) virtual/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HP48 Calculator Emulator
 EAPI=4
 HOMEPAGE=http://x48.berlios.de/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libX11 x11-libs/libXext readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=mirror://sourceforge/x48.berlios/x48-0.6.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=c6d5fb4b04ab97fa0c7829917adb2696
diff --git a/metadata/md5-cache/app-forensics/afflib-3.7.1 b/metadata/md5-cache/app-forensics/afflib-3.7.1
index 84a18c5c2eda..426aacbe820c 100644
--- a/metadata/md5-cache/app-forensics/afflib-3.7.1
+++ b/metadata/md5-cache/app-forensics/afflib-3.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Library that implements the AFF image standard
 EAPI=4
 HOMEPAGE=https://github.com/simsong/AFFLIBv3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=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* )
 SLOT=0
 SRC_URI=mirror://github/simsong/AFFLIBv3/afflib-3.7.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b98b8f435faa4c4690547500ff414094
diff --git a/metadata/md5-cache/app-forensics/aide-0.13.1 b/metadata/md5-cache/app-forensics/aide-0.13.1
index 2a4d6289e379..7499a7f7e03d 100644
--- a/metadata/md5-cache/app-forensics/aide-0.13.1
+++ b/metadata/md5-cache/app-forensics/aide-0.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=acl? ( sys-apps/acl ) curl? ( net-misc/curl ) mhash? ( >=app-crypt/mhash-0.9.2 ) !mhash? ( dev-libs/libgcrypt ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql-base ) selinux? ( sys-libs/libselinux sec-policy/selinux-aide ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) nls? ( sys-devel/gettext ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=acl? ( sys-apps/acl ) curl? ( net-misc/curl ) mhash? ( >=app-crypt/mhash-0.9.2 ) !mhash? ( dev-libs/libgcrypt ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql-base ) selinux? ( sys-libs/libselinux sec-policy/selinux-aide ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) nls? ( sys-devel/gettext ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire
 HOMEPAGE=http://aide.sourceforge.net/
 IUSE=acl curl mhash nls postgres selinux static xattr zlib
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!static? ( acl? ( sys-apps/acl ) curl? ( net-misc/curl ) mhash? ( >=app-crypt/mhash-0.9.2 ) !mhash? ( dev-libs/libgcrypt ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql-base ) selinux? ( sys-libs/libselinux sec-policy/selinux-aide ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) ) virtual/mailx
 SLOT=0
 SRC_URI=mirror://sourceforge/aide/aide-0.13.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cf300a5b9f9ccd08ceba23df6a64c81c
diff --git a/metadata/md5-cache/app-forensics/aide-0.13.1-r3 b/metadata/md5-cache/app-forensics/aide-0.13.1-r3
index 3f886f9c885e..d2ed8ec4016e 100644
--- a/metadata/md5-cache/app-forensics/aide-0.13.1-r3
+++ b/metadata/md5-cache/app-forensics/aide-0.13.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=acl? ( sys-apps/acl ) curl? ( net-misc/curl ) mhash? ( >=app-crypt/mhash-0.9.2 ) !mhash? ( dev-libs/libgcrypt ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql-base ) selinux? ( sys-libs/libselinux sec-policy/selinux-aide ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) nls? ( sys-devel/gettext ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=acl? ( sys-apps/acl ) curl? ( net-misc/curl ) mhash? ( >=app-crypt/mhash-0.9.2 ) !mhash? ( dev-libs/libgcrypt ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql-base ) selinux? ( sys-libs/libselinux sec-policy/selinux-aide ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) nls? ( sys-devel/gettext ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire
 HOMEPAGE=http://aide.sourceforge.net/
 IUSE=acl curl mhash nls postgres selinux static xattr zlib
@@ -9,5 +9,5 @@ RDEPEND=!static? ( acl? ( sys-apps/acl ) curl? ( net-misc/curl ) mhash? ( >=app-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/aide/aide-0.13.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bb67112422caf88125b3299a38f1db89
diff --git a/metadata/md5-cache/app-forensics/aide-0.13.1-r5 b/metadata/md5-cache/app-forensics/aide-0.13.1-r5
index 4aac4c4dccf0..246933129916 100644
--- a/metadata/md5-cache/app-forensics/aide-0.13.1-r5
+++ b/metadata/md5-cache/app-forensics/aide-0.13.1-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=acl? ( sys-apps/acl ) curl? ( net-misc/curl ) mhash? ( >=app-crypt/mhash-0.9.2 ) !mhash? ( dev-libs/libgcrypt ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql-base ) selinux? ( sys-libs/libselinux sec-policy/selinux-aide ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) nls? ( sys-devel/gettext ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=acl? ( sys-apps/acl ) curl? ( net-misc/curl ) mhash? ( >=app-crypt/mhash-0.9.2 ) !mhash? ( dev-libs/libgcrypt ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql-base ) selinux? ( sys-libs/libselinux sec-policy/selinux-aide ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) nls? ( sys-devel/gettext ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire
 HOMEPAGE=http://aide.sourceforge.net/
 IUSE=acl curl mhash nls postgres selinux static xattr zlib
@@ -9,5 +9,5 @@ RDEPEND=!static? ( acl? ( sys-apps/acl ) curl? ( net-misc/curl ) mhash? ( >=app-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/aide/aide-0.13.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ce887482a09ead28d038fc1a741045ca
diff --git a/metadata/md5-cache/app-forensics/aide-0.14.2 b/metadata/md5-cache/app-forensics/aide-0.14.2
index 855724aa7a64..b0b72a69f4be 100644
--- a/metadata/md5-cache/app-forensics/aide-0.14.2
+++ b/metadata/md5-cache/app-forensics/aide-0.14.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=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 sec-policy/selinux-aide ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) nls? ( sys-devel/gettext ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 sec-policy/selinux-aide ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) nls? ( sys-devel/gettext ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire
 EAPI=3
 HOMEPAGE=http://aide.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!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 sec-policy/selinux-aide ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/aide/aide-0.14.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=af470d17abaf76381e69fd9346b1a328
diff --git a/metadata/md5-cache/app-forensics/aide-0.15.1 b/metadata/md5-cache/app-forensics/aide-0.15.1
index e233496fee8f..902705022a8a 100644
--- a/metadata/md5-cache/app-forensics/aide-0.15.1
+++ b/metadata/md5-cache/app-forensics/aide-0.15.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=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 sec-policy/selinux-aide ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) nls? ( sys-devel/gettext ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 sec-policy/selinux-aide ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) nls? ( sys-devel/gettext ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire
 EAPI=3
 HOMEPAGE=http://aide.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!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 sec-policy/selinux-aide ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/aide/aide-0.15.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=63958c776b0cc922dac4af7751e26cc3
diff --git a/metadata/md5-cache/app-forensics/libewf-20121209 b/metadata/md5-cache/app-forensics/libewf-20121209
index b9565720e015..687ff15fbf69 100644
--- a/metadata/md5-cache/app-forensics/libewf-20121209
+++ b/metadata/md5-cache/app-forensics/libewf-20121209
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/e2fsprogs-libs sys-libs/zlib dev-libs/openssl
 SLOT=0
 SRC_URI=mirror://sourceforge/libewf/libewf-20121209.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e904d3bd8851ab60757bf177caec77e1
diff --git a/metadata/md5-cache/app-forensics/libewf-20130105 b/metadata/md5-cache/app-forensics/libewf-20130105
index 58a8f574e0af..34a1efe8ff48 100644
--- a/metadata/md5-cache/app-forensics/libewf-20130105
+++ b/metadata/md5-cache/app-forensics/libewf-20130105
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/zlib fuse? ( sys-fs/fuse ) uuid? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=http://libewf.googlecode.com/files/libewf-20130105.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bb34599f4567da1a30984f0c0a86ee71
diff --git a/metadata/md5-cache/app-forensics/libewf-20130120 b/metadata/md5-cache/app-forensics/libewf-20130120
index bea84ffa1ace..ccfe28c3fb6c 100644
--- a/metadata/md5-cache/app-forensics/libewf-20130120
+++ b/metadata/md5-cache/app-forensics/libewf-20130120
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/zlib fuse? ( sys-fs/fuse ) uuid? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib )
 SLOT=0/2
 SRC_URI=http://libewf.googlecode.com/files/libewf-20130120.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9519902928ad559a8cb71cb946670554
diff --git a/metadata/md5-cache/app-forensics/libewf-20130128 b/metadata/md5-cache/app-forensics/libewf-20130128
index b097e8ecb97b..7a5247b6ca5b 100644
--- a/metadata/md5-cache/app-forensics/libewf-20130128
+++ b/metadata/md5-cache/app-forensics/libewf-20130128
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/zlib fuse? ( sys-fs/fuse ) uuid? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib )
 SLOT=0/2
 SRC_URI=http://libewf.googlecode.com/files/libewf-20130128.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b5a7ab923b38476b712a30e5c1c8e912
diff --git a/metadata/md5-cache/app-forensics/libewf-20130303 b/metadata/md5-cache/app-forensics/libewf-20130303
index c0fc5233ef2a..076f340bf404 100644
--- a/metadata/md5-cache/app-forensics/libewf-20130303
+++ b/metadata/md5-cache/app-forensics/libewf-20130303
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/zlib fuse? ( sys-fs/fuse ) uuid? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib )
 SLOT=0/2
 SRC_URI=http://libewf.googlecode.com/files/libewf-20130303.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=80fdadf51c29890b5d7f58a438f8395e
diff --git a/metadata/md5-cache/app-forensics/libewf-20130331 b/metadata/md5-cache/app-forensics/libewf-20130331
index 63b4b98e78ad..f784453e4b8a 100644
--- a/metadata/md5-cache/app-forensics/libewf-20130331
+++ b/metadata/md5-cache/app-forensics/libewf-20130331
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/zlib fuse? ( sys-fs/fuse ) uuid? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib )
 SLOT=0/2
 SRC_URI=http://libewf.googlecode.com/files/libewf-20130331.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6f042f1a760bebd239ddefd17ff217fb
diff --git a/metadata/md5-cache/app-forensics/libewf-20130416 b/metadata/md5-cache/app-forensics/libewf-20130416
index adb50eda319b..7693bf0b918a 100644
--- a/metadata/md5-cache/app-forensics/libewf-20130416
+++ b/metadata/md5-cache/app-forensics/libewf-20130416
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/zlib fuse? ( sys-fs/fuse ) uuid? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib )
 SLOT=0/2
 SRC_URI=http://libewf.googlecode.com/files/libewf-20130416.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=40d8ea7e31bf660513241d67eea36f10
diff --git a/metadata/md5-cache/app-forensics/rdd-2.0.7 b/metadata/md5-cache/app-forensics/rdd-2.0.7
index c5f8b960f81f..f04b62155a29 100644
--- a/metadata/md5-cache/app-forensics/rdd-2.0.7
+++ b/metadata/md5-cache/app-forensics/rdd-2.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Rdd is a forensic copy program
 EAPI=1
 HOMEPAGE=http://www.sf.net/projects/rdd
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/rdd/rdd-2.0.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=7a059d583e73ce74b24c8628fb7715a1
diff --git a/metadata/md5-cache/app-forensics/rdd-3.0.4 b/metadata/md5-cache/app-forensics/rdd-3.0.4
index 18e8eb9d1b93..047b79f3f077 100644
--- a/metadata/md5-cache/app-forensics/rdd-3.0.4
+++ b/metadata/md5-cache/app-forensics/rdd-3.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=app-forensics/libewf x11-libs/gtk+:2 gnome-base/libglade:2.0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-forensics/libewf x11-libs/gtk+:2 gnome-base/libglade:2.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Rdd is a forensic copy program
 EAPI=5
 HOMEPAGE=http://www.sf.net/projects/rdd
@@ -10,5 +10,5 @@ RDEPEND=app-forensics/libewf x11-libs/gtk+:2 gnome-base/libglade:2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/rdd/rdd-3.0.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=000712cc4fd6d8173fea83d938fef514
diff --git a/metadata/md5-cache/app-forensics/sleuthkit-4.0.1 b/metadata/md5-cache/app-forensics/sleuthkit-4.0.1
index 8fae105fbb3a..d1f6a7ff54d9 100644
--- a/metadata/md5-cache/app-forensics/sleuthkit-4.0.1
+++ b/metadata/md5-cache/app-forensics/sleuthkit-4.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-db/sqlite:3 ewf? ( app-forensics/libewf ) aff? ( app-forensics/afflib ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-db/sqlite:3 ewf? ( app-forensics/libewf ) aff? ( app-forensics/afflib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A collection of file system and media management forensic analysis tools
 EAPI=5
 HOMEPAGE=http://www.sleuthkit.org/sleuthkit/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 IBM
 RDEPEND=dev-db/sqlite:3 ewf? ( app-forensics/libewf ) aff? ( app-forensics/afflib ) dev-perl/DateManip
 SLOT=0
 SRC_URI=mirror://sourceforge/sleuthkit/sleuthkit-4.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8794feaa3659c1ac1828c04108c4e90f
diff --git a/metadata/md5-cache/app-forensics/sleuthkit-4.0.2 b/metadata/md5-cache/app-forensics/sleuthkit-4.0.2
index 51c2a8b252e1..9c4216733f0c 100644
--- a/metadata/md5-cache/app-forensics/sleuthkit-4.0.2
+++ b/metadata/md5-cache/app-forensics/sleuthkit-4.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 IBM
 RDEPEND=dev-db/sqlite:3 ewf? ( app-forensics/libewf ) aff? ( app-forensics/afflib ) dev-perl/DateManip
 SLOT=0/9
 SRC_URI=mirror://sourceforge/sleuthkit/sleuthkit-4.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a04e55a1861894cd5e53f89b26fa1638
diff --git a/metadata/md5-cache/app-forensics/zzuf-0.13-r1 b/metadata/md5-cache/app-forensics/zzuf-0.13-r1
index eb9af5cfaf62..fa1349cb9faf 100644
--- a/metadata/md5-cache/app-forensics/zzuf-0.13-r1
+++ b/metadata/md5-cache/app-forensics/zzuf-0.13-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Transparent application input fuzzer
 EAPI=4
 HOMEPAGE=http://libcaca.zoy.org/wiki/zzuf/
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=76c83882de0666cc102df3b65b48a29f
diff --git a/metadata/md5-cache/app-i18n/enca-1.13-r2 b/metadata/md5-cache/app-i18n/enca-1.13-r2
index 1b8e39a3ad0b..56d0f561c2e1 100644
--- a/metadata/md5-cache/app-i18n/enca-1.13-r2
+++ b/metadata/md5-cache/app-i18n/enca-1.13-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=recode? ( >=app-text/recode-3.6_p15 )
 SLOT=0
 SRC_URI=http://dl.cihar.com/enca/enca-1.13.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8e74f4e7ed100a64624f8bf6c2c0cc8f
diff --git a/metadata/md5-cache/app-i18n/enca-1.13-r3 b/metadata/md5-cache/app-i18n/enca-1.13-r3
index a9e927fa8969..3bcc1a27cd84 100644
--- a/metadata/md5-cache/app-i18n/enca-1.13-r3
+++ b/metadata/md5-cache/app-i18n/enca-1.13-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=recode? ( >=app-text/recode-3.6_p15 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=recode? ( >=app-text/recode-3.6_p15 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ENCA detects the character coding of a file and converts it if desired
 EAPI=4
 HOMEPAGE=http://gitorious.org/enca
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=recode? ( >=app-text/recode-3.6_p15 )
 SLOT=0
 SRC_URI=http://dl.cihar.com/enca/enca-1.13.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7cac4d2934bef769651ebd4252a4e52a
diff --git a/metadata/md5-cache/app-i18n/enca-1.14 b/metadata/md5-cache/app-i18n/enca-1.14
index b8f64a6a04c4..d000eab9de8e 100644
--- a/metadata/md5-cache/app-i18n/enca-1.14
+++ b/metadata/md5-cache/app-i18n/enca-1.14
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=recode? ( >=app-text/recode-3.6_p15 )
 SLOT=0
 SRC_URI=http://dl.cihar.com/enca/enca-1.14.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=208e747a81afc97cd54858cf2bca9482
diff --git a/metadata/md5-cache/app-i18n/fbiterm-0.5-r2 b/metadata/md5-cache/app-i18n/fbiterm-0.5-r2
index 6760f6b1a33c..21564d249943 100644
--- a/metadata/md5-cache/app-i18n/fbiterm-0.5-r2
+++ b/metadata/md5-cache/app-i18n/fbiterm-0.5-r2
@@ -8,5 +8,5 @@ LICENSE=CPL-0.5
 RDEPEND=x11-libs/libXfont >=media-libs/freetype-2 x11-libs/libiterm-mbt sys-libs/zlib media-fonts/font-sony-misc media-fonts/unifont
 SLOT=0
 SRC_URI=http://www-124.ibm.com/linux/projects/iterm/releases/iterm-0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0b7a3bbd62a87b6eef8023cd2d01609f
diff --git a/metadata/md5-cache/app-i18n/fbterm-1.7 b/metadata/md5-cache/app-i18n/fbterm-1.7
index 948446f8f98b..4b8a071b8eb0 100644
--- a/metadata/md5-cache/app-i18n/fbterm-1.7
+++ b/metadata/md5-cache/app-i18n/fbterm-1.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap ) gpm? ( sys-libs/gpm ) video_cards_vesa? ( dev-libs/libx86 ) media-libs/fontconfig media-libs/freetype:2
 SLOT=0
 SRC_URI=http://fbterm.googlecode.com/files/fbterm-1.7.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2d0bbb298f13ffbfb8503057357fbfe0
diff --git a/metadata/md5-cache/app-i18n/fcitx-3.6.4 b/metadata/md5-cache/app-i18n/fcitx-3.6.4
index 5a13c278f0d4..dbfb19173c4d 100644
--- a/metadata/md5-cache/app-i18n/fcitx-3.6.4
+++ b/metadata/md5-cache/app-i18n/fcitx-3.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free Chinese Input Toy for X. Another Chinese XIM Input Method
 EAPI=2
 HOMEPAGE=http://www.fcitx.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://fcitx.googlecode.com/files/fcitx-3.6.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=98deb69545f983ec41b3cce932962206
diff --git a/metadata/md5-cache/app-i18n/ibus-1.4.1 b/metadata/md5-cache/app-i18n/ibus-1.4.1
index ed28cd294020..d75147e84d8b 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.4.1
+++ b/metadata/md5-cache/app-i18n/ibus-1.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=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 virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
 EAPI=4
 HOMEPAGE=http://code.google.com/p/ibus/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( gtk gtk3 X )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-1.4.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7dff66d2861eb996adcf11fc30bcaee5
diff --git a/metadata/md5-cache/app-i18n/ibus-1.4.2 b/metadata/md5-cache/app-i18n/ibus-1.4.2
index 914a1bb73c98..962d3250dae6 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.4.2
+++ b/metadata/md5-cache/app-i18n/ibus-1.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=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 virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
 EAPI=4
 HOMEPAGE=http://code.google.com/p/ibus/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( gtk gtk3 X )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-1.4.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9d634ee35fb66c454eb5a91077a8c340
diff --git a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.0 b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.0
index 0eabf694c517..2d049a6c59e9 100644
--- a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.0
+++ b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=app-i18n/ibus-1.5.0 app-i18n/anthy deprecated? ( >=dev-python/pygtk-2.15.2 ) nls? ( virtual/libintl ) dev-libs/gobject-introspection dev-util/intltool virtual/pkgconfig deprecated? ( dev-lang/swig ) nls? ( >=sys-devel/gettext-0.16.1 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=app-i18n/ibus-1.5.0 app-i18n/anthy deprecated? ( >=dev-python/pygtk-2.15.2 ) nls? ( virtual/libintl ) dev-libs/gobject-introspection dev-util/intltool virtual/pkgconfig deprecated? ( dev-lang/swig ) nls? ( >=sys-devel/gettext-0.16.1 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Japanese input method Anthy IMEngine for IBus Framework
 EAPI=5
 HOMEPAGE=http://code.google.com/p/ibus/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-i18n/ibus-1.5.0 app-i18n/anthy deprecated? ( >=dev-python/pygtk-2.15.2 ) nls? ( virtual/libintl ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-anthy-1.5.0.tar.gz https://raw.github.com/ibus/ibus-anthy/1.5.0/engine/anthy.i
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=43a0e2b430427a788fd6b95ffbb23678
diff --git a/metadata/md5-cache/app-i18n/ibus-fbterm-0.9.1 b/metadata/md5-cache/app-i18n/ibus-fbterm-0.9.1
index ab0b899a11d1..87e8f21066a0 100644
--- a/metadata/md5-cache/app-i18n/ibus-fbterm-0.9.1
+++ b/metadata/md5-cache/app-i18n/ibus-fbterm-0.9.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-i18n/ibus-1.4.1 app-i18n/fbterm
 SLOT=0
 SRC_URI=https://ibus-fbterm.googlecode.com/files/ibus-fbterm-0.9.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=001d028b32f667e042376a0bc432e199
diff --git a/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r1 b/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r1
index 5a5a3a73b73b..4f6896ea3705 100644
--- a/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r1
+++ b/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=dev-libs/glib x11-libs/pango >=x11-libs/gtk+-2.4:2 >=app-i18n/freewnn-1.1.1_alpha21-r1 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-libs/glib x11-libs/pango >=x11-libs/gtk+-2.4:2 >=app-i18n/freewnn-1.1.1_alpha21-r1 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Japanese FreeWnn input method module for GTK+2
 EAPI=1
 HOMEPAGE=http://bonobo.gnome.gr.jp/~nakai/immodule/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib x11-libs/pango >=x11-libs/gtk+-2.4:2 >=app-i18n/freewnn-1.1.1_alpha21-r1
 SLOT=0
 SRC_URI=http://bonobo.gnome.gr.jp/~nakai/immodule/im-freewnn-0.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d4b343e7a7495b0e74c3c428af4935f8
diff --git a/metadata/md5-cache/app-i18n/im-ja-1.5-r1 b/metadata/md5-cache/app-i18n/im-ja-1.5-r1
index e1df3f16e92f..97f3660988a3 100644
--- a/metadata/md5-cache/app-i18n/im-ja-1.5-r1
+++ b/metadata/md5-cache/app-i18n/im-ja-1.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config install postinst postrm preinst unpack
-DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 >=sys-apps/sed-4
+DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 >=sys-apps/sed-4
 DESCRIPTION=A Japanese input module for GTK2 and XIM
 EAPI=1
 HOMEPAGE=http://im-ja.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://im-ja.sourceforge.net/im-ja-1.5.tar.gz http://im-ja.sourceforge.net/old/im-ja-1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4a90215d8f771f992edc93c519f91a94
diff --git a/metadata/md5-cache/app-i18n/im-ja-1.5-r2 b/metadata/md5-cache/app-i18n/im-ja-1.5-r2
index b457014b3a37..902e81cc640b 100644
--- a/metadata/md5-cache/app-i18n/im-ja-1.5-r2
+++ b/metadata/md5-cache/app-i18n/im-ja-1.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=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-util/intltool dev-perl/URI virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 >=sys-apps/sed-4
+DEPEND=>=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-util/intltool dev-perl/URI virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 >=sys-apps/sed-4
 DESCRIPTION=A Japanese input module for GTK2 and XIM
 EAPI=3
 HOMEPAGE=http://im-ja.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://im-ja.sourceforge.net/im-ja-1.5.tar.gz http://im-ja.sourceforge.net/old/im-ja-1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5b9f43ccd129e8a7d5b71c1ce8882498
diff --git a/metadata/md5-cache/app-i18n/jfbterm-0.4.7-r4 b/metadata/md5-cache/app-i18n/jfbterm-0.4.7-r4
index bab4ca9f7f53..2e605324e6c1 100644
--- a/metadata/md5-cache/app-i18n/jfbterm-0.4.7-r4
+++ b/metadata/md5-cache/app-i18n/jfbterm-0.4.7-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=sys-libs/ncurses-5.6 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.6 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The J Framebuffer Terminal/Multilingual Enhancement with UTF-8 support
 HOMEPAGE=http://jfbterm.sourceforge.jp/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=media-fonts/unifont media-fonts/font-misc-misc media-fonts/intlfonts
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/jfbterm/13501/jfbterm-0.4.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=433dbd7ee8475e88469ae379a2502c44
diff --git a/metadata/md5-cache/app-i18n/libpinyin-0.8.0 b/metadata/md5-cache/app-i18n/libpinyin-0.8.0
index 15218cac0f6a..da384b5026da 100644
--- a/metadata/md5-cache/app-i18n/libpinyin-0.8.0
+++ b/metadata/md5-cache/app-i18n/libpinyin-0.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND==sys-libs/db-4* dev-libs/glib:2 virtual/libintl virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==sys-libs/db-4* dev-libs/glib:2 virtual/libintl virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for Chinese pinyin input methods
 EAPI=5
 HOMEPAGE=https://github.com/libpinyin/libpinyin
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==sys-libs/db-4* dev-libs/glib:2
 SLOT=0
 SRC_URI=mirror://github/libpinyin/libpinyin/libpinyin-lite-0.8.0.tar.gz -> libpinyin-0.8.0.tar mirror://github/libpinyin/libpinyin/model.text.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bcf073003fc5070fa5b68e2ffb1724b5
diff --git a/metadata/md5-cache/app-i18n/libtabe-0.2.6 b/metadata/md5-cache/app-i18n/libtabe-0.2.6
index 76f6ffb2ae6e..0c656fb99777 100644
--- a/metadata/md5-cache/app-i18n/libtabe-0.2.6
+++ b/metadata/md5-cache/app-i18n/libtabe-0.2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=sys-libs/db-4.5 x11-libs/libX11 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/db-4.5 x11-libs/libX11 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Libtabe provides bimsphone support for xcin-2.5+
 HOMEPAGE=http://packages.qa.debian.org/libt/libtabe.html
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=sys-libs/db-4.5 x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libt/libtabe/libtabe_0.2.6.orig.tar.gz mirror://debian/pool/main/libt/libtabe/libtabe_0.2.6-1.1.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f654d2969e722cb50b772590a0d2355a
diff --git a/metadata/md5-cache/app-i18n/libtabe-0.2.6.1.2 b/metadata/md5-cache/app-i18n/libtabe-0.2.6.1.2
index 0ebbe337238e..f42664521f4a 100644
--- a/metadata/md5-cache/app-i18n/libtabe-0.2.6.1.2
+++ b/metadata/md5-cache/app-i18n/libtabe-0.2.6.1.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=sys-libs/db-4.5 x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libt/libtabe/libtabe_0.2.6.orig.tar.gz mirror://debian/pool/main/libt/libtabe/libtabe_0.2.6-1.2.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=17ecee6d18d94216cb20fab3fdee5312
diff --git a/metadata/md5-cache/app-i18n/libtomoe-gtk-0.6.0-r1 b/metadata/md5-cache/app-i18n/libtomoe-gtk-0.6.0-r1
index 6cb9b3e9bc3e..7192fbf77838 100644
--- a/metadata/md5-cache/app-i18n/libtomoe-gtk-0.6.0-r1
+++ b/metadata/md5-cache/app-i18n/libtomoe-gtk-0.6.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=app-i18n/tomoe-0.6.0 >=dev-python/pygtk-2 >=dev-python/pygobject-2:2 gucharmap? ( >=gnome-extra/gucharmap-1.4.0 ) virtual/pkgconfig sys-devel/gettext doc? ( >=dev-util/gtk-doc-1.4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-i18n/tomoe-0.6.0 >=dev-python/pygtk-2 >=dev-python/pygobject-2:2 gucharmap? ( >=gnome-extra/gucharmap-1.4.0 ) virtual/pkgconfig sys-devel/gettext doc? ( >=dev-util/gtk-doc-1.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tomoe GTK+ interface widget library
 EAPI=2
 HOMEPAGE=http://tomoe.sourceforge.jp/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=app-i18n/tomoe-0.6.0 >=dev-python/pygtk-2 >=dev-python/pygobject-2:2 gucharmap? ( >=gnome-extra/gucharmap-1.4.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/tomoe/tomoe-gtk-0.6.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e6f708d6ac2ad504ab2c37d479400b62
diff --git a/metadata/md5-cache/app-i18n/libtomoe-gtk-0.6.0-r2 b/metadata/md5-cache/app-i18n/libtomoe-gtk-0.6.0-r2
index 6e57d708c700..eb74b9cb239e 100644
--- a/metadata/md5-cache/app-i18n/libtomoe-gtk-0.6.0-r2
+++ b/metadata/md5-cache/app-i18n/libtomoe-gtk-0.6.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=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 virtual/pkgconfig sys-devel/gettext doc? ( >=dev-util/gtk-doc-1.4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=>=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 virtual/pkgconfig sys-devel/gettext doc? ( >=dev-util/gtk-doc-1.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Tomoe GTK+ interface widget library
 EAPI=3
 HOMEPAGE=http://tomoe.sourceforge.jp/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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* )
 SLOT=0
 SRC_URI=mirror://sourceforge/tomoe/tomoe-gtk-0.6.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c8942b0ee8cbbaff9c3ee5afafd9dfae
diff --git a/metadata/md5-cache/app-i18n/man-pages-pl-20070628-r2 b/metadata/md5-cache/app-i18n/man-pages-pl-20070628-r2
index 796ed7db2719..486848ee7641 100644
--- a/metadata/md5-cache/app-i18n/man-pages-pl-20070628-r2
+++ b/metadata/md5-cache/app-i18n/man-pages-pl-20070628-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A collection of Polish translations of Linux manual pages.
 EAPI=4
 HOMEPAGE=http://www.batnet.pl/ptm/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.batnet.pl/ptm/man-PL28-06-2007.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=1e858eb1fc2c05e4862ca8cf0a48499c
diff --git a/metadata/md5-cache/app-i18n/man-pages-ru-3.27.2066.1435.20101003 b/metadata/md5-cache/app-i18n/man-pages-ru-3.27.2066.1435.20101003
index a66b0a8d0f4c..44ae8f7b7121 100644
--- a/metadata/md5-cache/app-i18n/man-pages-ru-3.27.2066.1435.20101003
+++ b/metadata/md5-cache/app-i18n/man-pages-ru-3.27.2066.1435.20101003
@@ -8,4 +8,4 @@ RDEPEND=virtual/man
 SLOT=0
 SRC_URI=mirror://sourceforge/man-pages-ru/man-pages-ru_3.27-2066-1435-20101003.tar.bz2
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4ef989415690baffd2f40f5327233522
+_md5_=17ee99d3e44954dfdfb4549d94a4a71a
diff --git a/metadata/md5-cache/app-i18n/man-pages-ru-3.41.2145.1724.20130102 b/metadata/md5-cache/app-i18n/man-pages-ru-3.41.2145.1724.20130102
index 029a9266f8cb..4f978b39529c 100644
--- a/metadata/md5-cache/app-i18n/man-pages-ru-3.41.2145.1724.20130102
+++ b/metadata/md5-cache/app-i18n/man-pages-ru-3.41.2145.1724.20130102
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=A collection of Russian translations of Linux manual pages
 EAPI=5
 HOMEPAGE=http://man-pages-ru.sourceforge.net/
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=FDL-1.3
 RDEPEND=virtual/man
 SLOT=0
 SRC_URI=mirror://sourceforge/man-pages-ru/man-pages-ru_3.41-2145-1724-20130102.tar.bz2
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6022786f5519419d7597541fe76a9811
+_md5_=2c4352ec6dc0880598b404d645173f1a
diff --git a/metadata/md5-cache/app-i18n/mecab-skkserv-0.03 b/metadata/md5-cache/app-i18n/mecab-skkserv-0.03
index ae345e5968fe..33208498ae94 100644
--- a/metadata/md5-cache/app-i18n/mecab-skkserv-0.03
+++ b/metadata/md5-cache/app-i18n/mecab-skkserv-0.03
@@ -8,5 +8,5 @@ LICENSE=GPL-2 ipadic
 RDEPEND=>=app-text/mecab-0.91 sys-apps/xinetd
 SLOT=0
 SRC_URI=http://chasen.org/~taku/software/mecab-skkserv/mecab-skkserv-0.03.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c495391db544f710649182fe0eee14ef
diff --git a/metadata/md5-cache/app-i18n/multiskkserv-20100128 b/metadata/md5-cache/app-i18n/multiskkserv-20100128
index e8bc825f6eaf..0e8d8f3863f8 100644
--- a/metadata/md5-cache/app-i18n/multiskkserv-20100128
+++ b/metadata/md5-cache/app-i18n/multiskkserv-20100128
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-arch/xz-utils dev-db/cdb test? ( app-i18n/nkf ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/xz-utils dev-db/cdb test? ( app-i18n/nkf ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=SKK server that handles multiple dictionaries
 EAPI=3
 HOMEPAGE=http://www3.big.or.jp/~sian/linux/products/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-i18n/skk-jisyo-200705[cdb] app-i18n/skk-jisyo-cdb )
 SLOT=0
 SRC_URI=http://www3.big.or.jp/~sian/linux/products/multiskkserv-20100128.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4b19c5bb39c4d6a5bcb33086e764420d
diff --git a/metadata/md5-cache/app-i18n/nabi-0.15 b/metadata/md5-cache/app-i18n/nabi-0.15
index 65cb8739d1bc..e88b17706f78 100644
--- a/metadata/md5-cache/app-i18n/nabi-0.15
+++ b/metadata/md5-cache/app-i18n/nabi-0.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=>=x11-libs/gtk+-2.2:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.2:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple Hanguk X Input Method
 EAPI=4
 HOMEPAGE=https://code.google.com/p/nabi/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.2:2
 SLOT=0
 SRC_URI=http://download.kldp.net/nabi/nabi-0.15.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3b94faa17b0fae8b25f28084a4cd5d51
diff --git a/metadata/md5-cache/app-i18n/nabi-0.17 b/metadata/md5-cache/app-i18n/nabi-0.17
index 982af8e5c249..f42ba0cd657b 100644
--- a/metadata/md5-cache/app-i18n/nabi-0.17
+++ b/metadata/md5-cache/app-i18n/nabi-0.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=>=x11-libs/gtk+-2.2:2 >=app-i18n/libhangul-0.0.4 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.2:2 >=app-i18n/libhangul-0.0.4 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple Hanguk X Input Method
 EAPI=4
 HOMEPAGE=https://code.google.com/p/nabi/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.2:2 >=app-i18n/libhangul-0.0.4
 SLOT=0
 SRC_URI=http://kldp.net/frs/download.php/3742/nabi-0.17.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ff527b022fdf97f642c3a218b5514676
diff --git a/metadata/md5-cache/app-i18n/nabi-0.99.3 b/metadata/md5-cache/app-i18n/nabi-0.99.3
index f64b06f9f188..5fd49a5c01f3 100644
--- a/metadata/md5-cache/app-i18n/nabi-0.99.3
+++ b/metadata/md5-cache/app-i18n/nabi-0.99.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=x11-libs/gtk+-2.4:2 >=app-i18n/libhangul-0.0.8 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.4:2 >=app-i18n/libhangul-0.0.8 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple Hanguk X Input Method
 EAPI=1
 HOMEPAGE=https://code.google.com/p/nabi/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.4:2 >=app-i18n/libhangul-0.0.8
 SLOT=0
 SRC_URI=http://kldp.net/frs/download.php/4929/nabi-0.99.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=633b2423d529af19721b60d7c0381200
diff --git a/metadata/md5-cache/app-i18n/prime-1.0.0.1-r2 b/metadata/md5-cache/app-i18n/prime-1.0.0.1-r2
index 12bb36ad86da..7db7e3fc6c7d 100644
--- a/metadata/md5-cache/app-i18n/prime-1.0.0.1-r2
+++ b/metadata/md5-cache/app-i18n/prime-1.0.0.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) 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.12:1.12 ) >=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 )
+DEPEND=ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Japanese PRedictive Input Method Editor
 EAPI=3
 HOMEPAGE=http://taiyaki.org/prime/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://prime.sourceforge.jp/src/prime-1.0.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bd29abc26d26939ceee4973471e572c6
diff --git a/metadata/md5-cache/app-i18n/pyzy-0.1.0 b/metadata/md5-cache/app-i18n/pyzy-0.1.0
index 24fd72798d50..79c4b0d8757f 100644
--- a/metadata/md5-cache/app-i18n/pyzy-0.1.0
+++ b/metadata/md5-cache/app-i18n/pyzy-0.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 dev-db/sqlite:3 sys-apps/util-linux boost? ( dev-libs/boost ) opencc? ( app-i18n/opencc ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 dev-db/sqlite:3 sys-apps/util-linux boost? ( dev-libs/boost ) opencc? ( app-i18n/opencc ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Chinese PinYin and Bopomofo conversion library
 EAPI=5
 HOMEPAGE=https://github.com/pyzy
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dev-db/sqlite:3 sys-apps/util-linux boost? ( dev-libs/bo
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pyzy.googlecode.com/files/pyzy-0.1.0.tar.gz https://pyzy.googlecode.com/files/pyzy-database-1.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0dc07ae20afbbfd9e637f61dab1a83fa
diff --git a/metadata/md5-cache/app-i18n/scim-1.4.14 b/metadata/md5-cache/app-i18n/scim-1.4.14
index 664481161619..bdd143d1bfc4 100644
--- a/metadata/md5-cache/app-i18n/scim-1.4.14
+++ b/metadata/md5-cache/app-i18n/scim-1.4.14
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 dev-libs/glib:2 gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-1.4.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f717b31767e6da9b95a9bbea083f045b
diff --git a/metadata/md5-cache/app-i18n/scim-1.4.9-r1 b/metadata/md5-cache/app-i18n/scim-1.4.9-r1
index 12e57659b714..6a1815daf56e 100644
--- a/metadata/md5-cache/app-i18n/scim-1.4.9-r1
+++ b/metadata/md5-cache/app-i18n/scim-1.4.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=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 virtual/pkgconfig >=dev-util/intltool-0.33 sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig >=dev-util/intltool-0.33 sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Smart Common Input Method (SCIM) is an Input Method (IM) development platform
 EAPI=2
 HOMEPAGE=http://www.scim-im.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-1.4.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e8d893f8c7ef22a2b5ee560932d4736d
diff --git a/metadata/md5-cache/app-i18n/scim-1.4.9-r2 b/metadata/md5-cache/app-i18n/scim-1.4.9-r2
index 1f4f378ba467..c05297a6735e 100644
--- a/metadata/md5-cache/app-i18n/scim-1.4.9-r2
+++ b/metadata/md5-cache/app-i18n/scim-1.4.9-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=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 virtual/pkgconfig >=dev-util/intltool-0.33 sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig >=dev-util/intltool-0.33 sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Smart Common Input Method (SCIM) is an Input Method (IM) development platform
 EAPI=3
 HOMEPAGE=http://www.scim-im.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-1.4.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f89f3c1d97abc4065a0d606dacbc1c6e
diff --git a/metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r2 b/metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r2
index d5fd433abe94..880ace183c18 100644
--- a/metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r2
+++ b/metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=app-i18n/scim-1.4.6 gtk? ( >=x11-libs/gtk+-2.2:2 >=x11-libs/pango-1.1 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 >=x11-libs/pango-1.1 ) virtual/pkgconfig dev-util/intltool doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=app-i18n/scim-1.4.6 gtk? ( >=x11-libs/gtk+-2.2:2 >=x11-libs/pango-1.1 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 >=x11-libs/pango-1.1 ) virtual/pkgconfig dev-util/intltool doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Yet another IM-client of SCIM
 EAPI=2
 HOMEPAGE=http://www.scim-im.org/projects/scim_bridge
@@ -10,5 +10,5 @@ RDEPEND=>=app-i18n/scim-1.4.6 gtk? ( >=x11-libs/gtk+-2.2:2 >=x11-libs/pango-1.1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-bridge-0.4.16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5d2a5fd4a3d8d110a50d31579f03b1ee
diff --git a/metadata/md5-cache/app-i18n/scim-hangul-0.4.0 b/metadata/md5-cache/app-i18n/scim-hangul-0.4.0
index ed1e53e82a3f..7e8b7eab071d 100644
--- a/metadata/md5-cache/app-i18n/scim-hangul-0.4.0
+++ b/metadata/md5-cache/app-i18n/scim-hangul-0.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 ) >=app-i18n/libhangul-0.0.4 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-hangul-0.4.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e4458386ad2b4d8171d325bfef44e16c
diff --git a/metadata/md5-cache/app-i18n/scim-input-pad-0.1.3 b/metadata/md5-cache/app-i18n/scim-input-pad-0.1.3
index a510e5d47669..f6faed12c13a 100644
--- a/metadata/md5-cache/app-i18n/scim-input-pad-0.1.3
+++ b/metadata/md5-cache/app-i18n/scim-input-pad-0.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=app-i18n/scim-1.2.0 >=x11-libs/gtk+-2.6.0:2 >=dev-util/intltool-0.33 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-i18n/scim-1.2.0 >=x11-libs/gtk+-2.6.0:2 >=dev-util/intltool-0.33 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Input pad for SCIM used to input symbols and special characters
 EAPI=4
 HOMEPAGE=http://www.scim-im.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-i18n/scim-1.2.0 >=x11-libs/gtk+-2.6.0:2
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-input-pad-0.1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=f2d075f0fefb72783edaea95299197df
diff --git a/metadata/md5-cache/app-i18n/scim-input-pad-0.1.3.1 b/metadata/md5-cache/app-i18n/scim-input-pad-0.1.3.1
index de4ba469f842..4aeca9114825 100644
--- a/metadata/md5-cache/app-i18n/scim-input-pad-0.1.3.1
+++ b/metadata/md5-cache/app-i18n/scim-input-pad-0.1.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=app-i18n/scim-1.2.0 >=x11-libs/gtk+-2.6.0:2 >=dev-util/intltool-0.33 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-i18n/scim-1.2.0 >=x11-libs/gtk+-2.6.0:2 >=dev-util/intltool-0.33 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Input pad for SCIM used to input symbols and special characters
 EAPI=4
 HOMEPAGE=http://www.scim-im.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-i18n/scim-1.2.0 >=x11-libs/gtk+-2.6.0:2
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-input-pad-0.1.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=72d98b77989e242323c696aa96b85758
diff --git a/metadata/md5-cache/app-i18n/scim-pinyin-0.5.91-r2 b/metadata/md5-cache/app-i18n/scim-pinyin-0.5.91-r2
index f9393fd6f497..7c3ee19eec3f 100644
--- a/metadata/md5-cache/app-i18n/scim-pinyin-0.5.91-r2
+++ b/metadata/md5-cache/app-i18n/scim-pinyin-0.5.91-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libXt || ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libXt || ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Smart Common Input Method (SCIM) Smart Pinyin Input Method
 HOMEPAGE=http://www.scim-im.org/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXt || ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-pinyin-0.5.91.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9886ff1833ffca179baecfa0dbbf8bac
diff --git a/metadata/md5-cache/app-i18n/scim-pinyin-0.5.91-r3 b/metadata/md5-cache/app-i18n/scim-pinyin-0.5.91-r3
index d756945d5ca4..e0710f4bd6f8 100644
--- a/metadata/md5-cache/app-i18n/scim-pinyin-0.5.91-r3
+++ b/metadata/md5-cache/app-i18n/scim-pinyin-0.5.91-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libXt || ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libXt || ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Smart Common Input Method (SCIM) Smart Pinyin Input Method
 HOMEPAGE=http://www.scim-im.org/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXt || ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-pinyin-0.5.91.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=72e5c82dab6cb6c7fcb91251c3909cf5
diff --git a/metadata/md5-cache/app-i18n/scim-pinyin-0.5.92 b/metadata/md5-cache/app-i18n/scim-pinyin-0.5.92
index 25a668648a52..eb4794c62b4f 100644
--- a/metadata/md5-cache/app-i18n/scim-pinyin-0.5.92
+++ b/metadata/md5-cache/app-i18n/scim-pinyin-0.5.92
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXt || ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-pinyin-0.5.92.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7529df4e72ccdf8a44c68def56f5cb6b
diff --git a/metadata/md5-cache/app-i18n/scim-prime-1.0.1-r1 b/metadata/md5-cache/app-i18n/scim-prime-1.0.1-r1
index a5137884a07f..a620e8948c12 100644
--- a/metadata/md5-cache/app-i18n/scim-prime-1.0.1-r1
+++ b/metadata/md5-cache/app-i18n/scim-prime-1.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-i18n/scim-1.0 >=app-i18n/prime-1.0.0 dev-libs/atk dev-libs/glib media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+ x11-libs/pango
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/scim-imengine/29156/scim-prime-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ea935b12a7ed393acba92f0f9ae671be
diff --git a/metadata/md5-cache/app-i18n/scim-tables-0.5.10 b/metadata/md5-cache/app-i18n/scim-tables-0.5.10
index a868dc5e2d35..079453636dbe 100644
--- a/metadata/md5-cache/app-i18n/scim-tables-0.5.10
+++ b/metadata/md5-cache/app-i18n/scim-tables-0.5.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup unpack
-DEPEND=>=app-i18n/scim-1.4.7-r2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-i18n/scim-1.4.7-r2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Smart Common Input Method (SCIM) Generic Table Input Method Server
 HOMEPAGE=http://www.scim-im.org/
 IUSE=nls linguas_am linguas_ar linguas_bn linguas_gu linguas_hi linguas_ja linguas_kn linguas_ko linguas_ml linguas_ne linguas_pa linguas_ru linguas_ta linguas_te linguas_th linguas_uk linguas_vi linguas_zh
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-i18n/scim-1.4.7-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-tables-0.5.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=07a01d3ef6d4c9db3f1a0039bfeb4ca1
diff --git a/metadata/md5-cache/app-i18n/scim-tables-0.5.11 b/metadata/md5-cache/app-i18n/scim-tables-0.5.11
index 1f6579c84a86..f5d4fd791db0 100644
--- a/metadata/md5-cache/app-i18n/scim-tables-0.5.11
+++ b/metadata/md5-cache/app-i18n/scim-tables-0.5.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup unpack
-DEPEND=>=app-i18n/scim-1.4.7-r2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-i18n/scim-1.4.7-r2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Smart Common Input Method (SCIM) Generic Table Input Method Server
 HOMEPAGE=http://www.scim-im.org/
 IUSE=nls linguas_am linguas_ar linguas_bn linguas_gu linguas_hi linguas_ja linguas_kn linguas_ko linguas_ml linguas_ne linguas_pa linguas_ru linguas_ta linguas_te linguas_th linguas_uk linguas_vi linguas_zh
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-i18n/scim-1.4.7-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-tables-0.5.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5ce639ee0b7e4e7da9d3e3a12678f8c2
diff --git a/metadata/md5-cache/app-i18n/scim-tables-0.5.12 b/metadata/md5-cache/app-i18n/scim-tables-0.5.12
index 6c83f336e289..df6d249fa4de 100644
--- a/metadata/md5-cache/app-i18n/scim-tables-0.5.12
+++ b/metadata/md5-cache/app-i18n/scim-tables-0.5.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup unpack
-DEPEND=>=app-i18n/scim-1.4.7-r2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-i18n/scim-1.4.7-r2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Smart Common Input Method (SCIM) Generic Table Input Method Server
 HOMEPAGE=http://www.scim-im.org/
 IUSE=nls linguas_am linguas_ar linguas_bn linguas_gu linguas_hi linguas_ja linguas_kn linguas_ko linguas_ml linguas_ne linguas_pa linguas_ru linguas_ta linguas_te linguas_th linguas_uk linguas_vi linguas_zh
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-i18n/scim-1.4.7-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-tables-0.5.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0777bf1028a02f3767843cb957820968
diff --git a/metadata/md5-cache/app-i18n/scim-tables-0.5.8-r1 b/metadata/md5-cache/app-i18n/scim-tables-0.5.8-r1
index 459852bf8ec3..c8ea3a316c3a 100644
--- a/metadata/md5-cache/app-i18n/scim-tables-0.5.8-r1
+++ b/metadata/md5-cache/app-i18n/scim-tables-0.5.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup unpack
-DEPEND=>=app-i18n/scim-1.4.7-r2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-i18n/scim-1.4.7-r2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Smart Common Input Method (SCIM) Generic Table Input Method Server
 HOMEPAGE=http://www.scim-im.org/
 IUSE=nls linguas_am linguas_ar linguas_bn linguas_gu linguas_hi linguas_ja linguas_kn linguas_ko linguas_ml linguas_ne linguas_pa linguas_ru linguas_ta linguas_te linguas_th linguas_uk linguas_vi linguas_zh
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-i18n/scim-1.4.7-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-tables-0.5.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=30748fc69eff852ea6059e9560591fd3
diff --git a/metadata/md5-cache/app-i18n/scim-wijesekera-0.3.3 b/metadata/md5-cache/app-i18n/scim-wijesekera-0.3.3
index ecd2beb07b34..7ca3bee6b50a 100644
--- a/metadata/md5-cache/app-i18n/scim-wijesekera-0.3.3
+++ b/metadata/md5-cache/app-i18n/scim-wijesekera-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=app-i18n/scim-0.99.8[-gtk3] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-i18n/scim-0.99.8[-gtk3] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Wijesekara keyboard for Sinhala input using scim
 EAPI=2
 HOMEPAGE=http://sinhala.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-i18n/scim-0.99.8[-gtk3]
 SLOT=0
 SRC_URI=http://sinhala.sourceforge.net/files/scim-wijesekera-0.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=c2e30361ebe260cecb271c19afccbda8
diff --git a/metadata/md5-cache/app-i18n/scim-wijesekera-0.3.3-r1 b/metadata/md5-cache/app-i18n/scim-wijesekera-0.3.3-r1
index 888da07b0ebe..fa6ec4cc4004 100644
--- a/metadata/md5-cache/app-i18n/scim-wijesekera-0.3.3-r1
+++ b/metadata/md5-cache/app-i18n/scim-wijesekera-0.3.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=app-i18n/scim-0.99.8[-gtk3] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-i18n/scim-0.99.8[-gtk3] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Wijesekara keyboard for Sinhala input using scim
 EAPI=2
 HOMEPAGE=http://sinhala.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-i18n/scim-0.99.8[-gtk3]
 SLOT=0
 SRC_URI=http://sinhala.sourceforge.net/files/scim-wijesekera-0.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4c92fdc5135715fc53414d79d142e106
diff --git a/metadata/md5-cache/app-i18n/tomoe-0.6.0-r1 b/metadata/md5-cache/app-i18n/tomoe-0.6.0-r1
index adea77e54e6b..363467c9b28e 100644
--- a/metadata/md5-cache/app-i18n/tomoe-0.6.0-r1
+++ b/metadata/md5-cache/app-i18n/tomoe-0.6.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig doc? ( dev-util/gtk-doc ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig doc? ( dev-util/gtk-doc ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Japanese handwriting recognition engine
 EAPI=3
 HOMEPAGE=http://tomoe.sourceforge.jp/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.4 ruby? ( dev-ruby/ruby-glib2 ) hyperestraier? ( app-t
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/tomoe/tomoe-0.6.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f7f154c856ee142b1c325488683efbf3
diff --git a/metadata/md5-cache/app-i18n/uim-1.7.3 b/metadata/md5-cache/app-i18n/uim-1.7.3
index f2723da2cfc2..948eda7b6dd3 100644
--- a/metadata/md5-cache/app-i18n/uim-1.7.3
+++ b/metadata/md5-cache/app-i18n/uim-1.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=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? ( dev-qt/qtgui: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 virtual/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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? ( dev-qt/qtgui: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 virtual/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple, secure and flexible input method library
 EAPI=4
 HOMEPAGE=http://code.google.com/p/uim/
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk? ( X ) qt4? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://uim.googlecode.com/files/uim-1.7.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=53fd4c314f5f56057e29a6ca2c18b9f9
diff --git a/metadata/md5-cache/app-i18n/uim-1.7.3-r1 b/metadata/md5-cache/app-i18n/uim-1.7.3-r1
index 34fb72f63f66..428aeb70f0be 100644
--- a/metadata/md5-cache/app-i18n/uim-1.7.3-r1
+++ b/metadata/md5-cache/app-i18n/uim-1.7.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=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? ( dev-qt/qtgui: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 virtual/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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? ( dev-qt/qtgui: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 virtual/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple, secure and flexible input method library
 EAPI=4
 HOMEPAGE=http://code.google.com/p/uim/
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk? ( X ) qt4? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://uim.googlecode.com/files/uim-1.7.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=90ce9598e4bc1bc953317d2b2773b6c0
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.0 b/metadata/md5-cache/app-i18n/uim-1.8.0
index dc627970e05e..937e7d443614 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.0
+++ b/metadata/md5-cache/app-i18n/uim-1.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=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? ( dev-qt/qtgui: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 virtual/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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? ( dev-qt/qtgui: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 virtual/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple, secure and flexible input method library
 EAPI=4
 HOMEPAGE=http://code.google.com/p/uim/
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk? ( X ) qt4? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://uim.googlecode.com/files/uim-1.8.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cd94ddb631a8eae3dc46bfa3a5058fa1
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.0-r1 b/metadata/md5-cache/app-i18n/uim-1.8.0-r1
index 426b4198808a..b6c4095f9b65 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.0-r1
+++ b/metadata/md5-cache/app-i18n/uim-1.8.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=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? ( dev-qt/qtgui: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 virtual/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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? ( dev-qt/qtgui: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 virtual/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple, secure and flexible input method library
 EAPI=4
 HOMEPAGE=http://code.google.com/p/uim/
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk? ( X ) qt4? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://uim.googlecode.com/files/uim-1.8.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=360edd51b169a56b72f0b431eacea75a
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.2 b/metadata/md5-cache/app-i18n/uim-1.8.2
index 6a08a766183a..682a556449e0 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.2
+++ b/metadata/md5-cache/app-i18n/uim-1.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=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? ( dev-qt/qtgui: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 virtual/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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? ( dev-qt/qtgui: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 virtual/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple, secure and flexible input method library
 EAPI=4
 HOMEPAGE=http://code.google.com/p/uim/
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk? ( X ) qt4? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://uim.googlecode.com/files/uim-1.8.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d4f4d19d9731dab0c0c0db02375bede5
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.2-r1 b/metadata/md5-cache/app-i18n/uim-1.8.2-r1
index 149bee4e6788..7da5f036847e 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.2-r1
+++ b/metadata/md5-cache/app-i18n/uim-1.8.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=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? ( dev-qt/qtgui: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 virtual/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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? ( dev-qt/qtgui: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 virtual/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple, secure and flexible input method library
 EAPI=4
 HOMEPAGE=http://code.google.com/p/uim/
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk? ( X ) qt4? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://uim.googlecode.com/files/uim-1.8.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b84cc5aff61ce54cdf5d8c0ef0173dbf
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.3 b/metadata/md5-cache/app-i18n/uim-1.8.3
index 3fd35b82aadd..71aee287bdf3 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.3
+++ b/metadata/md5-cache/app-i18n/uim-1.8.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=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? ( dev-qt/qtgui: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 virtual/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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? ( dev-qt/qtgui: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 virtual/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple, secure and flexible input method library
 EAPI=4
 HOMEPAGE=http://code.google.com/p/uim/
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk? ( X ) qt4? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://uim.googlecode.com/files/uim-1.8.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=357805ed5d254163579bf106c1f42012
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.3-r1 b/metadata/md5-cache/app-i18n/uim-1.8.3-r1
index e0ad2f7fffa2..c82410838739 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.3-r1
+++ b/metadata/md5-cache/app-i18n/uim-1.8.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=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? ( dev-qt/qtgui: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 virtual/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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? ( dev-qt/qtgui: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 virtual/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple, secure and flexible input method library
 EAPI=4
 HOMEPAGE=http://code.google.com/p/uim/
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk? ( X ) qt4? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://uim.googlecode.com/files/uim-1.8.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e3b3043840e9078310e280acda45cacf
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.4 b/metadata/md5-cache/app-i18n/uim-1.8.4
index 39738fe39f53..b45acfd0fbee 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.4
+++ b/metadata/md5-cache/app-i18n/uim-1.8.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=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? ( dev-qt/qtgui: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 virtual/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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? ( dev-qt/qtgui: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 virtual/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple, secure and flexible input method library
 EAPI=4
 HOMEPAGE=http://code.google.com/p/uim/
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk? ( X ) qt4? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://uim.googlecode.com/files/uim-1.8.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5befbd2a2bcc43563fd68a2234b6351a
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.4-r1 b/metadata/md5-cache/app-i18n/uim-1.8.4-r1
index f1975153374b..506a91a04189 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.4-r1
+++ b/metadata/md5-cache/app-i18n/uim-1.8.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=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? ( dev-qt/qtgui: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 virtual/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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? ( dev-qt/qtgui: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 virtual/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple, secure and flexible input method library
 EAPI=4
 HOMEPAGE=http://code.google.com/p/uim/
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk? ( X ) qt4? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://uim.googlecode.com/files/uim-1.8.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dd2c6ee3f380e355b8f4d245d2897b6e
diff --git a/metadata/md5-cache/app-i18n/x-unikey-1.0.4-r1 b/metadata/md5-cache/app-i18n/x-unikey-1.0.4-r1
index 752608bb476f..2b527c7383f3 100644
--- a/metadata/md5-cache/app-i18n/x-unikey-1.0.4-r1
+++ b/metadata/md5-cache/app-i18n/x-unikey-1.0.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE gtk? ( >=x11-libs/gtk+-2.2:2 ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE gtk? ( >=x11-libs/gtk+-2.2:2 ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Vietnamese X Input Method
 EAPI=1
 HOMEPAGE=http://www.unikey.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE gtk? ( >=x11-libs/gtk+-2.2:2 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/unikey/x-unikey-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2b7405c65d75ac666b961860725edc24
diff --git a/metadata/md5-cache/app-i18n/xcin-2.5.3_pre3-r2 b/metadata/md5-cache/app-i18n/xcin-2.5.3_pre3-r2
index 17d8a736a26a..e1d65d8d8d9c 100644
--- a/metadata/md5-cache/app-i18n/xcin-2.5.3_pre3-r2
+++ b/metadata/md5-cache/app-i18n/xcin-2.5.3_pre3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=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.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Chinese X Input Method
 HOMEPAGE=http://cle.linux.org.tw/xcin/
 IUSE=debug nls unicode
@@ -8,5 +8,5 @@ LICENSE=XCIN GPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c28467ce3b1627ea8941b53a27ca30a4
diff --git a/metadata/md5-cache/app-i18n/xcin-2.5.3_pre3-r3 b/metadata/md5-cache/app-i18n/xcin-2.5.3_pre3-r3
index 31ce07d79469..9379212083a8 100644
--- a/metadata/md5-cache/app-i18n/xcin-2.5.3_pre3-r3
+++ b/metadata/md5-cache/app-i18n/xcin-2.5.3_pre3-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Chinese X Input Method
 EAPI=4
 HOMEPAGE=http://cle.linux.org.tw/xcin/
@@ -9,5 +9,5 @@ LICENSE=XCIN GPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=70cc215576cbb3c79b2e6f6f171dcb1c
diff --git a/metadata/md5-cache/app-i18n/zhcon-0.2.6-r2 b/metadata/md5-cache/app-i18n/zhcon-0.2.6-r2
index 50400a5dc375..199b0f0cdb39 100644
--- a/metadata/md5-cache/app-i18n/zhcon-0.2.6-r2
+++ b/metadata/md5-cache/app-i18n/zhcon-0.2.6-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ggi? ( media-libs/libggi[X] ) gpm? ( sys-libs/gpm )
 SLOT=0
 SRC_URI=mirror://sourceforge/zhcon/zhcon-0.2.5.tar.gz mirror://sourceforge/zhcon/zhcon-0.2.5-to-0.2.6.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e832c007b4cebcdd80cade3a5c6ab144
diff --git a/metadata/md5-cache/app-i18n/zinnia-0.06-r1 b/metadata/md5-cache/app-i18n/zinnia-0.06-r1
index b21ad2798b71..ac49d34ad4e2 100644
--- a/metadata/md5-cache/app-i18n/zinnia-0.06-r1
+++ b/metadata/md5-cache/app-i18n/zinnia-0.06-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl[-build] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl[-build] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Online hand recognition system with machine learning
 EAPI=3
 HOMEPAGE=http://zinnia.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://sourceforge/zinnia/zinnia-0.06.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d1d7e911795c5e92e5f9a857aa0f9373
diff --git a/metadata/md5-cache/app-laptop/dispad-0.3 b/metadata/md5-cache/app-laptop/dispad-0.3
index 2818f6fa09eb..b51701cfd41d 100644
--- a/metadata/md5-cache/app-laptop/dispad-0.3
+++ b/metadata/md5-cache/app-laptop/dispad-0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=x11-libs/libX11 x11-libs/libXi dev-libs/confuse || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 x11-libs/libXi dev-libs/confuse || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Daemon to disable trackpads while typing
 EAPI=4
 HOMEPAGE=https://github.com/BlueDragonX/dispad
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXi dev-libs/confuse
 SLOT=0
 SRC_URI=https://github.com/BlueDragonX/dispad/tarball/v0.3 -> dispad-0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=e1c71bdef05cec15b4d0e444486ce2b6
diff --git a/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r3 b/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r3
index 91bb319d71b0..de0fef388983 100644
--- a/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r3
+++ b/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=macbook? ( sys-libs/libsmbios sys-apps/pciutils ) >=dev-libs/glib-2.6 doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=macbook? ( sys-libs/libsmbios sys-apps/pciutils ) >=dev-libs/glib-2.6 doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Handles power management and special keys on laptops.
 HOMEPAGE=http://pbbuttons.berlios.de
 IUSE=acpi alsa debug doc ibam macbook oss
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0 ) >=dev-libs/glib-2.6
 SLOT=0
 SRC_URI=mirror://sourceforge/pbbuttons/pbbuttonsd-0.8.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=091a763555a834532f2eaafc66539ceb
diff --git a/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r4 b/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r4
index cb148f0bb987..bf9f20292789 100644
--- a/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r4
+++ b/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=macbook? ( sys-libs/libsmbios sys-apps/pciutils ) >=dev-libs/glib-2.6 doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=macbook? ( sys-libs/libsmbios sys-apps/pciutils ) >=dev-libs/glib-2.6 doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Handles power management and special keys on laptops.
 HOMEPAGE=http://pbbuttons.berlios.de
 IUSE=acpi alsa debug doc ibam macbook oss
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0 ) >=dev-libs/glib-2.6
 SLOT=0
 SRC_URI=mirror://sourceforge/pbbuttons/pbbuttonsd-0.8.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=03b7370d7ff0f78951652ddef7fa56dd
diff --git a/metadata/md5-cache/app-misc/bb-1.3.0_rc1-r2 b/metadata/md5-cache/app-misc/bb-1.3.0_rc1-r2
index c0d2a7f72656..2b31dba46bfe 100644
--- a/metadata/md5-cache/app-misc/bb-1.3.0_rc1-r2
+++ b/metadata/md5-cache/app-misc/bb-1.3.0_rc1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=postinst prepare
-DEPEND=media-libs/aalib mikmod? ( media-libs/libmikmod ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/aalib mikmod? ( media-libs/libmikmod ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Demonstration program for visual effects of aalib
 EAPI=4
 HOMEPAGE=http://aa-project.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/aalib mikmod? ( media-libs/libmikmod )
 SLOT=0
 SRC_URI=mirror://sourceforge/aa-project/bb-1.3rc1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=254c1ada7d394f8ec4dfab17a6d4a4bd
diff --git a/metadata/md5-cache/app-misc/cmatrix-1.2a-r1 b/metadata/md5-cache/app-misc/cmatrix-1.2a-r1
index 0d49a4216460..dd5563543dd7 100644
--- a/metadata/md5-cache/app-misc/cmatrix-1.2a-r1
+++ b/metadata/md5-cache/app-misc/cmatrix-1.2a-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst unpack
-DEPEND=X? ( x11-apps/mkfontdir ) sys-libs/ncurses || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=X? ( x11-apps/mkfontdir ) sys-libs/ncurses || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An ncurses based app to show a scrolling screen from the Matrix
 HOMEPAGE=http://www.asty.org/cmatrix
 IUSE=X
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( x11-apps/mkfontdir ) sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.asty.org/cmatrix/dist/cmatrix-1.2a.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a1a7c8b0ab115ecaf9151b7c0f5318b7
diff --git a/metadata/md5-cache/app-misc/cstream-3.0.0 b/metadata/md5-cache/app-misc/cstream-3.0.0
index 97f01a35efc2..eecf8eeae5d8 100644
--- a/metadata/md5-cache/app-misc/cstream-3.0.0
+++ b/metadata/md5-cache/app-misc/cstream-3.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=general-purpose stream-handling tool like UNIX dd
 EAPI=2
 HOMEPAGE=http://www.cons.org/cracauer/cstream.html
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://www.cons.org/cracauer/download/cstream-3.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=9f790658773e6da51f39aff7e4aecf61
diff --git a/metadata/md5-cache/app-misc/cstream-3.1.1 b/metadata/md5-cache/app-misc/cstream-3.1.1
index c46c85ff2060..63c9d0be28c0 100644
--- a/metadata/md5-cache/app-misc/cstream-3.1.1
+++ b/metadata/md5-cache/app-misc/cstream-3.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=general-purpose stream-handling tool like UNIX dd
 EAPI=5
 HOMEPAGE=http://www.cons.org/cracauer/cstream.html
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://www.cons.org/cracauer/download/cstream-3.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2fa0fe0c864f742d581c00999ddb0b32
diff --git a/metadata/md5-cache/app-misc/cwiid-20110107-r1 b/metadata/md5-cache/app-misc/cwiid-20110107-r1
index b26f2379af08..30ada4658dd2 100644
--- a/metadata/md5-cache/app-misc/cwiid-20110107-r1
+++ b/metadata/md5-cache/app-misc/cwiid-20110107-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=virtual/awk sys-apps/sed sys-devel/bison >=sys-devel/flex-2.5.35 virtual/pkgconfig kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/awk sys-apps/sed sys-devel/bison >=sys-devel/flex-2.5.35 virtual/pkgconfig kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library, input driver, and utilities for the Nintendo Wiimote
 EAPI=3
 HOMEPAGE=http://abstrakraft.org/cwiid
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-wireless/bluez x11-libs/gtk+:2 python? ( >=dev-lang/python-2.4 ) kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~lxnay/cwiid/cwiid-20110107.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=df3b6bb3d97f7cdb8c392f68ec7b60fb
diff --git a/metadata/md5-cache/app-misc/ddccontrol-0.3-r1 b/metadata/md5-cache/app-misc/ddccontrol-0.3-r1
index d86b1371f0b2..218565f836f2 100644
--- a/metadata/md5-cache/app-misc/ddccontrol-0.3-r1
+++ b/metadata/md5-cache/app-misc/ddccontrol-0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=DDCControl allows control of monitor parameters via DDC
 EAPI=1
 HOMEPAGE=http://ddccontrol.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=mirror://sourceforge/ddccontrol/ddccontrol-0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f47914c5044a6de682da2c3afa9ee31d
diff --git a/metadata/md5-cache/app-misc/ddccontrol-0.3-r2 b/metadata/md5-cache/app-misc/ddccontrol-0.3-r2
index 13fbd8abdb88..df9a7d8d06a2 100644
--- a/metadata/md5-cache/app-misc/ddccontrol-0.3-r2
+++ b/metadata/md5-cache/app-misc/ddccontrol-0.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=DDCControl allows control of monitor parameters via DDC
 EAPI=1
 HOMEPAGE=http://ddccontrol.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=mirror://sourceforge/ddccontrol/ddccontrol-0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0dcd020ad1a73aa51b18537112d56989
diff --git a/metadata/md5-cache/app-misc/ddccontrol-0.4.2 b/metadata/md5-cache/app-misc/ddccontrol-0.4.2
index 3c6245f2f7de..bc2e42c1676f 100644
--- a/metadata/md5-cache/app-misc/ddccontrol-0.4.2
+++ b/metadata/md5-cache/app-misc/ddccontrol-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=DDCControl allows control of monitor parameters via DDC
 EAPI=1
 HOMEPAGE=http://ddccontrol.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=mirror://sourceforge/ddccontrol/ddccontrol-0.4.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=889339cd55254ddf4ee4b819de5e856a
diff --git a/metadata/md5-cache/app-misc/ddccontrol-0.4.2-r1 b/metadata/md5-cache/app-misc/ddccontrol-0.4.2-r1
index e335dcf6fc00..2f48e28bf487 100644
--- a/metadata/md5-cache/app-misc/ddccontrol-0.4.2-r1
+++ b/metadata/md5-cache/app-misc/ddccontrol-0.4.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=DDCControl allows control of monitor parameters via DDC
 EAPI=4
 HOMEPAGE=http://ddccontrol.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=mirror://sourceforge/ddccontrol/ddccontrol-0.4.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b03397e89ccdc5cec883a4a8caaf0c73
diff --git a/metadata/md5-cache/app-misc/devtodo-0.1.20 b/metadata/md5-cache/app-misc/devtodo-0.1.20
index 60a11122eb60..5abf354accaf 100644
--- a/metadata/md5-cache/app-misc/devtodo-0.1.20
+++ b/metadata/md5-cache/app-misc/devtodo-0.1.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A nice command line todo list for developers
 EAPI=3
 HOMEPAGE=http://swapoff.org/DevTodo
@@ -10,5 +10,5 @@ PDEPEND=bash-completion? ( app-shells/bash-completion )
 RDEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 bash-completion? ( app-admin/eselect )
 SLOT=0
 SRC_URI=http://swapoff.org/files/devtodo/devtodo-0.1.20.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion	003731da0df19d26955927bd534f3058	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion	003731da0df19d26955927bd534f3058	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e0ca6b68ec8e94856d0569c52b3c9ef9
diff --git a/metadata/md5-cache/app-misc/devtodo-0.1.20-r1 b/metadata/md5-cache/app-misc/devtodo-0.1.20-r1
index a6c4fb093bef..16a44d374b1c 100644
--- a/metadata/md5-cache/app-misc/devtodo-0.1.20-r1
+++ b/metadata/md5-cache/app-misc/devtodo-0.1.20-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A nice command line todo list for developers
 EAPI=5
 HOMEPAGE=http://swapoff.org/DevTodo
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1
 SLOT=0
 SRC_URI=http://swapoff.org/files/devtodo/devtodo-0.1.20.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f2a325e9e18ee0e26fd637c8aa77889f
diff --git a/metadata/md5-cache/app-misc/evtest-1.29 b/metadata/md5-cache/app-misc/evtest-1.29
index 1daa508796e7..f49d68b12cb1 100644
--- a/metadata/md5-cache/app-misc/evtest-1.29
+++ b/metadata/md5-cache/app-misc/evtest-1.29
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=xml? ( dev-libs/libxml2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=xml? ( dev-libs/libxml2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=test program for capturing input device events
 EAPI=4
 HOMEPAGE=http://cgit.freedesktop.org/evtest/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=xml? ( dev-libs/libxml2 )
 SLOT=0
 SRC_URI=http://cgit.freedesktop.org/evtest/snapshot/evtest-1.29.tar.bz2 mirror://gentoo/evtest-1.29-mans.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9218921b9cf3dd67ece225b1d699fae7
diff --git a/metadata/md5-cache/app-misc/evtest-1.30 b/metadata/md5-cache/app-misc/evtest-1.30
index 583c7e61a558..96f61f34fd81 100644
--- a/metadata/md5-cache/app-misc/evtest-1.30
+++ b/metadata/md5-cache/app-misc/evtest-1.30
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=xml? ( dev-libs/libxml2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=xml? ( dev-libs/libxml2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=test program for capturing input device events
 EAPI=4
 HOMEPAGE=http://cgit.freedesktop.org/evtest/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=xml? ( dev-libs/libxml2 )
 SLOT=0
 SRC_URI=http://cgit.freedesktop.org/evtest/snapshot/evtest-evtest-1.30.tar.gz -> evtest-1.30.tar.gz mirror://gentoo/evtest-1.30-mans.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=70a7369a6a9c12751512186349915750
diff --git a/metadata/md5-cache/app-misc/g15daemon-9999 b/metadata/md5-cache/app-misc/g15daemon-9999
index ac30d5daa59e..a94af6b020cc 100644
--- a/metadata/md5-cache/app-misc/g15daemon-9999
+++ b/metadata/md5-cache/app-misc/g15daemon-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=virtual/libusb:0 >=dev-libs/libg15-9999 >=dev-libs/libg15render-9999 perl? ( dev-lang/perl dev-perl/GDGraph >=dev-perl/Inline-0.4 ) python? ( dev-lang/python ) || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/libusb:0 >=dev-libs/libg15-9999 >=dev-libs/libg15render-9999 perl? ( dev-lang/perl dev-perl/GDGraph >=dev-perl/Inline-0.4 ) python? ( dev-lang/python ) || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=G15daemon takes control of the G15 keyboard, through the linux kernel uinput device driver
 EAPI=4
 HOMEPAGE=http://g15daemon.sourceforge.net/
@@ -7,5 +7,5 @@ IUSE=perl python static-libs
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 >=dev-libs/libg15-9999 >=dev-libs/libg15render-9999 perl? ( dev-lang/perl dev-perl/GDGraph >=dev-perl/Inline-0.4 ) python? ( dev-lang/python )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4fdb58f44932c68087137c6bc7fd9942
diff --git a/metadata/md5-cache/app-misc/g15mpd-1.0.0 b/metadata/md5-cache/app-misc/g15mpd-1.0.0
index d60aec860042..0886b28cf8cd 100644
--- a/metadata/md5-cache/app-misc/g15mpd-1.0.0
+++ b/metadata/md5-cache/app-misc/g15mpd-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MPD (music player daemon) plugin to G15daemon
 EAPI=2
 HOMEPAGE=http://g15daemon.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://sourceforge/g15daemon/g15mpd-1.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1827d7e8e0e544e3e4e216d69f9d175c
diff --git a/metadata/md5-cache/app-misc/geneweb-6.07 b/metadata/md5-cache/app-misc/geneweb-6.07
index f3cc6597a128..ec3bcf9a0778 100644
--- a/metadata/md5-cache/app-misc/geneweb-6.07
+++ b/metadata/md5-cache/app-misc/geneweb-6.07
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/ocaml[ocamlopt?] dev-ml/camlp5
 SLOT=0
-SRC_URI=http://opensource.geneanet.org/attachments/download/211/gw-6.07-src.tgz http://dev.gentoo.org/~tupone/geneweb-6.07-reduce-utf8.ml.patch.gz
+SRC_URI=http://opensource.geneanet.org/attachments/download/240/gw-6.07-src.tgz http://dev.gentoo.org/~tupone/geneweb-6.07-reduce-utf8.ml.patch.gz
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0360407ef2c92c25d54937cf7946d97a
+_md5_=871ab09d158bd1d243eeab19dc9334c4
diff --git a/metadata/md5-cache/app-misc/gentoo-0.19.13 b/metadata/md5-cache/app-misc/gentoo-0.19.13
index 701eee981c0d..b5243961c733 100644
--- a/metadata/md5-cache/app-misc/gentoo-0.19.13
+++ b/metadata/md5-cache/app-misc/gentoo-0.19.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A modern GTK+ based filemanager for any WM
 EAPI=4
 HOMEPAGE=http://www.obsession.se/gentoo/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.24:2 >=dev-libs/glib-2 x11-libs/gdk-pixbuf x11-libs/pango
 SLOT=0
 SRC_URI=mirror://sourceforge/gentoo/gentoo-0.19.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fb98640a144856856aca931e56d94489
diff --git a/metadata/md5-cache/app-misc/geoclue-0.12.0_p20110307 b/metadata/md5-cache/app-misc/geoclue-0.12.0_p20110307
index d84dfc31dcc9..e19a66f5c772 100644
--- a/metadata/md5-cache/app-misc/geoclue-0.12.0_p20110307
+++ b/metadata/md5-cache/app-misc/geoclue-0.12.0_p20110307
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A geoinformation D-Bus service
 EAPI=4
 HOMEPAGE=http://freedesktop.org/wiki/Software/GeoClue
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 gnome-base/gconf sky
 REQUIRED_USE=skyhook? ( networkmanager )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~signals/geoclue-0.12.0_p20110307.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=00674c6a210cf9a21413eff226603a55
diff --git a/metadata/md5-cache/app-misc/geoclue-0.12.99 b/metadata/md5-cache/app-misc/geoclue-0.12.99
index 5291662c093d..b6949f0c28aa 100644
--- a/metadata/md5-cache/app-misc/geoclue-0.12.99
+++ b/metadata/md5-cache/app-misc/geoclue-0.12.99
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2 dev-libs/libxml2 sys-apps/dbus gps? ( sci-geosciences/gpsd ) gtk? ( x11-libs/gtk+:2 ) networkmanager? ( net-misc/networkmanager ) skyhook? ( net-libs/libsoup ) dev-util/gtk-doc dev-util/gtk-doc-am virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2 dev-libs/libxml2 sys-apps/dbus gps? ( sci-geosciences/gpsd ) gtk? ( x11-libs/gtk+:2 ) networkmanager? ( net-misc/networkmanager ) skyhook? ( net-libs/libsoup ) dev-util/gtk-doc dev-util/gtk-doc-am virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A geoinformation D-Bus service
 EAPI=4
 HOMEPAGE=http://freedesktop.org/wiki/Software/GeoClue
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2 dev-libs/libxml2 sys-apps/d
 REQUIRED_USE=skyhook? ( networkmanager )
 SLOT=0
 SRC_URI=http://freedesktop.org/~hadess/geoclue-0.12.99.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e23bc9bed265af93f741e92e5e5ba9e2
diff --git a/metadata/md5-cache/app-misc/gramps-3.4.3 b/metadata/md5-cache/app-misc/gramps-3.4.3
index bbed4747e003..7f69b5e9b234 100644
--- a/metadata/md5-cache/app-misc/gramps-3.4.3
+++ b/metadata/md5-cache/app-misc/gramps-3.4.3
@@ -4,10 +4,10 @@ DESCRIPTION=Genealogical Research and Analysis Management Programming System
 EAPI=3
 HOMEPAGE=http://www.gramps-project.org/
 IUSE=gnome reports spell webkit
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-python/bsddb3 >=dev-python/pygtk-2.16.0 dev-python/pygoocanvas x11-misc/xdg-utils gnome-base/librsvg:2 gnome? ( dev-python/libgnome-python dev-python/gconf-python ) spell? ( dev-python/gtkspell-python ) reports? ( media-gfx/graphviz ) webkit? ( dev-python/pywebkitgtk ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=mirror://sourceforge/gramps/Stable/3.4.3/gramps-3.4.3.tar.gz
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1f7c5f357b49e8690d5d696fe05501d4
+_md5_=d512fe789de504dc8ffbe4006f94b449
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.2-r2 b/metadata/md5-cache/app-misc/hivex-1.3.2-r2
index f83a33f7164f..c8b6ac937359 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.2-r2
+++ b/metadata/md5-cache/app-misc/hivex-1.3.2-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4a90cb74474bb762184c862897b222d7
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.5-r1 b/metadata/md5-cache/app-misc/hivex-1.3.5-r1
index ed70c8561821..8cbfacf78c6d 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.5-r1
+++ b/metadata/md5-cache/app-misc/hivex-1.3.5-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a354c36fe1efd551edc059e43f6b04d7
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.6 b/metadata/md5-cache/app-misc/hivex-1.3.6
index 3e3db9387e0c..7b94766969a8 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.6
+++ b/metadata/md5-cache/app-misc/hivex-1.3.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8b5f51af6c2cc147f32fd88bba0c002a
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.6-r1 b/metadata/md5-cache/app-misc/hivex-1.3.6-r1
index ba77ac852612..f59d4a0ee26b 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.6-r1
+++ b/metadata/md5-cache/app-misc/hivex-1.3.6-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0a2c155eeea3e685fc4270c17382d197
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.6-r2 b/metadata/md5-cache/app-misc/hivex-1.3.6-r2
index e8725e32c488..f5f486fb273c 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.6-r2
+++ b/metadata/md5-cache/app-misc/hivex-1.3.6-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=643bac6b9c482d6290dd4b63f42338ec
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.7 b/metadata/md5-cache/app-misc/hivex-1.3.7
index 68201ed12319..106ec75f9739 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.7
+++ b/metadata/md5-cache/app-misc/hivex-1.3.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3a9ac0cf70904e5590d358d1846d3b57
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.7-r1 b/metadata/md5-cache/app-misc/hivex-1.3.7-r1
index ee62a05b72c0..807f5643f41d 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.7-r1
+++ b/metadata/md5-cache/app-misc/hivex-1.3.7-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a1fab3323df5c3fbe1ac63efa66c9ad6
diff --git a/metadata/md5-cache/app-misc/kanatest-0.4.8 b/metadata/md5-cache/app-misc/kanatest-0.4.8
index 3bb223ae0c85..0866662e8060 100644
--- a/metadata/md5-cache/app-misc/kanatest-0.4.8
+++ b/metadata/md5-cache/app-misc/kanatest-0.4.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=>=x11-libs/gtk+-2.12:2 dev-libs/libxml2:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.12:2 dev-libs/libxml2:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Visual flashcard tool for memorizing the Japanese Hiragana and Katakana alphabet
 EAPI=1
 HOMEPAGE=http://www.clayo.org/kanatest
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.12:2 dev-libs/libxml2:2
 SLOT=0
 SRC_URI=http://www.clayo.org/kanatest/kanatest-0.4.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dc82da56f3235eebd51c204b76e92064
diff --git a/metadata/md5-cache/app-misc/klavaro-1.9.6 b/metadata/md5-cache/app-misc/klavaro-1.9.6
index aad444510c2f..b0e999bb7ccb 100644
--- a/metadata/md5-cache/app-misc/klavaro-1.9.6
+++ b/metadata/md5-cache/app-misc/klavaro-1.9.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-misc/curl x11-libs/gtk+:2 x11-libs/gtkdatabox sys-devel/gettext || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-misc/curl x11-libs/gtk+:2 x11-libs/gtkdatabox sys-devel/gettext || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Another free touch typing tutor program
 EAPI=5
 HOMEPAGE=http://klavaro.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/curl x11-libs/gtk+:2 x11-libs/gtkdatabox
 SLOT=0
 SRC_URI=mirror://sourceforge/klavaro/klavaro-1.9.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ab09fe34c6d884564c7de204163e8766
diff --git a/metadata/md5-cache/app-misc/lcd4linux-0.10.1_rc2-r2 b/metadata/md5-cache/app-misc/lcd4linux-0.10.1_rc2-r2
index d0d712194828..fe4984f74307 100644
--- a/metadata/md5-cache/app-misc/lcd4linux-0.10.1_rc2-r2
+++ b/metadata/md5-cache/app-misc/lcd4linux-0.10.1_rc2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql ) iconv? ( virtual/libiconv ) mpd? ( media-libs/libmpd ) lcd_devices_bwct? ( =virtual/libusb-0* ) lcd_devices_g15? ( =virtual/libusb-0* ) lcd_devices_lcd2usb? ( =virtual/libusb-0* ) lcd_devices_picolcd? ( =virtual/libusb-0* ) lcd_devices_trefon? ( =virtual/libusb-0* ) lcd_devices_usbhub? ( =virtual/libusb-0* ) lcd_devices_usblcd? ( =virtual/libusb-0* ) lcd_devices_luise? ( dev-libs/luise-bin ) lcd_devices_ncurses? ( sys-libs/ncurses ) lcd_devices_noritake? ( media-libs/gd ) lcd_devices_t6963? ( media-libs/gd ) lcd_devices_png? ( media-libs/libpng media-libs/gd ) lcd_devices_X? ( x11-libs/libX11 media-libs/gd ) lcd_devices_serdisplib? ( dev-libs/serdisplib media-libs/gd ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://gentoo/lcd4linux-0.10.1-RC2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8023c836b80763e49e4d06fcb6808f4a
diff --git a/metadata/md5-cache/app-misc/lcdproc-0.5.2-r1 b/metadata/md5-cache/app-misc/lcdproc-0.5.2-r1
index 749b60191b5f..9008604eea98 100644
--- a/metadata/md5-cache/app-misc/lcdproc-0.5.2-r1
+++ b/metadata/md5-cache/app-misc/lcdproc-0.5.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=usb? ( =virtual/libusb-0* ) lirc? ( app-misc/lirc ) irman? ( media-libs/libirman ) lcd_devices_graphlcd? ( app-misc/graphlcd-base app-misc/glcdprocdriver ) lcd_devices_g15? ( dev-libs/libg15 >=dev-libs/libg15render-1.1.1 ) lcd_devices_ncurses? ( sys-libs/ncurses ) lcd_devices_svga? ( media-libs/svgalib ) lcd_devices_ula200? ( >=dev-embedded/libftdi-0.7 =virtual/libusb-0* ) lcd_devices_xosd? ( x11-libs/xosd x11-libs/libX11 x11-libs/libXext ) lcd_devices_cfontzpacket? ( =virtual/libusb-0* ) lcd_devices_cwlinux? ( =virtual/libusb-0* ) lcd_devices_pyramid? ( =virtual/libusb-0* ) lcd_devices_picolcd? ( =virtual/libusb-0* ) lcd_devices_g15? ( app-misc/g15daemon )
 SLOT=0
 SRC_URI=mirror://sourceforge/lcdproc/lcdproc-0.5.2.tar.gz mirror://gentoo/lcdproc-0.5.2-patches.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2645624bfeb6079a6d1d44e3b1b0adeb
diff --git a/metadata/md5-cache/app-misc/lirc-0.9.0-r2 b/metadata/md5-cache/app-misc/lirc-0.9.0-r2
index 9d4fe96db069..d6215dc7a903 100644
--- a/metadata/md5-cache/app-misc/lirc-0.9.0-r2
+++ b/metadata/md5-cache/app-misc/lirc-0.9.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=decode and send infra-red signals of many commonly used remote controls
 EAPI=4
 HOMEPAGE=http://www.lirc.org/
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_
 REQUIRED_USE=lirc_devices_all? ( !lirc_devices_userspace !lirc_devices_accent !lirc_devices_act200l !lirc_devices_act220l !lirc_devices_adaptec !lirc_devices_alsa_usb !lirc_devices_animax !lirc_devices_asusdh !lirc_devices_atilibusb !lirc_devices_atiusb !lirc_devices_audio !lirc_devices_audio_alsa !lirc_devices_avermedia !lirc_devices_avermedia_vdomate !lirc_devices_avermedia98 !lirc_devices_awlibusb !lirc_devices_bestbuy !lirc_devices_bestbuy2 !lirc_devices_breakoutbox !lirc_devices_bte !lirc_devices_bw6130 !lirc_devices_caraca !lirc_devices_chronos !lirc_devices_commandir !lirc_devices_cph06x !lirc_devices_creative !lirc_devices_creative_infracd !lirc_devices_devinput !lirc_devices_digimatrix !lirc_devices_dsp !lirc_devices_dvico !lirc_devices_ea65 !lirc_devices_ene0100 !lirc_devices_exaudio !lirc_devices_flyvideo !lirc_devices_ftdi !lirc_devices_gvbctv5pci !lirc_devices_hauppauge !lirc_devices_hauppauge_dvb !lirc_devices_hercules_smarttv_stereo !lirc_devices_i2cuser !lirc_devices_igorplugusb !lirc_devices_iguanaIR !lirc_devices_imon !lirc_devices_imon_24g !lirc_devices_imon_knob !lirc_devices_imon_lcd !lirc_devices_imon_pad !lirc_devices_imon_rsc !lirc_devices_irdeo !lirc_devices_irdeo_remote !lirc_devices_irlink !lirc_devices_irman !lirc_devices_irreal !lirc_devices_it87 !lirc_devices_ite8709 !lirc_devices_knc_one !lirc_devices_kworld !lirc_devices_leadtek_0007 !lirc_devices_leadtek_0010 !lirc_devices_leadtek_pvr2000 !lirc_devices_livedrive_midi !lirc_devices_livedrive_seq !lirc_devices_logitech !lirc_devices_macmini !lirc_devices_mediafocusI !lirc_devices_mouseremote !lirc_devices_mouseremote_ps2 !lirc_devices_mp3anywhere !lirc_devices_mplay !lirc_devices_nslu2 !lirc_devices_packard_bell !lirc_devices_parallel !lirc_devices_pcmak !lirc_devices_pcmak_usb !lirc_devices_pctv !lirc_devices_pixelview_bt878 !lirc_devices_pixelview_pak !lirc_devices_pixelview_pro !lirc_devices_provideo !lirc_devices_realmagic !lirc_devices_remotemaster !lirc_devices_sa1100 !lirc_devices_samsung !lirc_devices_sasem !lirc_devices_sb0540 !lirc_devices_serial !lirc_devices_silitek !lirc_devices_sir !lirc_devices_slinke !lirc_devices_streamzap !lirc_devices_tekram !lirc_devices_tekram_bt829 !lirc_devices_tira !lirc_devices_ttusbir !lirc_devices_tuxbox !lirc_devices_tvbox !lirc_devices_udp !lirc_devices_uirt2 !lirc_devices_uirt2_raw !lirc_devices_usb_uirt_raw !lirc_devices_usbx !lirc_devices_wpc8769l !lirc_devices_serial_igor_cesko !lirc_devices_remote_wonder_plus !lirc_devices_xboxusb !lirc_devices_usbirboy !lirc_devices_inputlirc )
 SLOT=0
 SRC_URI=mirror://sourceforge/lirc/lirc-0.9.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6fd6d308abf51b9a9be80194544f0925
diff --git a/metadata/md5-cache/app-misc/mc-9999 b/metadata/md5-cache/app-misc/mc-9999
index 66ebeb1b2e1e..7a923372f541 100644
--- a/metadata/md5-cache/app-misc/mc-9999
+++ b/metadata/md5-cache/app-misc/mc-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check ) dev-vcs/cvs dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check ) dev-vcs/cvs dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU Midnight Commander is a text based file manager
 EAPI=4
 HOMEPAGE=http://www.midnight-commander.org
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
 REQUIRED_USE=spell? ( edit )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8eb1e2945340c129f115a586b447ca8a
diff --git a/metadata/md5-cache/app-misc/muttprint-0.73 b/metadata/md5-cache/app-misc/muttprint-0.73
index 662d021c13aa..60cf1e3504bc 100644
--- a/metadata/md5-cache/app-misc/muttprint-0.73
+++ b/metadata/md5-cache/app-misc/muttprint-0.73
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/latex-base
 SLOT=0
 SRC_URI=mirror://sourceforge/muttprint/muttprint-0.73.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=849ded386cee1febf28490dd80efd869
diff --git a/metadata/md5-cache/app-misc/muttprint-0.73-r1 b/metadata/md5-cache/app-misc/muttprint-0.73-r1
index 1c6d087110f9..6b749bd087b3 100644
--- a/metadata/md5-cache/app-misc/muttprint-0.73-r1
+++ b/metadata/md5-cache/app-misc/muttprint-0.73-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/latex-base dev-texlive/texlive-latexextra
 SLOT=0
 SRC_URI=mirror://sourceforge/muttprint/muttprint-0.73.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=612d5705587a970c1fbb9a1b59964b7d
diff --git a/metadata/md5-cache/app-misc/screen-4.0.3-r6 b/metadata/md5-cache/app-misc/screen-4.0.3-r6
index bdeb124bb723..da0aba39f3da 100644
--- a/metadata/md5-cache/app-misc/screen-4.0.3-r6
+++ b/metadata/md5-cache/app-misc/screen-4.0.3-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Full-screen window manager that multiplexes physical terminals between several processes
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/screen/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen )
 SLOT=0
 SRC_URI=ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-4.0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c9f67c068b4b68ed5390aa058b1f294e
diff --git a/metadata/md5-cache/app-misc/screen-4.0.3-r7 b/metadata/md5-cache/app-misc/screen-4.0.3-r7
index 62e9f371b80c..24945f35af9b 100644
--- a/metadata/md5-cache/app-misc/screen-4.0.3-r7
+++ b/metadata/md5-cache/app-misc/screen-4.0.3-r7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Full-screen window manager that multiplexes physical terminals between several processes
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/screen/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen )
 SLOT=0
 SRC_URI=ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-4.0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c806edf7c8f49d000ce2e5fbe19b4e12
diff --git a/metadata/md5-cache/app-misc/screen-4.0.3-r8 b/metadata/md5-cache/app-misc/screen-4.0.3-r8
index be0e089108bf..b71e054d66a6 100644
--- a/metadata/md5-cache/app-misc/screen-4.0.3-r8
+++ b/metadata/md5-cache/app-misc/screen-4.0.3-r8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Full-screen window manager that multiplexes physical terminals between several processes
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/screen/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) >=sys-apps/openrc-0.11.6
 SLOT=0
 SRC_URI=ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-4.0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7ed327b871eb69247f6113db424ef944
diff --git a/metadata/md5-cache/app-misc/screen-9999 b/metadata/md5-cache/app-misc/screen-9999
index 6b709285c24e..adc2deebc2e2 100644
--- a/metadata/md5-cache/app-misc/screen-9999
+++ b/metadata/md5-cache/app-misc/screen-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) sys-apps/texinfo || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) sys-apps/texinfo || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Full-screen window manager that multiplexes physical terminals between several processes
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/screen/
@@ -7,5 +7,5 @@ IUSE=debug nethack pam selinux multiuser
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) >=sys-apps/openrc-0.11.6
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=77b22fe2c0d0834cf55c881cceb70152
diff --git a/metadata/md5-cache/app-misc/slmon-0.5.13 b/metadata/md5-cache/app-misc/slmon-0.5.13
index 2108ecca956f..7c051f35568d 100644
--- a/metadata/md5-cache/app-misc/slmon-0.5.13
+++ b/metadata/md5-cache/app-misc/slmon-0.5.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 sys-libs/slang gnome-base/libgtop virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 sys-libs/slang gnome-base/libgtop virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Colored text-based system performance monitor
 EAPI=2
 HOMEPAGE=http://slmon.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 sys-libs/slang gnome-base/libgtop
 SLOT=0
 SRC_URI=mirror://sourceforge/slmon/slmon-0.5.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=54d6384a510b889fd44b4572b67cf17f
diff --git a/metadata/md5-cache/app-misc/sphinx-0.9.9 b/metadata/md5-cache/app-misc/sphinx-0.9.9
index e35f9692c933..ad1d14ab69aa 100644
--- a/metadata/md5-cache/app-misc/sphinx-0.9.9
+++ b/metadata/md5-cache/app-misc/sphinx-0.9.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) test? ( dev-lang/php ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) test? ( dev-lang/php ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Full-text search engine with support for MySQL and PostgreSQL
 EAPI=2
 HOMEPAGE=http://www.sphinxsearch.com/
@@ -10,5 +10,5 @@ RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://sphinxsearch.com/downloads/sphinx-0.9.9.tar.gz stemmer? ( mirror://gentoo/libstemmer_c-20091122.tgz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6d63c5e33f3ceac5921b3d4d475018b3
diff --git a/metadata/md5-cache/app-misc/sphinx-2.0.4 b/metadata/md5-cache/app-misc/sphinx-2.0.4
index ed3c9d5a4231..e177920b4947 100644
--- a/metadata/md5-cache/app-misc/sphinx-2.0.4
+++ b/metadata/md5-cache/app-misc/sphinx-2.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv test? ( dev-lang/php ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv test? ( dev-lang/php ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Full-text search engine with support for MySQL and PostgreSQL
 EAPI=4
 HOMEPAGE=http://www.sphinxsearch.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv
 SLOT=0
 SRC_URI=http://sphinxsearch.com/files/sphinx-2.0.4-release.tar.gz stemmer? ( mirror://gentoo/libstemmer_c-20091122.tgz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5afa4307a2c2457df4169c6e3f9522c8
diff --git a/metadata/md5-cache/app-misc/sphinx-2.0.4-r1 b/metadata/md5-cache/app-misc/sphinx-2.0.4-r1
index f47f21531318..eb1992525c34 100644
--- a/metadata/md5-cache/app-misc/sphinx-2.0.4-r1
+++ b/metadata/md5-cache/app-misc/sphinx-2.0.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv test? ( dev-lang/php ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv test? ( dev-lang/php ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Full-text search engine with support for MySQL and PostgreSQL
 EAPI=4
 HOMEPAGE=http://www.sphinxsearch.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv
 SLOT=0
 SRC_URI=http://sphinxsearch.com/files/sphinx-2.0.4-release.tar.gz stemmer? ( mirror://gentoo/libstemmer_c-20091122.tgz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2c12bbcd2aee1ec4dde9d54212b7ae6e
diff --git a/metadata/md5-cache/app-misc/sphinx-2.0.5 b/metadata/md5-cache/app-misc/sphinx-2.0.5
index 22672baafdbb..0ef9b2624e8e 100644
--- a/metadata/md5-cache/app-misc/sphinx-2.0.5
+++ b/metadata/md5-cache/app-misc/sphinx-2.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv test? ( dev-lang/php ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv test? ( dev-lang/php ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Full-text search engine with support for MySQL and PostgreSQL
 EAPI=4
 HOMEPAGE=http://www.sphinxsearch.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv
 SLOT=0
 SRC_URI=http://sphinxsearch.com/files/sphinx-2.0.5-release.tar.gz stemmer? ( mirror://gentoo/libstemmer_c-20091122.tgz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bdabe2b29b5d8bd38d4eebf9fc7f60c6
diff --git a/metadata/md5-cache/app-misc/sphinx-2.0.6 b/metadata/md5-cache/app-misc/sphinx-2.0.6
index 5880241c264c..b0fc981c674f 100644
--- a/metadata/md5-cache/app-misc/sphinx-2.0.6
+++ b/metadata/md5-cache/app-misc/sphinx-2.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv test? ( dev-lang/php ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv test? ( dev-lang/php ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Full-text search engine with support for MySQL and PostgreSQL
 EAPI=4
 HOMEPAGE=http://www.sphinxsearch.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv
 SLOT=0
 SRC_URI=http://sphinxsearch.com/files/sphinx-2.0.6-release.tar.gz stemmer? ( mirror://gentoo/libstemmer_c-20091122.tgz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f3f353f5c085a7ffc05625550f6140f3
diff --git a/metadata/md5-cache/app-misc/srm-1.2.11-r2 b/metadata/md5-cache/app-misc/srm-1.2.11-r2
index 98d86e368d2b..1dbb1fab55ce 100644
--- a/metadata/md5-cache/app-misc/srm-1.2.11-r2
+++ b/metadata/md5-cache/app-misc/srm-1.2.11-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst prepare
-DEPEND=!app-misc/secure-delete sys-kernel/linux-headers || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!app-misc/secure-delete sys-kernel/linux-headers || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A command-line compatible rm which destroys file contents before unlinking.
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/srm/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://sourceforge/srm/srm-1.2.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0c77bafcd914f9d4374e9ca92938300e
diff --git a/metadata/md5-cache/app-misc/tablix-0.3.5-r1 b/metadata/md5-cache/app-misc/tablix-0.3.5-r1
index dec4b70645eb..c61e0e3139bc 100644
--- a/metadata/md5-cache/app-misc/tablix-0.3.5-r1
+++ b/metadata/md5-cache/app-misc/tablix-0.3.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/libxml2-2.4.3 pvm? ( sys-cluster/pvm ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libxml2-2.4.3 pvm? ( sys-cluster/pvm ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tablix is a powerful free software kernel for solving general timetabling problems.
 EAPI=2
 HOMEPAGE=http://www.tablix.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.4.3 pvm? ( sys-cluster/pvm )
 SLOT=0
 SRC_URI=http://www.tablix.org/releases/stable/tablix2-0.3.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4b6c759f29b66e041b86f81d8d31fcc8
diff --git a/metadata/md5-cache/app-misc/tmux-1.7-r3 b/metadata/md5-cache/app-misc/tmux-1.7-r3
index 989fe549c4c0..5cc9cf74851b 100644
--- a/metadata/md5-cache/app-misc/tmux-1.7-r3
+++ b/metadata/md5-cache/app-misc/tmux-1.7-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/libevent-2.0.10 sys-libs/ncurses virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libevent-2.0.10 sys-libs/ncurses virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Terminal multiplexer
 EAPI=5
 HOMEPAGE=http://tmux.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=>=dev-libs/libevent-2.0.10 sys-libs/ncurses vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/tmux/tmux-1.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=565c95947843d3d0964454f9fca11277
diff --git a/metadata/md5-cache/app-misc/tmux-1.8 b/metadata/md5-cache/app-misc/tmux-1.8
index f57b93a69763..363243c5dfb8 100644
--- a/metadata/md5-cache/app-misc/tmux-1.8
+++ b/metadata/md5-cache/app-misc/tmux-1.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/libevent-2.0.10 sys-libs/ncurses virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libevent-2.0.10 sys-libs/ncurses virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Terminal multiplexer
 EAPI=5
 HOMEPAGE=http://tmux.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=>=dev-libs/libevent-2.0.10 sys-libs/ncurses vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/tmux/tmux-1.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2846ed55c7440d5b2af57b195144c4d9
diff --git a/metadata/md5-cache/app-misc/tmux-9999 b/metadata/md5-cache/app-misc/tmux-9999
index 328bc0519795..7d762e7f710e 100644
--- a/metadata/md5-cache/app-misc/tmux-9999
+++ b/metadata/md5-cache/app-misc/tmux-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=dev-libs/libevent-2.0.10 sys-libs/ncurses virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=dev-libs/libevent-2.0.10 sys-libs/ncurses virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Terminal multiplexer
 EAPI=4
 HOMEPAGE=http://tmux.sourceforge.net
@@ -7,5 +7,5 @@ IUSE=debug vim-syntax
 LICENSE=ISC
 RDEPEND=>=dev-libs/libevent-2.0.10 sys-libs/ncurses vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=e0e0323b47a67d4991a4cfbddf55b944
diff --git a/metadata/md5-cache/app-misc/tomboy-1.10.1 b/metadata/md5-cache/app-misc/tomboy-1.10.1
index 5f04fc8c5980..77e728e0b3d6 100644
--- a/metadata/md5-cache/app-misc/tomboy-1.10.1
+++ b/metadata/md5-cache/app-misc/tomboy-1.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=app-text/gtkspell:2 dev-dotnet/gconf-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-lang/mono dev-libs/atk gnome-base/gconf:2 x11-libs/gtk+:2 eds? ( dev-libs/gmime:2.6[mono] ) app-text/gnome-doc-utils app-text/rarian dev-util/intltool virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=app-text/gtkspell:2 dev-dotnet/gconf-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-lang/mono dev-libs/atk gnome-base/gconf:2 x11-libs/gtk+:2 eds? ( dev-libs/gmime:2.6[mono] ) app-text/gnome-doc-utils app-text/rarian dev-util/intltool virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Desktop note-taking application
 EAPI=4
 HOMEPAGE=http://projects.gnome.org/tomboy/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-text/gtkspell:2 dev-dotnet/gconf-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-lang/mono dev-libs/atk gnome-base/gconf:2 x11-libs/gtk+:2 eds? ( dev-libs/gmime:2.6[mono] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/tomboy/1.10/tomboy-1.10.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e03319203dcb5ef48bdb96152ba942fd
diff --git a/metadata/md5-cache/app-misc/tomboy-1.12.2 b/metadata/md5-cache/app-misc/tomboy-1.12.2
index c1aa470adff2..76573e5f468f 100644
--- a/metadata/md5-cache/app-misc/tomboy-1.12.2
+++ b/metadata/md5-cache/app-misc/tomboy-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-text/gtkspell:2 dev-dotnet/gconf-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-lang/mono dev-libs/atk:= gnome-base/gconf:2 x11-libs/gtk+:2 eds? ( dev-libs/gmime:2.6[mono] ) app-text/gnome-doc-utils app-text/rarian dev-util/intltool virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=app-text/gtkspell:2 dev-dotnet/gconf-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-lang/mono dev-libs/atk:= gnome-base/gconf:2 x11-libs/gtk+:2 eds? ( dev-libs/gmime:2.6[mono] ) app-text/gnome-doc-utils app-text/rarian dev-util/intltool virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Desktop note-taking application
 EAPI=5
 HOMEPAGE=http://projects.gnome.org/tomboy/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-text/gtkspell:2 dev-dotnet/gconf-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-lang/mono dev-libs/atk:= gnome-base/gconf:2 x11-libs/gtk+:2 eds? ( dev-libs/gmime:2.6[mono] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/tomboy/1.12/tomboy-1.12.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=224d6e15f4b93b68552ffe6c5d738838
diff --git a/metadata/md5-cache/app-misc/tracker-9999 b/metadata/md5-cache/app-misc/tracker-9999
index 8a91bb673104..5cccec8b4d71 100644
--- a/metadata/md5-cache/app-misc/tracker-9999
+++ b/metadata/md5-cache/app-misc/tracker-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.35.1: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:0= >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) 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 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.13 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.0.2:= ) jpeg? ( virtual/jpeg:0 ) laptop? ( >=sys-power/upower-0.9 ) libsecret? ( >=app-crypt/libsecret-0.5 ) 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-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xine? ( >=media-libs/xine-lib-1 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk? ( >=dev-libs/libgee-0.3 ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) doc? ( >=dev-util/gtk-doc-1.8 media-gfx/graphviz ) || ( dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.35.1: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:0= >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) 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 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.13 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.0.2:= ) jpeg? ( virtual/jpeg:0 ) laptop? ( >=sys-power/upower-0.9 ) libsecret? ( >=app-crypt/libsecret-0.5 ) 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-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xine? ( >=media-libs/xine-lib-1 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk? ( >=dev-libs/libgee-0.3 ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) doc? ( >=dev-util/gtk-doc-1.8 media-gfx/graphviz ) || ( dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A tagging metadata database, search tool and indexer
 EAPI=5
 HOMEPAGE=http://projects.gnome.org/tracker/
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.35.1: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:0= >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) 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 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.13 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.0.2:= ) jpeg? ( virtual/jpeg:0 ) laptop? ( >=sys-power/upower-0.9 ) libsecret? ( >=app-crypt/libsecret-0.5 ) 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-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xine? ( >=media-libs/xine-lib-1 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
 REQUIRED_USE=^^ ( gstreamer xine ) cue? ( gstreamer ) upnp-av? ( gstreamer ) !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
 SLOT=0/16
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=876925b63bf0afffb5cf47ea72af8c55
diff --git a/metadata/md5-cache/app-misc/uptimed-0.3.16-r6 b/metadata/md5-cache/app-misc/uptimed-0.3.16-r6
index 05d55e102b8a..0b225dc048f8 100644
--- a/metadata/md5-cache/app-misc/uptimed-0.3.16-r6
+++ b/metadata/md5-cache/app-misc/uptimed-0.3.16-r6
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install postinst setup unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=System uptime record daemon that keeps track of your highest uptimes
 HOMEPAGE=http://podgorny.cz/uptimed
 KEYWORDS=alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://podgorny.cz/uptimed/releases/uptimed-0.3.16.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=39b182c980d27e13f47f3b07b518ca56
diff --git a/metadata/md5-cache/app-misc/uptimed-0.3.17-r1 b/metadata/md5-cache/app-misc/uptimed-0.3.17-r1
index 313f8944ae23..1801fd1a852e 100644
--- a/metadata/md5-cache/app-misc/uptimed-0.3.17-r1
+++ b/metadata/md5-cache/app-misc/uptimed-0.3.17-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=System uptime record daemon that keeps track of your highest uptimes
 EAPI=5
 HOMEPAGE=http://podgorny.cz/uptimed
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://podgorny.cz/uptimed/releases/uptimed-0.3.17.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=880cd8297a0fccca22a5a58f0c808b63
diff --git a/metadata/md5-cache/app-misc/vittk-1.3 b/metadata/md5-cache/app-misc/vittk-1.3
index e1c92a66dc6a..5ba57346c435 100644
--- a/metadata/md5-cache/app-misc/vittk-1.3
+++ b/metadata/md5-cache/app-misc/vittk-1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-lang/tcl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/tcl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A front end for Taskwarrior (app-misc/task)
 EAPI=4
 HOMEPAGE=http://taskwarrior.org/wiki/taskwarrior/Vittk
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/tcl dev-lang/tk app-misc/task
 SLOT=0
 SRC_URI=http://taskwarrior.org/download/vittk-1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=140a14c958ecfc5cf3a1c8ed3a025f08
diff --git a/metadata/md5-cache/app-misc/wipe-2.2.20050509-r1 b/metadata/md5-cache/app-misc/wipe-2.2.20050509-r1
index 6937bb716fea..a53fbe306fbc 100644
--- a/metadata/md5-cache/app-misc/wipe-2.2.20050509-r1
+++ b/metadata/md5-cache/app-misc/wipe-2.2.20050509-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Secure file wiping utility based on Peter Gutman's patterns
 EAPI=2
 HOMEPAGE=http://wipe.sourceforge.net/
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/wipe/wipe-wip-20050509.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=174574ad975df075a076094c92dc69fe
diff --git a/metadata/md5-cache/app-misc/wipe-2.3.1 b/metadata/md5-cache/app-misc/wipe-2.3.1
index 25cbb7f660a6..0bf6d4528306 100644
--- a/metadata/md5-cache/app-misc/wipe-2.3.1
+++ b/metadata/md5-cache/app-misc/wipe-2.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Secure file wiping utility based on Peter Gutman's patterns
 EAPI=3
 HOMEPAGE=http://wipe.sourceforge.net/
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/wipe/wipe-2.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6dd9296a838b986111ec4c7a00ef406c
diff --git a/metadata/md5-cache/app-misc/wyrd-1.4.5 b/metadata/md5-cache/app-misc/wyrd-1.4.5
index 850db09812fb..70ef222e92b7 100644
--- a/metadata/md5-cache/app-misc/wyrd-1.4.5
+++ b/metadata/md5-cache/app-misc/wyrd-1.4.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses[unicode?] >=app-misc/remind-03.01 >=dev-lang/ocaml-3.08 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses[unicode?] >=app-misc/remind-03.01 >=dev-lang/ocaml-3.08 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Text-based front-end to Remind
 EAPI=4
 HOMEPAGE=http://pessimization.com/software/wyrd/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses[unicode?] >=app-misc/remind-03.01
 SLOT=0
 SRC_URI=http://pessimization.com/software/wyrd/wyrd-1.4.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=62f379526732600195cf938bdbb9852f
diff --git a/metadata/md5-cache/app-mobilephone/dfu-util-9999 b/metadata/md5-cache/app-mobilephone/dfu-util-9999
index 69f82f8c4e49..e9f8dd9f5533 100644
--- a/metadata/md5-cache/app-mobilephone/dfu-util-9999
+++ b/metadata/md5-cache/app-mobilephone/dfu-util-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install prepare unpack
-DEPEND=virtual/libusb:1 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=virtual/libusb:1 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=implements the Host (PC) side of the USB DFU (Device Firmware Upgrade) protocol
 EAPI=2
 HOMEPAGE=http://wiki.openmoko.org/wiki/Dfu-util
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=0de72cfd863e856a8c06c080b90ae65c
diff --git a/metadata/md5-cache/app-mobilephone/gnokii-0.6.27-r2 b/metadata/md5-cache/app-mobilephone/gnokii-0.6.27-r2
index c2b525a13298..8fd44706f221 100644
--- a/metadata/md5-cache/app-mobilephone/gnokii-0.6.27-r2
+++ b/metadata/md5-cache/app-mobilephone/gnokii-0.6.27-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=!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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=user space driver and tools for use with mobile phones
 EAPI=1
 HOMEPAGE=http://www.gnokii.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!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* )
 SLOT=0
 SRC_URI=http://www.gnokii.org/download/gnokii/gnokii-0.6.27.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=88455adf22766e36c976fe9aa7cc6224
diff --git a/metadata/md5-cache/app-mobilephone/gnokii-0.6.27-r4 b/metadata/md5-cache/app-mobilephone/gnokii-0.6.27-r4
index ea9bf0d08696..2626dfed83e8 100644
--- a/metadata/md5-cache/app-mobilephone/gnokii-0.6.27-r4
+++ b/metadata/md5-cache/app-mobilephone/gnokii-0.6.27-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=!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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=user space driver and tools for use with mobile phones
 EAPI=2
 HOMEPAGE=http://www.gnokii.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!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* )
 SLOT=0
 SRC_URI=http://www.gnokii.org/download/gnokii/gnokii-0.6.27.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6df196653b461ac38762bc6400e9b99a
diff --git a/metadata/md5-cache/app-mobilephone/gnokii-0.6.28.1 b/metadata/md5-cache/app-mobilephone/gnokii-0.6.28.1
index 727f109c088b..92a1d0819631 100644
--- a/metadata/md5-cache/app-mobilephone/gnokii-0.6.28.1
+++ b/metadata/md5-cache/app-mobilephone/gnokii-0.6.28.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=!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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=user space driver and tools for use with mobile phones
 EAPI=2
 HOMEPAGE=http://www.gnokii.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!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* )
 SLOT=0
 SRC_URI=http://www.gnokii.org/download/gnokii/gnokii-0.6.28.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7c321c4f3b4c81c3e4191adf4b61414a
diff --git a/metadata/md5-cache/app-mobilephone/gnokii-0.6.29 b/metadata/md5-cache/app-mobilephone/gnokii-0.6.29
index 944a3226cce5..4d6d3b5de197 100644
--- a/metadata/md5-cache/app-mobilephone/gnokii-0.6.29
+++ b/metadata/md5-cache/app-mobilephone/gnokii-0.6.29
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=!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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=user space driver and tools for use with mobile phones
 EAPI=2
 HOMEPAGE=http://www.gnokii.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!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* )
 SLOT=0
 SRC_URI=http://www.gnokii.org/download/gnokii/gnokii-0.6.29.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=86aa467a3863263583a3175ee016bc15
diff --git a/metadata/md5-cache/app-mobilephone/gnokii-0.6.31 b/metadata/md5-cache/app-mobilephone/gnokii-0.6.31
index 9438f55b0441..fd674f53f687 100644
--- a/metadata/md5-cache/app-mobilephone/gnokii-0.6.31
+++ b/metadata/md5-cache/app-mobilephone/gnokii-0.6.31
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=!app-mobilephone/smstools pcsc-lite? ( sys-apps/pcsc-lite ) X? ( x11-libs/gtk+:2 ) bluetooth? ( kernel_linux? ( 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!app-mobilephone/smstools pcsc-lite? ( sys-apps/pcsc-lite ) X? ( x11-libs/gtk+:2 ) bluetooth? ( kernel_linux? ( 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=user space driver and tools for use with mobile phones
 EAPI=4
 HOMEPAGE=http://www.gnokii.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!app-mobilephone/smstools pcsc-lite? ( sys-apps/pcsc-lite ) X? ( x11-libs/gtk+:2 ) bluetooth? ( kernel_linux? ( 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* )
 SLOT=0
 SRC_URI=http://www.gnokii.org/download/gnokii/gnokii-0.6.31.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=777885eb8d49ceaa0dec0eaeef42a43a
diff --git a/metadata/md5-cache/app-mobilephone/gnokii-9999 b/metadata/md5-cache/app-mobilephone/gnokii-9999
index 41756eb6bb2e..8e127a2f6e53 100644
--- a/metadata/md5-cache/app-mobilephone/gnokii-9999
+++ b/metadata/md5-cache/app-mobilephone/gnokii-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=!app-mobilephone/smstools pcsc-lite? ( sys-apps/pcsc-lite ) X? ( x11-libs/gtk+:2 ) bluetooth? ( kernel_linux? ( 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=!app-mobilephone/smstools pcsc-lite? ( sys-apps/pcsc-lite ) X? ( x11-libs/gtk+:2 ) bluetooth? ( kernel_linux? ( 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=user space driver and tools for use with mobile phones
 EAPI=4
 HOMEPAGE=http://www.gnokii.org/
@@ -7,5 +7,5 @@ IUSE=nls bluetooth ical irda sms postgres mysql usb X debug +pcsc-lite linguas_c
 LICENSE=GPL-2
 RDEPEND=!app-mobilephone/smstools pcsc-lite? ( sys-apps/pcsc-lite ) X? ( x11-libs/gtk+:2 ) bluetooth? ( kernel_linux? ( 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* )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5903436705aed32b3247a2e4fce1fe9c
diff --git a/metadata/md5-cache/app-mobilephone/gnome-phone-manager-0.69 b/metadata/md5-cache/app-mobilephone/gnome-phone-manager-0.69
index 1463561d3188..f624afb5304d 100644
--- a/metadata/md5-cache/app-mobilephone/gnome-phone-manager-0.69
+++ b/metadata/md5-cache/app-mobilephone/gnome-phone-manager-0.69
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.31.0:2 >=x11-libs/gtk+-3:3 >=gnome-base/orbit-2 >=gnome-base/gconf-2:2 >=gnome-extra/evolution-data-server-3.6 media-libs/libcanberra[gtk3] >=app-mobilephone/gnokii-0.6.28[bluetooth] net-wireless/bluez dev-libs/dbus-glib dev-libs/openobex media-libs/libcanberra[gtk] >=x11-themes/gnome-icon-theme-2.19.1 >=net-wireless/gnome-bluetooth-3.3:2 >=dev-util/intltool-0.35.5 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.31.0:2 >=x11-libs/gtk+-3:3 >=gnome-base/orbit-2 >=gnome-base/gconf-2:2 >=gnome-extra/evolution-data-server-3.6 media-libs/libcanberra[gtk3] >=app-mobilephone/gnokii-0.6.28[bluetooth] net-wireless/bluez dev-libs/dbus-glib dev-libs/openobex media-libs/libcanberra[gtk] >=x11-themes/gnome-icon-theme-2.19.1 >=net-wireless/gnome-bluetooth-3.3:2 >=dev-util/intltool-0.35.5 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A program created to allow you to control aspects of your mobile phone from your GNOME desktop
 EAPI=5
 HOMEPAGE=http://live.gnome.org/PhoneManager
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.31.0:2 >=x11-libs/gtk+-3:3 >=gnome-base/orbit-2 >=gnome-base/gconf-2:2 >=gnome-extra/evolution-data-server-3.6 media-libs/libcanberra[gtk3] >=app-mobilephone/gnokii-0.6.28[bluetooth] net-wireless/bluez dev-libs/dbus-glib dev-libs/openobex media-libs/libcanberra[gtk] >=x11-themes/gnome-icon-theme-2.19.1 >=net-wireless/gnome-bluetooth-3.3:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-phone-manager/0.69/gnome-phone-manager-0.69.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e4cdcf0243edfd9f154cdb2f0924079f
diff --git a/metadata/md5-cache/app-mobilephone/kannel-1.4.3-r1 b/metadata/md5-cache/app-mobilephone/kannel-1.4.3-r1
index 68a78d4da0e0..96a3eda711ef 100644
--- a/metadata/md5-cache/app-mobilephone/kannel-1.4.3-r1
+++ b/metadata/md5-cache/app-mobilephone/kannel-1.4.3-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/e2fsprogs-libs dev-libs/libxml2 dev-lang/perl sys-libs/zlib ssl
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.kannel.org/download/1.4.3/gateway-1.4.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=352b1d4a07592504f60d36f1c58d87d9
diff --git a/metadata/md5-cache/app-mobilephone/kannel-sqlbox-0.7.2 b/metadata/md5-cache/app-mobilephone/kannel-sqlbox-0.7.2
index cac67d3bc51e..e820f699c1fe 100644
--- a/metadata/md5-cache/app-mobilephone/kannel-sqlbox-0.7.2
+++ b/metadata/md5-cache/app-mobilephone/kannel-sqlbox-0.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=|| ( >=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=DB-Based Kannel Box for message queueing
 EAPI=2
 HOMEPAGE=http://www.kannel.org/~aguerrieri/SqlBox/
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=|| ( >=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 )
 SLOT=0
 SRC_URI=http://www.kannel.org/~aguerrieri/SqlBox/Releases/sqlbox-0.7.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d60805df68ea1db19429ebe57c69d255
diff --git a/metadata/md5-cache/app-mobilephone/obexftp-0.23-r1 b/metadata/md5-cache/app-mobilephone/obexftp-0.23-r1
index f984e4a89de9..01c507a4e72e 100644
--- a/metadata/md5-cache/app-mobilephone/obexftp-0.23-r1
+++ b/metadata/md5-cache/app-mobilephone/obexftp-0.23-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openobex bluetooth? ( net-wireless/bluez ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby:1.8 ) tcl? ( dev-lang/tcl ) python? ( =dev-lang/python-2* ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://sourceforge/openobex/obexftp-0.23.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6b04c73df5ad558812eb893fea33d578
diff --git a/metadata/md5-cache/app-mobilephone/smssend-3.4 b/metadata/md5-cache/app-mobilephone/smssend-3.4
index 748ae8cf530c..80913e1bca76 100644
--- a/metadata/md5-cache/app-mobilephone/smssend-3.4
+++ b/metadata/md5-cache/app-mobilephone/smssend-3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-libs/skyutils-2.7 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/skyutils-2.7 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Universal SMS sender
 HOMEPAGE=None available
 KEYWORDS=amd64 ppc ppc64 ~sparc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/skyutils-2.7
 SLOT=0
 SRC_URI=mirror://gentoo/smssend-3.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cb6b9b6a8e9a32fc0fcaae733bb01083
diff --git a/metadata/md5-cache/app-mobilephone/tsemgr-0.08 b/metadata/md5-cache/app-mobilephone/tsemgr-0.08
index 18ba9be31545..f70294bd1ae2 100644
--- a/metadata/md5-cache/app-mobilephone/tsemgr-0.08
+++ b/metadata/md5-cache/app-mobilephone/tsemgr-0.08
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=virtual/pkgconfig =x11-libs/gtk+-1* dev-libs/openobex dev-libs/libezV24 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig =x11-libs/gtk+-1* dev-libs/openobex dev-libs/libezV24 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utility for Ericsson Mobile Phones
 HOMEPAGE=http://sourceforge.net/projects/tsemgr/
 KEYWORDS=amd64 x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==x11-libs/gtk+-1* dev-libs/openobex dev-libs/libezV24
 SLOT=0
 SRC_URI=mirror://sourceforge/tsemgr/tsemgr-0.08.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=08db2c29414e9b8f411084b2414909d3
diff --git a/metadata/md5-cache/app-mobilephone/vmoconv-1.0-r1 b/metadata/md5-cache/app-mobilephone/vmoconv-1.0-r1
index 8772247263bb..06f21e42b304 100644
--- a/metadata/md5-cache/app-mobilephone/vmoconv-1.0-r1
+++ b/metadata/md5-cache/app-mobilephone/vmoconv-1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=media-sound/gsm || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-sound/gsm || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A tool that converts Siemens phones VMO and VMI audio files to gsm and wav.
 HOMEPAGE=http://triq.net/obex/
 KEYWORDS=amd64 ~ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=media-sound/gsm
 SLOT=0
 SRC_URI=http://triq.net/obexftp/vmoconv-1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9bcbb8ed2bc8b28d241f3d1419d2aa65
diff --git a/metadata/md5-cache/app-office/abiword-2.8.6-r2 b/metadata/md5-cache/app-office/abiword-2.8.6-r2
index a05db8e997b0..2e17db573ae7 100644
--- a/metadata/md5-cache/app-office/abiword-2.8.6-r2
+++ b/metadata/md5-cache/app-office/abiword-2.8.6-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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? ( >=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 virtual/pkgconfig collab? ( dev-cpp/asio ) app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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? ( >=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 virtual/pkgconfig collab? ( dev-cpp/asio ) app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Fully featured yet light and fast cross platform word processor
 EAPI=4
 HOMEPAGE=http://www.abisource.com/
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/wv-1.2 >=dev-libs/fribidi-0.10.4 >=dev-libs/glib-2.16:2 >=gno
 REQUIRED_USE=!plugins? ( !collab !grammar !latex !math !openxml !ots !readline !thesaurus !wordperfect !wmf )
 SLOT=2
 SRC_URI=http://www.abisource.com/downloads/abiword/2.8.6/source/abiword-2.8.6.tar.gz
-_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=219e2277b6628452d97222295ab1061d
diff --git a/metadata/md5-cache/app-office/dia-0.97.2-r1 b/metadata/md5-cache/app-office/dia-0.97.2-r1
index 91ef0b387822..d2b6b66c89cc 100644
--- a/metadata/md5-cache/app-office/dia-0.97.2-r1
+++ b/metadata/md5-cache/app-office/dia-0.97.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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:0 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 sys-apps/sed virtual/pkgconfig doc? ( dev-libs/libxslt ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 python? ( =dev-lang/python-2* )
+DEPEND=>=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:0 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 sys-apps/sed virtual/pkgconfig doc? ( dev-libs/libxslt ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 python? ( =dev-lang/python-2* )
 DESCRIPTION=Diagram/flowchart creation program
 EAPI=4
 HOMEPAGE=http://live.gnome.org/Dia
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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:0 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* )
 SLOT=0
 SRC_URI=mirror://gnome/sources/dia/0.97/dia-0.97.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=826325bd53483e1374a7db9e9cc4de93
diff --git a/metadata/md5-cache/app-office/dia2code-0.8.4 b/metadata/md5-cache/app-office/dia2code-0.8.4
index 7b7dce67c2f9..ad7aa32fbb7a 100644
--- a/metadata/md5-cache/app-office/dia2code-0.8.4
+++ b/metadata/md5-cache/app-office/dia2code-0.8.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/libxml2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Convert UML diagrams produced with Dia to various source code flavours.
 EAPI=4
 HOMEPAGE=http://dia2code.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 >=app-office/dia-0.90.0
 SLOT=0
 SRC_URI=mirror://sourceforge/dia2code/dia2code-0.8.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a9d2f7c01886594d2b045d404c77903a
diff --git a/metadata/md5-cache/app-office/dia2code-0.8.5 b/metadata/md5-cache/app-office/dia2code-0.8.5
index 99d07d3f854f..c4daf0b575c9 100644
--- a/metadata/md5-cache/app-office/dia2code-0.8.5
+++ b/metadata/md5-cache/app-office/dia2code-0.8.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/libxml2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Convert UML diagrams produced with Dia to various source code flavours.
 EAPI=4
 HOMEPAGE=http://dia2code.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 >=app-office/dia-0.90.0
 SLOT=0
 SRC_URI=mirror://sourceforge/dia2code/dia2code-0.8.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9a7e14521fb76135360e9c8621379fd5
diff --git a/metadata/md5-cache/app-office/homebank-4.3 b/metadata/md5-cache/app-office/homebank-4.3
index e0a172c4431c..a31b7c6d7690 100644
--- a/metadata/md5-cache/app-office/homebank-4.3
+++ b/metadata/md5-cache/app-office/homebank-4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=x11-libs/gtk+-2.14:2 >=dev-libs/glib-2.17:2 sys-libs/zlib ofx? ( >=dev-libs/libofx-0.7 ) virtual/pkgconfig >=dev-util/intltool-0.40.5 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.14:2 >=dev-libs/glib-2.17:2 sys-libs/zlib ofx? ( >=dev-libs/libofx-0.7 ) virtual/pkgconfig >=dev-util/intltool-0.40.5 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free, easy, personal accounting for everyone
 EAPI=2
 HOMEPAGE=http://homebank.free.fr/index.php
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.14:2 >=dev-libs/glib-2.17:2 sys-libs/zlib ofx? ( >=dev-libs/libofx-0.7 ) gnome-base/librsvg
 SLOT=0
 SRC_URI=http://homebank.free.fr/public/homebank-4.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5d1f9f82a359e5ca35d7e7e45d39add0
diff --git a/metadata/md5-cache/app-office/ical-3.0-r1 b/metadata/md5-cache/app-office/ical-3.0-r1
index 19e9b12c4030..71923f357710 100644
--- a/metadata/md5-cache/app-office/ical-3.0-r1
+++ b/metadata/md5-cache/app-office/ical-3.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test
-DEPEND=dev-lang/tcl dev-lang/tk || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-lang/tcl dev-lang/tk || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Tk-based Calendar program
 EAPI=3
 HOMEPAGE=http://launchpad.net/ical-tcl
@@ -9,5 +9,5 @@ LICENSE=HPND
 RDEPEND=dev-lang/tcl dev-lang/tk
 SLOT=0
 SRC_URI=http://launchpad.net/ical-tcl/3.x/3.0/+download/ical-3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=90601da6aded8ba125a2d3d9fe0d55b5
diff --git a/metadata/md5-cache/app-office/ledger-2.6.3-r1 b/metadata/md5-cache/app-office/ledger-2.6.3-r1
index 5e814b66d3ff..2560bbc6e9c2 100644
--- a/metadata/md5-cache/app-office/ledger-2.6.3-r1
+++ b/metadata/md5-cache/app-office/ledger-2.6.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A double-entry accounting system with a command-line reporting interface
 EAPI=4
 HOMEPAGE=http://ledger-cli.org/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=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 ) )
 SLOT=0
 SRC_URI=mirror://github/jwiegley/ledger/ledger-2.6.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f00474d88ed8c3bd6fbb9fb5e9257dcf
diff --git a/metadata/md5-cache/app-office/libreoffice-3.6.4.3 b/metadata/md5-cache/app-office/libreoffice-3.6.4.3
index 76bb94d9ca33..f5b2ec08d6e1 100644
--- a/metadata/md5-cache/app-office/libreoffice-3.6.4.3
+++ b/metadata/md5-cache/app-office/libreoffice-3.6.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=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-0.2:0.2 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-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] gnome-base/librsvg media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 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 cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) webdav? ( net-libs/neon ) >=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 virtual/pkgconfig net-misc/npapi-sdk >=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/libXt 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 ) odk? ( app-doc/doxygen ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=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 virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-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]
+DEPEND=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-0.2:0.2 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-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] gnome-base/librsvg media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 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 cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) webdav? ( net-libs/neon ) >=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 virtual/pkgconfig net-misc/npapi-sdk >=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/libXt 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 ) odk? ( app-doc/doxygen ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-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]
 DESCRIPTION=LibreOffice, a full office productivity suite.
 EAPI=4
 HOMEPAGE=http://www.libreoffice.org
@@ -11,5 +11,5 @@ RDEPEND=app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes
 REQUIRED_USE=gnome? ( gtk ) eds? ( gnome ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.6.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-core-3.6.4.3.tar.xz binfilter? ( http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-binfilter-3.6.4.3.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-3.6.4.3.tar.xz http://download.documentfoundation.org/libreoffice/src/3.6.4//libreoffice-core-3.6.4.3.tar.xz binfilter? ( http://download.documentfoundation.org/libreoffice/src/3.6.4//libreoffice-binfilter-3.6.4.3.tar.xz ) http://download.documentfoundation.org/libreoffice/src/3.6.4//libreoffice-help-3.6.4.3.tar.xz http://download.documentfoundation.org/libreoffice/old/3.6.4.3//libreoffice-core-3.6.4.3.tar.xz binfilter? ( http://download.documentfoundation.org/libreoffice/old/3.6.4.3//libreoffice-binfilter-3.6.4.3.tar.xz ) http://download.documentfoundation.org/libreoffice/old/3.6.4.3//libreoffice-help-3.6.4.3.tar.xz http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 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//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=761e9307bbedf883d72e7d1330094902
diff --git a/metadata/md5-cache/app-office/libreoffice-3.6.6.2 b/metadata/md5-cache/app-office/libreoffice-3.6.6.2
index e6bb808b5f9d..858f2aa2f343 100644
--- a/metadata/md5-cache/app-office/libreoffice-3.6.6.2
+++ b/metadata/md5-cache/app-office/libreoffice-3.6.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_5? ( dev-lang/python:2.5[threads,xml] ) python_single_target_python2_6? ( dev-lang/python:2.6[threads,xml] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] 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-0.2:0.2 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-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] gnome-base/librsvg media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 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 cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_pdfimport? ( >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) webdav? ( net-libs/neon ) >=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 virtual/pkgconfig net-misc/npapi-sdk >=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/libXt 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 ) odk? ( app-doc/doxygen ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=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 virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-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=] )
+DEPEND=python_single_target_python2_5? ( dev-lang/python:2.5[threads,xml] ) python_single_target_python2_6? ( dev-lang/python:2.6[threads,xml] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] 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-0.2:0.2 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-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] gnome-base/librsvg media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 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 cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_pdfimport? ( >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) webdav? ( net-libs/neon ) >=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 virtual/pkgconfig net-misc/npapi-sdk >=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/libXt 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 ) odk? ( app-doc/doxygen ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-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=] )
 DESCRIPTION=LibreOffice, a full office productivity suite.
 EAPI=5
 HOMEPAGE=http://www.libreoffice.org
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python2_5? ( dev-lang/python:2.5[threads,xml] ) pyt
 REQUIRED_USE=gnome? ( gtk ) eds? ( gnome ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.6.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-core-3.6.6.2.tar.xz binfilter? ( http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-binfilter-3.6.6.2.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-3.6.6.2.tar.xz http://download.documentfoundation.org/libreoffice/src/3.6.6//libreoffice-core-3.6.6.2.tar.xz binfilter? ( http://download.documentfoundation.org/libreoffice/src/3.6.6//libreoffice-binfilter-3.6.6.2.tar.xz ) http://download.documentfoundation.org/libreoffice/src/3.6.6//libreoffice-help-3.6.6.2.tar.xz http://download.documentfoundation.org/libreoffice/old/3.6.6.2//libreoffice-core-3.6.6.2.tar.xz binfilter? ( http://download.documentfoundation.org/libreoffice/old/3.6.6.2//libreoffice-binfilter-3.6.6.2.tar.xz ) http://download.documentfoundation.org/libreoffice/old/3.6.6.2//libreoffice-help-3.6.6.2.tar.xz http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 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//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=9a7ec7fed50c45bdac665d69f7c28de3
diff --git a/metadata/md5-cache/app-office/libreoffice-3.6.9999 b/metadata/md5-cache/app-office/libreoffice-3.6.9999
index 409be1cdbed7..0a26a79deaad 100644
--- a/metadata/md5-cache/app-office/libreoffice-3.6.9999
+++ b/metadata/md5-cache/app-office/libreoffice-3.6.9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_5? ( dev-lang/python:2.5[threads,xml] ) python_single_target_python2_6? ( dev-lang/python:2.6[threads,xml] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] 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-0.2:0.2 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-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] gnome-base/librsvg media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 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 cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_pdfimport? ( >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) webdav? ( net-libs/neon ) >=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 virtual/pkgconfig net-misc/npapi-sdk >=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/libXt 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 ) odk? ( app-doc/doxygen ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=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 virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-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-vcs/git
+DEPEND=python_single_target_python2_5? ( dev-lang/python:2.5[threads,xml] ) python_single_target_python2_6? ( dev-lang/python:2.6[threads,xml] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] 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-0.2:0.2 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-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] gnome-base/librsvg media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 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 cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_pdfimport? ( >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) webdav? ( net-libs/neon ) >=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 virtual/pkgconfig net-misc/npapi-sdk >=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/libXt 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 ) odk? ( app-doc/doxygen ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-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-vcs/git
 DESCRIPTION=LibreOffice, a full office productivity suite.
 EAPI=5
 HOMEPAGE=http://www.libreoffice.org
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_5? ( dev-lang/python:2.5[threads,xml] ) pyt
 REQUIRED_USE=gnome? ( gtk ) eds? ( gnome ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.6.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 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//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=ad82a09664d9ea299ed3b5d0fc40faa2
diff --git a/metadata/md5-cache/app-office/libreoffice-4.0.2.2 b/metadata/md5-cache/app-office/libreoffice-4.0.2.2
index 3ec82b34db64..24172850f7cb 100644
--- a/metadata/md5-cache/app-office/libreoffice-4.0.2.2
+++ b/metadata/md5-cache/app-office/libreoffice-4.0.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads,xml] ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/liblangtag app-text/libmspub app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.3.1:0.3 dev-db/unixODBC dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= =dev-libs/liborcus-0.3* >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) webdav? ( net-libs/neon ) >=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 virtual/pkgconfig net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-devel/ucpp sys-libs/zlib x11-libs/libXt 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 ) odk? ( app-doc/doxygen ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=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 virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-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=] )
+DEPEND=python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads,xml] ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/liblangtag app-text/libmspub app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.3.1:0.3 dev-db/unixODBC dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= =dev-libs/liborcus-0.3* >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) webdav? ( net-libs/neon ) >=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 virtual/pkgconfig net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-devel/ucpp sys-libs/zlib x11-libs/libXt 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 ) odk? ( app-doc/doxygen ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-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=] )
 DESCRIPTION=LibreOffice, a full office productivity suite.
 EAPI=5
 HOMEPAGE=http://www.libreoffice.org
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) pyt
 REQUIRED_USE=bluetooth? ( dbus ) gnome? ( gtk ) eds? ( gnome ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.7.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-4.0.2.2.tar.xz http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-4.0.2.2.tar.xz http://download.documentfoundation.org/libreoffice/src/4.0.2//libreoffice-4.0.2.2.tar.xz http://download.documentfoundation.org/libreoffice/src/4.0.2//libreoffice-help-4.0.2.2.tar.xz http://download.documentfoundation.org/libreoffice/old/4.0.2.2//libreoffice-4.0.2.2.tar.xz http://download.documentfoundation.org/libreoffice/old/4.0.2.2//libreoffice-help-4.0.2.2.tar.xz http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 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 ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	pax-utils	d727728a240d5f59bf9370a64259fd61	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	pax-utils	d727728a240d5f59bf9370a64259fd61	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=f1c69564d8fb16db1efed748a03de529
diff --git a/metadata/md5-cache/app-office/libreoffice-4.0.9999 b/metadata/md5-cache/app-office/libreoffice-4.0.9999
index 10f748cf5a51..de3c9af76dcd 100644
--- a/metadata/md5-cache/app-office/libreoffice-4.0.9999
+++ b/metadata/md5-cache/app-office/libreoffice-4.0.9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads,xml] ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/liblangtag app-text/libmspub app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.3.1:0.3 dev-db/unixODBC dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= =dev-libs/liborcus-0.3* >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) webdav? ( net-libs/neon ) >=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 virtual/pkgconfig net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-devel/ucpp sys-libs/zlib x11-libs/libXt 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 ) odk? ( app-doc/doxygen ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=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 virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-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-vcs/git
+DEPEND=python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads,xml] ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/liblangtag app-text/libmspub app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.3.1:0.3 dev-db/unixODBC dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= =dev-libs/liborcus-0.3* >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) webdav? ( net-libs/neon ) >=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 virtual/pkgconfig net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-devel/ucpp sys-libs/zlib x11-libs/libXt 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 ) odk? ( app-doc/doxygen ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-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-vcs/git
 DESCRIPTION=LibreOffice, a full office productivity suite.
 EAPI=5
 HOMEPAGE=http://www.libreoffice.org
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) pyt
 REQUIRED_USE=bluetooth? ( dbus ) gnome? ( gtk ) eds? ( gnome ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.7.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 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 ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	pax-utils	d727728a240d5f59bf9370a64259fd61	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	pax-utils	d727728a240d5f59bf9370a64259fd61	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=bcfe3a1a87f4ea68745cdc15603e5a9e
diff --git a/metadata/md5-cache/app-office/libreoffice-9999-r2 b/metadata/md5-cache/app-office/libreoffice-9999-r2
index d1ead49bffe2..d6b4e5707444 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999-r2
+++ b/metadata/md5-cache/app-office/libreoffice-9999-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads,xml] ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/liblangtag app-text/libmspub >=app-text/libmwaw-0.1.7 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.3.1:0.3 dev-db/unixODBC dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= >=dev-libs/liborcus-0.5.1:= >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) webdav? ( net-libs/neon ) >=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-0.7.0 virtual/pkgconfig net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-devel/ucpp sys-libs/zlib x11-libs/libXt 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 ) odk? ( app-doc/doxygen ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=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 virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-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-vcs/git
+DEPEND=python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads,xml] ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/liblangtag app-text/libmspub >=app-text/libmwaw-0.1.7 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.3.1:0.3 dev-db/unixODBC dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= >=dev-libs/liborcus-0.5.1:= >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) webdav? ( net-libs/neon ) >=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-0.7.0 virtual/pkgconfig net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-devel/ucpp sys-libs/zlib x11-libs/libXt 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 ) odk? ( app-doc/doxygen ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-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-vcs/git
 DESCRIPTION=LibreOffice, a full office productivity suite.
 EAPI=5
 HOMEPAGE=http://www.libreoffice.org
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) pyt
 REQUIRED_USE=bluetooth? ( dbus ) gnome? ( gtk ) eds? ( gnome ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.7.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 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 ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	pax-utils	d727728a240d5f59bf9370a64259fd61	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	pax-utils	d727728a240d5f59bf9370a64259fd61	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=81c4a56b182b0310e0819818ad31d0ad
diff --git a/metadata/md5-cache/app-office/magicpoint-1.13a b/metadata/md5-cache/app-office/magicpoint-1.13a
index ae763869053b..95b0b824f51b 100644
--- a/metadata/md5-cache/app-office/magicpoint-1.13a
+++ b/metadata/md5-cache/app-office/magicpoint-1.13a
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=An X11 based presentation tool
 EAPI=4
 HOMEPAGE=http://member.wide.ad.jp/wg/mgp/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=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 ) )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b7f0c17f3aef1eddff167643225d8b44
diff --git a/metadata/md5-cache/app-office/mdbtools-0.6_pre2-r2 b/metadata/md5-cache/app-office/mdbtools-0.6_pre2-r2
index a72a72a5161b..e420e79a4f5c 100644
--- a/metadata/md5-cache/app-office/mdbtools-0.6_pre2-r2
+++ b/metadata/md5-cache/app-office/mdbtools-0.6_pre2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2 sys-libs/ncurses sys-libs/readline gnome? ( >=gnome-base/libglade-2 >=gnome-base/libgnomeui-2 ) odbc? ( >=dev-db/unixODBC-2.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/mdbtools-cvs-20050624.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e197399a23fe25ddc1349e5d2fe726cb
diff --git a/metadata/md5-cache/app-office/mdbtools-0.6_pre2-r3 b/metadata/md5-cache/app-office/mdbtools-0.6_pre2-r3
index 8c2efc94d114..71138fea0fbd 100644
--- a/metadata/md5-cache/app-office/mdbtools-0.6_pre2-r3
+++ b/metadata/md5-cache/app-office/mdbtools-0.6_pre2-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2 sys-libs/ncurses sys-libs/readline gnome? ( >=gnome-base/libglade-2 >=gnome-base/libgnomeui-2 ) odbc? ( >=dev-db/unixODBC-2.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/mdbtools-cvs-20050624.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8504af4b5b3812d221de8074264188a8
diff --git a/metadata/md5-cache/app-office/orage-4.8.3 b/metadata/md5-cache/app-office/orage-4.8.3
index c97bde046ba8..b022aa2bf6d2 100644
--- a/metadata/md5-cache/app-office/orage-4.8.3
+++ b/metadata/md5-cache/app-office/orage-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libical-0.48 dev-libs/popt >=x11-libs/gtk+-2.10:2 berkdb? ( >=sys-libs/db-4 ) dbus? ( >=dev-libs/dbus-glib-0.98 ) libnotify? ( >=x11-libs/libnotify-0.7 ) xfce_plugins_clock? ( >=xfce-base/xfce4-panel-4.8 )
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/orage/4.8/orage-4.8.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=af7f8bac645b4a2494a32637115342a5
diff --git a/metadata/md5-cache/app-office/orage-4.8.4 b/metadata/md5-cache/app-office/orage-4.8.4
index 3f4f849da7b5..fef737b625c1 100644
--- a/metadata/md5-cache/app-office/orage-4.8.4
+++ b/metadata/md5-cache/app-office/orage-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libical-0.48:= dev-libs/popt:= >=x11-libs/gtk+-2.10:2 berkdb? ( >=sys-libs/db-4 ) dbus? ( >=dev-libs/dbus-glib-0.100 ) libnotify? ( >=x11-libs/libnotify-0.7:= ) xfce_plugins_clock? ( >=xfce-base/xfce4-panel-4.10 )
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/orage/4.8/orage-4.8.4.tar.bz2 http://dev.gentoo.org/~ssuominen/orage-4.8.4-nn.po.xz http://dev.gentoo.org/~ssuominen/orage-4.8.4-sr.po.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=fdf12bad25166aaaba23a8a7cb75719c
diff --git a/metadata/md5-cache/app-office/passepartout-0.7.0 b/metadata/md5-cache/app-office/passepartout-0.7.0
index c1613d6cbc7c..9307f357589b 100644
--- a/metadata/md5-cache/app-office/passepartout-0.7.0
+++ b/metadata/md5-cache/app-office/passepartout-0.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=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 ) virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A DTP application for the X Window System
 EAPI=2
 HOMEPAGE=http://www.stacken.kth.se/project/pptout/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=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
 SLOT=0
 SRC_URI=mirror://gnome/sources/passepartout/0.7/passepartout-0.7.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b0e636e92a3b2b3de64bfa91f7ddddfc
diff --git a/metadata/md5-cache/app-office/planner-0.14.6 b/metadata/md5-cache/app-office/planner-0.14.6
index 9d339897f0fe..f370ee230383 100644
--- a/metadata/md5-cache/app-office/planner-0.14.6
+++ b/metadata/md5-cache/app-office/planner-0.14.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 ) virtual/pkgconfig 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Project manager for Gnome
 EAPI=4
 HOMEPAGE=http://live.gnome.org/Planner/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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* )
 SLOT=0
 SRC_URI=mirror://gnome/sources/planner/0.14/planner-0.14.6.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=75b8f7be14de12f484ae322667ba507b
diff --git a/metadata/md5-cache/app-office/pybliographer-1.2.12-r1 b/metadata/md5-cache/app-office/pybliographer-1.2.12-r1
index a06ec93c102b..1389def1660a 100644
--- a/metadata/md5-cache/app-office/pybliographer-1.2.12-r1
+++ b/metadata/md5-cache/app-office/pybliographer-1.2.12-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=Pybliographer is a tool for working with bibliographic databases
 EAPI=3
 HOMEPAGE=http://pybliographer.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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* )
 SLOT=0
 SRC_URI=mirror://sourceforge/pybliographer/pybliographer-1.2.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d3e2be9a0cf247d55847f1885580b5a3
diff --git a/metadata/md5-cache/app-office/pybliographer-1.2.14 b/metadata/md5-cache/app-office/pybliographer-1.2.14
index 568a77ae34f8..4ffd3fe0987a 100644
--- a/metadata/md5-cache/app-office/pybliographer-1.2.14
+++ b/metadata/md5-cache/app-office/pybliographer-1.2.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=Pybliographer is a tool for working with bibliographic databases
 EAPI=3
 HOMEPAGE=http://pybliographer.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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* )
 SLOT=0
 SRC_URI=mirror://sourceforge/pybliographer/pybliographer-1.2.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=107269197a6a679befed49fdc551d113
diff --git a/metadata/md5-cache/app-office/pybliographer-1.2.15 b/metadata/md5-cache/app-office/pybliographer-1.2.15
index 1ec7fcd43f2b..8404e660e0f3 100644
--- a/metadata/md5-cache/app-office/pybliographer-1.2.15
+++ b/metadata/md5-cache/app-office/pybliographer-1.2.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=Pybliographer is a tool for working with bibliographic databases
 EAPI=3
 HOMEPAGE=http://pybliographer.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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* )
 SLOT=0
 SRC_URI=mirror://sourceforge/pybliographer/pybliographer-1.2.15.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=46fd73be859a3cb8106fd02b7d1df40c
diff --git a/metadata/md5-cache/app-office/texmacs-1.0.7.16-r1 b/metadata/md5-cache/app-office/texmacs-1.0.7.16-r1
index 079ed64acb39..ac5e4b9508ac 100644
--- a/metadata/md5-cache/app-office/texmacs-1.0.7.16-r1
+++ b/metadata/md5-cache/app-office/texmacs-1.0.7.16-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-scheme/guile[deprecated] virtual/latex-base app-text/ghostscript-gpl media-libs/freetype x11-libs/libXext x11-apps/xmodmap qt4? ( dev-qt/qtgui: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/aspell ) x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-scheme/guile[deprecated] virtual/latex-base app-text/ghostscript-gpl media-libs/freetype x11-libs/libXext x11-apps/xmodmap qt4? ( dev-qt/qtgui: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/aspell ) x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Wysiwyg text processor with high-quality maths
 EAPI=4
 HOMEPAGE=http://www.texmacs.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-scheme/guile[deprecated] virtual/latex-base app-text/ghostscript-gpl media-libs/freetype x11-libs/libXext x11-apps/xmodmap qt4? ( dev-qt/qtgui: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/aspell )
 SLOT=0
 SRC_URI=ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/TeXmacs-1.0.7.16-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=174a9c3ecd9026f5078eb581f87fff1e
diff --git a/metadata/md5-cache/app-office/texmacs-1.0.7.18 b/metadata/md5-cache/app-office/texmacs-1.0.7.18
index e4de1ae7e63f..df3fa871bec8 100644
--- a/metadata/md5-cache/app-office/texmacs-1.0.7.18
+++ b/metadata/md5-cache/app-office/texmacs-1.0.7.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-scheme/guile[deprecated] virtual/latex-base app-text/ghostscript-gpl media-libs/freetype x11-libs/libXext x11-apps/xmodmap qt4? ( dev-qt/qtgui: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/aspell ) x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-scheme/guile[deprecated] virtual/latex-base app-text/ghostscript-gpl media-libs/freetype x11-libs/libXext x11-apps/xmodmap qt4? ( dev-qt/qtgui: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/aspell ) x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Wysiwyg text processor with high-quality maths
 EAPI=4
 HOMEPAGE=http://www.texmacs.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-scheme/guile[deprecated] virtual/latex-base app-text/ghostscript-gpl media-libs/freetype x11-libs/libXext x11-apps/xmodmap qt4? ( dev-qt/qtgui: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/aspell )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~grozin/TeXmacs-1.0.7.18-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2725949c67f383ab5107579afde3b628
diff --git a/metadata/md5-cache/app-office/texmacs-1.0.7.19 b/metadata/md5-cache/app-office/texmacs-1.0.7.19
index 4bf25567b155..7b166c02b8eb 100644
--- a/metadata/md5-cache/app-office/texmacs-1.0.7.19
+++ b/metadata/md5-cache/app-office/texmacs-1.0.7.19
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-scheme/guile[deprecated] virtual/latex-base app-text/ghostscript-gpl media-libs/freetype x11-libs/libXext x11-apps/xmodmap qt4? ( dev-qt/qtgui: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/aspell ) x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-scheme/guile[deprecated] virtual/latex-base app-text/ghostscript-gpl media-libs/freetype x11-libs/libXext x11-apps/xmodmap qt4? ( dev-qt/qtgui: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/aspell ) x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Wysiwyg text processor with high-quality maths
 EAPI=4
 HOMEPAGE=http://www.texmacs.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-scheme/guile[deprecated] virtual/latex-base app-text/ghostscript-gpl media-libs/freetype x11-libs/libXext x11-apps/xmodmap qt4? ( dev-qt/qtgui: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/aspell )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~grozin/TeXmacs-1.0.7.19-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0c27c43e52f39d67a6626d7b8f6e6d34
diff --git a/metadata/md5-cache/app-office/texmacs-1.0.7.2-r1 b/metadata/md5-cache/app-office/texmacs-1.0.7.2-r1
index 75d8a3e77535..c9477da64aa7 100644
--- a/metadata/md5-cache/app-office/texmacs-1.0.7.2-r1
+++ b/metadata/md5-cache/app-office/texmacs-1.0.7.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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/aspell ) x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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/aspell ) x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Wysiwyg text processor with high-quality maths
 EAPI=2
 HOMEPAGE=http://www.texmacs.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=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/aspell )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6ae6cf0700813856cc068aef19046ee5
diff --git a/metadata/md5-cache/app-pda/dynamite-0.1.1_p20120512 b/metadata/md5-cache/app-pda/dynamite-0.1.1_p20120512
index 9580e9e85d6d..9210e765117e 100644
--- a/metadata/md5-cache/app-pda/dynamite-0.1.1_p20120512
+++ b/metadata/md5-cache/app-pda/dynamite-0.1.1_p20120512
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A tool (and library) for decompressing data compressed with PKWARE Data Compression Library
 EAPI=4
 HOMEPAGE=https://github.com/twogood/dynamite http://sourceforge.net/projects/synce/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ssuominen/dynamite-0.1.1_p20120512.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ecbcaef8f61c5102108f3516207db4d1
diff --git a/metadata/md5-cache/app-pda/gtkpod-2.1.3-r1 b/metadata/md5-cache/app-pda/gtkpod-2.1.3-r1
index c9fc740e923d..66fa9091e656 100644
--- a/metadata/md5-cache/app-pda/gtkpod-2.1.3-r1
+++ b/metadata/md5-cache/app-pda/gtkpod-2.1.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/gdl-3.6:3 >=dev-libs/glib-2.28.5 >=dev-libs/libxml2-2.7.7 >=dev-util/anjuta-3.6 >=media-libs/libgpod-0.7.0 >=media-libs/libid3tag-0.15 >=x11-libs/gtk+-3.0.8:3 aac? ( media-libs/faad2 ) clutter? ( media-libs/clutter-gtk:1.0 ) curl? ( >=net-misc/curl-7.10 ) cdr? ( >=app-cdr/brasero-3 media-libs/musicbrainz:3 ) flac? ( media-libs/flac ) gstreamer? ( >=media-libs/gst-plugins-base-0.10.25:0.10 ) mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis media-sound/vorbis-tools ) webkit? ( >=net-libs/webkit-gtk-1.3:3 ) dev-util/intltool media-libs/gstreamer:0.10 sys-devel/flex sys-devel/gettext virtual/os-headers virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=dev-libs/gdl-3.6:3 >=dev-libs/glib-2.28.5 >=dev-libs/libxml2-2.7.7 >=dev-util/anjuta-3.6 >=media-libs/libgpod-0.7.0 >=media-libs/libid3tag-0.15 >=x11-libs/gtk+-3.0.8:3 aac? ( media-libs/faad2 ) clutter? ( media-libs/clutter-gtk:1.0 ) curl? ( >=net-misc/curl-7.10 ) cdr? ( >=app-cdr/brasero-3 media-libs/musicbrainz:3 ) flac? ( media-libs/flac ) gstreamer? ( >=media-libs/gst-plugins-base-0.10.25:0.10 ) mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis media-sound/vorbis-tools ) webkit? ( >=net-libs/webkit-gtk-1.3:3 ) dev-util/intltool media-libs/gstreamer:0.10 sys-devel/flex sys-devel/gettext virtual/os-headers virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A graphical user interface to the Apple productline
 EAPI=5
 HOMEPAGE=http://gtkpod.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=>=dev-libs/gdl-3.6:3 >=dev-libs/glib-2.28.5 >=dev-libs/libxml2-2.7.7 >=dev-util/anjuta-3.6 >=media-libs/libgpod-0.7.0 >=media-libs/libid3tag-0.15 >=x11-libs/gtk+-3.0.8:3 aac? ( media-libs/faad2 ) clutter? ( media-libs/clutter-gtk:1.0 ) curl? ( >=net-misc/curl-7.10 ) cdr? ( >=app-cdr/brasero-3 media-libs/musicbrainz:3 ) flac? ( media-libs/flac ) gstreamer? ( >=media-libs/gst-plugins-base-0.10.25:0.10 ) mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis media-sound/vorbis-tools ) webkit? ( >=net-libs/webkit-gtk-1.3:3 ) gstreamer? ( media-plugins/gst-plugins-meta:0.10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtkpod/gtkpod-2.1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dd7a57ad44b6fc3c78c43079edb07bb8
diff --git a/metadata/md5-cache/app-pda/jpilot-1.8.0 b/metadata/md5-cache/app-pda/jpilot-1.8.0
index 35643d41c7f4..a9c71e33e46e 100644
--- a/metadata/md5-cache/app-pda/jpilot-1.8.0
+++ b/metadata/md5-cache/app-pda/jpilot-1.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=app-pda/pilot-link-0.12.5 dev-libs/libgcrypt >=x11-libs/gtk+-2.18.9:2 nls? ( dev-util/intltool sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-pda/pilot-link-0.12.5 dev-libs/libgcrypt >=x11-libs/gtk+-2.18.9:2 nls? ( dev-util/intltool sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Desktop Organizer Software for the Palm Pilot
 EAPI=2
 HOMEPAGE=http://www.jpilot.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-pda/pilot-link-0.12.5 dev-libs/libgcrypt >=x11-libs/gtk+-2.18.9:2
 SLOT=0
 SRC_URI=http://www.jpilot.org/jpilot-1.8.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=971afc21fb843fa518f877c44e08d2c4
diff --git a/metadata/md5-cache/app-pda/jpilot-1.8.1 b/metadata/md5-cache/app-pda/jpilot-1.8.1
index cebc7dbef181..629bb8944ebc 100644
--- a/metadata/md5-cache/app-pda/jpilot-1.8.1
+++ b/metadata/md5-cache/app-pda/jpilot-1.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=app-pda/pilot-link-0.12.5 dev-libs/libgcrypt >=x11-libs/gtk+-2.18.9:2 nls? ( dev-util/intltool sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-pda/pilot-link-0.12.5 dev-libs/libgcrypt >=x11-libs/gtk+-2.18.9:2 nls? ( dev-util/intltool sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Desktop Organizer Software for the Palm Pilot
 EAPI=4
 HOMEPAGE=http://www.jpilot.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-pda/pilot-link-0.12.5 dev-libs/libgcrypt >=x11-libs/gtk+-2.18.9:2
 SLOT=0
 SRC_URI=http://www.jpilot.org/jpilot-1.8.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=590dba7df7481cdeff21c8e2b327739c
diff --git a/metadata/md5-cache/app-pda/libimobiledevice-1.1.4-r2 b/metadata/md5-cache/app-pda/libimobiledevice-1.1.4-r2
index 4bb33212fa79..c28e0880abca 100644
--- a/metadata/md5-cache/app-pda/libimobiledevice-1.1.4-r2
+++ b/metadata/md5-cache/app-pda/libimobiledevice-1.1.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=app-pda/libplist-1.8-r1[python?] >=app-pda/usbmuxd-1.0.8 gnutls? ( dev-libs/libgcrypt >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( dev-libs/openssl:0 ) virtual/pkgconfig python? ( >=dev-python/cython-0.14.1-r1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2.7* )
+DEPEND=>=app-pda/libplist-1.8-r1[python?] >=app-pda/usbmuxd-1.0.8 gnutls? ( dev-libs/libgcrypt >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( dev-libs/openssl:0 ) virtual/pkgconfig python? ( >=dev-python/cython-0.14.1-r1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2.7* )
 DESCRIPTION=Support library to communicate with Apple iPhone/iPod Touch devices
 EAPI=4
 HOMEPAGE=http://www.libimobiledevice.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=app-pda/libplist-1.8-r1[python?] >=app-pda/usbmuxd-1.0.8 gnutls? ( dev-libs/libgcrypt >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( dev-libs/openssl:0 ) python? ( =dev-lang/python-2.7* )
 SLOT=0
 SRC_URI=http://www.libimobiledevice.org/downloads/libimobiledevice-1.1.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dfbc2077b408407ecf7e255243f57a20
diff --git a/metadata/md5-cache/app-pda/libimobiledevice-1.1.4-r3 b/metadata/md5-cache/app-pda/libimobiledevice-1.1.4-r3
index 67a78317dbf7..ab1a680e638f 100644
--- a/metadata/md5-cache/app-pda/libimobiledevice-1.1.4-r3
+++ b/metadata/md5-cache/app-pda/libimobiledevice-1.1.4-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=app-pda/libplist-1.8-r1 >=app-pda/usbmuxd-1.0.8 gnutls? ( dev-libs/libgcrypt >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( dev-libs/openssl:0 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-pda/libplist-1.8-r1 >=app-pda/usbmuxd-1.0.8 gnutls? ( dev-libs/libgcrypt >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( dev-libs/openssl:0 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Support library to communicate with Apple iPhone/iPod Touch devices
 EAPI=5
 HOMEPAGE=http://www.libimobiledevice.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=app-pda/libplist-1.8-r1 >=app-pda/usbmuxd-1.0.8 gnutls? ( dev-libs/libgcrypt >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( dev-libs/openssl:0 )
 SLOT=0
 SRC_URI=http://www.libimobiledevice.org/downloads/libimobiledevice-1.1.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cd6cdc4db5834d9c942277c59f06f18b
diff --git a/metadata/md5-cache/app-pda/libimobiledevice-1.1.4-r4 b/metadata/md5-cache/app-pda/libimobiledevice-1.1.4-r4
index 4dd00e5e5a5b..47f0ea77d245 100644
--- a/metadata/md5-cache/app-pda/libimobiledevice-1.1.4-r4
+++ b/metadata/md5-cache/app-pda/libimobiledevice-1.1.4-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=app-pda/libplist-1.8-r1 >=app-pda/usbmuxd-1.0.8 gnutls? ( dev-libs/libgcrypt >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( dev-libs/openssl:0 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-pda/libplist-1.8-r1 >=app-pda/usbmuxd-1.0.8 gnutls? ( dev-libs/libgcrypt >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( dev-libs/openssl:0 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Support library to communicate with Apple iPhone/iPod Touch devices
 EAPI=5
 HOMEPAGE=http://www.libimobiledevice.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=app-pda/libplist-1.8-r1 >=app-pda/usbmuxd-1.0.8 gnutls? ( dev-libs/libgcrypt >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( dev-libs/openssl:0 )
 SLOT=0
 SRC_URI=http://www.libimobiledevice.org/downloads/libimobiledevice-1.1.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2bc0681b563da9509a99e77cf939cfca
diff --git a/metadata/md5-cache/app-pda/libopensync-0.22-r1 b/metadata/md5-cache/app-pda/libopensync-0.22-r1
index 41f893bda087..079c046d2320 100644
--- a/metadata/md5-cache/app-pda/libopensync-0.22-r1
+++ b/metadata/md5-cache/app-pda/libopensync-0.22-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2 virtual/pkgconfig doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-1.3.17 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2 virtual/pkgconfig doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-1.3.17 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenSync synchronisation framework library
 EAPI=3
 HOMEPAGE=http://www.opensync.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.opensync.org/download/releases/0.22/libopensync-0.22.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=045ddbace4d4e575885360338bd0012b
diff --git a/metadata/md5-cache/app-pda/libopensync-plugin-palm-0.22 b/metadata/md5-cache/app-pda/libopensync-plugin-palm-0.22
index 737b2473b113..380328c5715b 100644
--- a/metadata/md5-cache/app-pda/libopensync-plugin-palm-0.22
+++ b/metadata/md5-cache/app-pda/libopensync-plugin-palm-0.22
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=~app-pda/libopensync-0.22 >=app-pda/pilot-link-0.11.8 dev-libs/glib:2 dev-libs/libxml2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=~app-pda/libopensync-0.22 >=app-pda/pilot-link-0.11.8 dev-libs/glib:2 dev-libs/libxml2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenSync Palm Plugin
 EAPI=3
 HOMEPAGE=http://www.opensync.org/
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=~app-pda/libopensync-0.22 >=app-pda/pilot-link-0.11.8 dev-libs/glib:2 dev-libs/libxml2
 SLOT=0
 SRC_URI=http://www.opensync.org/download/releases/0.22/libopensync-plugin-palm-0.22.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=652b2a20ba4ea3f4df4e971af9950182
diff --git a/metadata/md5-cache/app-pda/pilot-link-0.12.5 b/metadata/md5-cache/app-pda/pilot-link-0.12.5
index 98182efd7ef5..f37aacd236c4 100644
--- a/metadata/md5-cache/app-pda/pilot-link-0.12.5
+++ b/metadata/md5-cache/app-pda/pilot-link-0.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/popt >=sys-libs/ncurses-5.7-r7 virtual/libiconv bluetooth? ( net-wireless/bluez ) perl? ( >=dev-lang/perl-5.12 ) png? ( media-libs/libpng:0 ) readline? ( >=sys-libs/readline-6 ) usb? ( virtual/libusb:0 ) java? ( >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=dev-libs/popt >=sys-libs/ncurses-5.7-r7 virtual/libiconv bluetooth? ( net-wireless/bluez ) perl? ( >=dev-lang/perl-5.12 ) png? ( media-libs/libpng:0 ) readline? ( >=sys-libs/readline-6 ) usb? ( virtual/libusb:0 ) java? ( >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=suite of tools for moving data between a Palm device and a desktop
 EAPI=3
 HOMEPAGE=http://www.pilot-link.org/
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 LGPL-2 )
 RDEPEND=dev-libs/popt >=sys-libs/ncurses-5.7-r7 virtual/libiconv bluetooth? ( net-wireless/bluez ) perl? ( >=dev-lang/perl-5.12 ) png? ( media-libs/libpng:0 ) readline? ( >=sys-libs/readline-6 ) usb? ( virtual/libusb:0 ) 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 )
 SLOT=0
 SRC_URI=http://pilot-link.org/source/pilot-link-0.12.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a2bcf77a0c014390ff0fbfff0669bd49
diff --git a/metadata/md5-cache/app-portage/repo-commit-0.4 b/metadata/md5-cache/app-portage/repo-commit-0.4
index 8437da323fa9..eaf66ec7d22f 100644
--- a/metadata/md5-cache/app-portage/repo-commit-0.4
+++ b/metadata/md5-cache/app-portage/repo-commit-0.4
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=|| ( >=sys-apps/portage-2.2.0_alpha86 ( >=sys-apps/portage-2.1.10.30 <sys-apps/portage-2.2.0_alpha ) app-portage/gentoolkit-dev ) sys-apps/portage
 SLOT=0
 SRC_URI=mirror://bitbucket/gentoo/repo-commit/downloads/repo-commit-0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3c1c9479115cc5fc08c0c68b62eba8ef
diff --git a/metadata/md5-cache/app-portage/repo-commit-0.4.1 b/metadata/md5-cache/app-portage/repo-commit-0.4.1
index 9e09b419fdc8..7e951b3ebe56 100644
--- a/metadata/md5-cache/app-portage/repo-commit-0.4.1
+++ b/metadata/md5-cache/app-portage/repo-commit-0.4.1
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=|| ( >=sys-apps/portage-2.2.0_alpha86 ( >=sys-apps/portage-2.1.10.30 <sys-apps/portage-2.2.0_alpha ) app-portage/gentoolkit-dev ) sys-apps/portage
 SLOT=0
 SRC_URI=mirror://bitbucket/gentoo/repo-commit/downloads/repo-commit-0.4.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=de3cb79383311d45663048491b7eaf08
diff --git a/metadata/md5-cache/app-portage/repo-commit-9999 b/metadata/md5-cache/app-portage/repo-commit-9999
index f89b926e2952..37eb40980875 100644
--- a/metadata/md5-cache/app-portage/repo-commit-9999
+++ b/metadata/md5-cache/app-portage/repo-commit-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A repository commit helper
 EAPI=4
 HOMEPAGE=https://bitbucket.org/gentoo/repo-commit/
 LICENSE=BSD
 RDEPEND=|| ( >=sys-apps/portage-2.2.0_alpha86 ( >=sys-apps/portage-2.1.10.30 <sys-apps/portage-2.2.0_alpha ) app-portage/gentoolkit-dev ) sys-apps/portage
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=03c0da84a20c71bbb8bd541e247f557c
diff --git a/metadata/md5-cache/app-portage/tatt-0.1 b/metadata/md5-cache/app-portage/tatt-0.1
new file mode 100644
index 000000000000..72da8878e1b0
--- /dev/null
+++ b/metadata/md5-cache/app-portage/tatt-0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] app-portage/eix app-portage/gentoolkit www-client/pybugz dev-python/configobj python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=tatt is an arch testing tool
+EAPI=5
+HOMEPAGE=https://github.com/tom111/tatt
+IUSE=+templates python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] app-portage/eix app-portage/gentoolkit www-client/pybugz dev-python/configobj python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=https://github.com/tom111/tatt/archive/v0.1.tar.gz -> tatt-0.1.tar.gz
+_eclasses_=distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=27079729ef635b814e75dc976ab16534
diff --git a/metadata/md5-cache/app-portage/tatt-9999 b/metadata/md5-cache/app-portage/tatt-9999
index 0697f43f299d..68ba761dba0a 100644
--- a/metadata/md5-cache/app-portage/tatt-9999
+++ b/metadata/md5-cache/app-portage/tatt-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=dev-python/setuptools || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) dev-vcs/git
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] app-portage/eix app-portage/gentoolkit www-client/pybugz dev-python/configobj python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-vcs/git
 DESCRIPTION=tatt is an arch testing tool
-EAPI=2
+EAPI=5
 HOMEPAGE=http://github.com/tom111/tatt
-IUSE=+templates
+IUSE=+templates python_targets_python2_6 python_targets_python2_7
 LICENSE=GPL-2
-RDEPEND=app-portage/eix app-portage/gentoolkit www-client/pybugz dev-python/configobj || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] app-portage/eix app-portage/gentoolkit www-client/pybugz dev-python/configobj python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 SLOT=0
-_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=8574fc66f9116a02a75bc344318dd1af
+_eclasses_=distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a1cba977427f9ae3ca628369d247af4d
diff --git a/metadata/md5-cache/app-portage/ufed-0.40.2-r1 b/metadata/md5-cache/app-portage/ufed-0.40.2-r1
index 825a7ce1e826..5a6d60f08f6a 100644
--- a/metadata/md5-cache/app-portage/ufed-0.40.2-r1
+++ b/metadata/md5-cache/app-portage/ufed-0.40.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Gentoo Linux USE flags editor
 EAPI=4
 HOMEPAGE=http://www.gentoo.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses dev-lang/perl
 SLOT=0
 SRC_URI=mirror://gentoo/ufed-0.40.2.tar.bz2 http://dev.gentoo.org/~fuzzyray/distfiles/ufed-0.40.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=84f548c5a1c858032ef1b910fec79cd4
diff --git a/metadata/md5-cache/app-portage/ufed-0.90_rc1 b/metadata/md5-cache/app-portage/ufed-0.90_rc1
index 593d74f37fb6..a12c354d8f23 100644
--- a/metadata/md5-cache/app-portage/ufed-0.90_rc1
+++ b/metadata/md5-cache/app-portage/ufed-0.90_rc1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Gentoo Linux USE flags editor
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses dev-lang/perl
 SLOT=0
 SRC_URI=mirror://gentoo/ufed-0.90_rc1.tar.bz2 http://dev.gentoo.org/~fuzzyray/distfiles/ufed-0.90_rc1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5d167be0c1139f0ef9fba0503cdf75f1
diff --git a/metadata/md5-cache/app-portage/ufed-0.90_rc2 b/metadata/md5-cache/app-portage/ufed-0.90_rc2
index 3605c4d1e736..ee8635d89254 100644
--- a/metadata/md5-cache/app-portage/ufed-0.90_rc2
+++ b/metadata/md5-cache/app-portage/ufed-0.90_rc2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=sys-libs/ncurses virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Gentoo Linux USE flags editor
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses dev-lang/perl
 SLOT=0
 SRC_URI=mirror://gentoo/ufed-0.90_rc2.tar.bz2 http://dev.gentoo.org/~fuzzyray/distfiles/ufed-0.90_rc2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b6a44fb4c6223faf281a18ea0c8924eb
diff --git a/metadata/md5-cache/app-portage/ufed-9999 b/metadata/md5-cache/app-portage/ufed-9999
index ed4debc9faad..4703c00e5044 100644
--- a/metadata/md5-cache/app-portage/ufed-9999
+++ b/metadata/md5-cache/app-portage/ufed-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure prepare unpack
-DEPEND=sys-libs/ncurses virtual/pkgconfig dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses virtual/pkgconfig dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Gentoo Linux USE flags editor
 EAPI=4
 HOMEPAGE=http://www.gentoo.org/
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses dev-lang/perl
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1f730c7f01449e0e15c371b0fdb2a9b0
diff --git a/metadata/md5-cache/app-shells/dash-0.5.5.1.2 b/metadata/md5-cache/app-shells/dash-0.5.5.1.2
index d5237563ea3e..bc0dd2151c36 100644
--- a/metadata/md5-cache/app-shells/dash-0.5.5.1.2
+++ b/metadata/md5-cache/app-shells/dash-0.5.5.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=libedit? ( dev-libs/libedit ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=libedit? ( dev-libs/libedit ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=DASH is a direct descendant of the NetBSD version of ash (the Almquist SHell) and is POSIX compliant
 HOMEPAGE=http://gondor.apana.org.au/~herbert/dash/
 IUSE=libedit static
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=libedit? ( dev-libs/libedit )
 SLOT=0
 SRC_URI=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-2.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ee06d7434ec67fd7d21bf0640b8092be
diff --git a/metadata/md5-cache/app-shells/dash-0.5.5.1.7 b/metadata/md5-cache/app-shells/dash-0.5.5.1.7
index 19938eb33b49..3fc5e6af6575 100644
--- a/metadata/md5-cache/app-shells/dash-0.5.5.1.7
+++ b/metadata/md5-cache/app-shells/dash-0.5.5.1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=!static? ( libedit? ( dev-libs/libedit ) ) virtual/pkgconfig libedit? ( static? ( dev-libs/libedit[static-libs] ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!static? ( libedit? ( dev-libs/libedit ) ) virtual/pkgconfig libedit? ( static? ( dev-libs/libedit[static-libs] ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=DASH is a direct descendant of the NetBSD version of ash (the Almquist SHell) and is POSIX compliant
 EAPI=2
 HOMEPAGE=http://gondor.apana.org.au/~herbert/dash/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!static? ( libedit? ( dev-libs/libedit ) )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f605c759411cbf3dd0e0e29311a03921
diff --git a/metadata/md5-cache/app-shells/dash-0.5.7.1 b/metadata/md5-cache/app-shells/dash-0.5.7.1
index d96e07905607..51c768f4ed10 100644
--- a/metadata/md5-cache/app-shells/dash-0.5.7.1
+++ b/metadata/md5-cache/app-shells/dash-0.5.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=!static? ( libedit? ( dev-libs/libedit ) ) virtual/pkgconfig libedit? ( static? ( dev-libs/libedit[static-libs] ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!static? ( libedit? ( dev-libs/libedit ) ) virtual/pkgconfig libedit? ( static? ( dev-libs/libedit[static-libs] ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=DASH is a direct descendant of the NetBSD version of ash (the Almquist SHell) and is POSIX compliant
 EAPI=2
 HOMEPAGE=http://gondor.apana.org.au/~herbert/dash/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!static? ( libedit? ( dev-libs/libedit ) )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=45746cea566ae7179cdeaf146ff4ea4c
diff --git a/metadata/md5-cache/app-shells/dash-0.5.7.3-r1 b/metadata/md5-cache/app-shells/dash-0.5.7.3-r1
index 5dc37aa7cb8f..8f76e5830ae1 100644
--- a/metadata/md5-cache/app-shells/dash-0.5.7.3-r1
+++ b/metadata/md5-cache/app-shells/dash-0.5.7.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=!static? ( libedit? ( dev-libs/libedit ) ) virtual/pkgconfig libedit? ( static? ( dev-libs/libedit[static-libs] ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!static? ( libedit? ( dev-libs/libedit ) ) virtual/pkgconfig libedit? ( static? ( dev-libs/libedit[static-libs] ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=DASH is a direct descendant of the NetBSD version of ash (the Almquist SHell) and is POSIX compliant
 EAPI=4
 HOMEPAGE=http://gondor.apana.org.au/~herbert/dash/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!static? ( libedit? ( dev-libs/libedit ) )
 SLOT=0
 SRC_URI=http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.7.tar.gz mirror://debian/pool/main/d/dash/dash_0.5.7-3.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=176c86d8399beae865cd73b056f987cc
diff --git a/metadata/md5-cache/app-shells/fish-1.23.1 b/metadata/md5-cache/app-shells/fish-1.23.1
index 9ff241f84bea..2ad139c91df0 100644
--- a/metadata/md5-cache/app-shells/fish-1.23.1
+++ b/metadata/md5-cache/app-shells/fish-1.23.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=sys-libs/ncurses sys-devel/bc sys-devel/gettext www-client/htmlview X? ( x11-misc/xsel ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses sys-devel/bc sys-devel/gettext www-client/htmlview X? ( x11-misc/xsel ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=fish is the Friendly Interactive SHell
 EAPI=3
 HOMEPAGE=http://fishshell.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses sys-devel/bc sys-devel/gettext www-client/htmlview X? ( x11-misc/xsel )
 SLOT=0
 SRC_URI=http://fishshell.com/files/1.23.1/fish-1.23.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=353829b72f9a72911edf295660f1bbb1
diff --git a/metadata/md5-cache/app-shells/fish-1.23.1-r2 b/metadata/md5-cache/app-shells/fish-1.23.1-r2
index a8e14b1152e9..2ca9568ea439 100644
--- a/metadata/md5-cache/app-shells/fish-1.23.1-r2
+++ b/metadata/md5-cache/app-shells/fish-1.23.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=sys-libs/ncurses sys-devel/bc sys-devel/gettext www-client/htmlview X? ( x11-misc/xsel ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses sys-devel/bc sys-devel/gettext www-client/htmlview X? ( x11-misc/xsel ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=fish is the Friendly Interactive SHell
 EAPI=4
 HOMEPAGE=http://fishshell.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses sys-devel/bc sys-devel/gettext www-client/htmlview X? ( x11-misc/xsel )
 SLOT=0
 SRC_URI=http://fishshell.com/files/1.23.1/fish-1.23.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d36ee9086b6bb23333dfedfbbaf1f3d5
diff --git a/metadata/md5-cache/app-shells/pdsh-2.18-r1 b/metadata/md5-cache/app-shells/pdsh-2.18-r1
index c86a796bdcf9..b7985be73710 100644
--- a/metadata/md5-cache/app-shells/pdsh-2.18-r1
+++ b/metadata/md5-cache/app-shells/pdsh-2.18-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=crypt? ( net-misc/openssh ) rsh? ( net-misc/netkit-rsh ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=crypt? ( net-misc/openssh ) rsh? ( net-misc/netkit-rsh ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A high-performance, parallel remote shell utility.
 EAPI=2
 HOMEPAGE=https://computing.llnl.gov/linux/pdsh.html
@@ -10,5 +10,5 @@ RDEPEND=crypt? ( net-misc/openssh ) rsh? ( net-misc/netkit-rsh ) readline? ( sys
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/pdsh/pdsh-2.18.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e75cd892beebad8b25d79c44b861a053
diff --git a/metadata/md5-cache/app-shells/posh-0.10.2 b/metadata/md5-cache/app-shells/posh-0.10.2
index 54a0bc4abcd8..9fcec9027afe 100644
--- a/metadata/md5-cache/app-shells/posh-0.10.2
+++ b/metadata/md5-cache/app-shells/posh-0.10.2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/posh/posh_0.10.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e408253abbd144521322485d74ff166c
diff --git a/metadata/md5-cache/app-shells/posh-0.11 b/metadata/md5-cache/app-shells/posh-0.11
index bc3c1ce0706e..fdc8c5c66059 100644
--- a/metadata/md5-cache/app-shells/posh-0.11
+++ b/metadata/md5-cache/app-shells/posh-0.11
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/posh/posh_0.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=661c6ed90bfe3dbe95d4980444793216
diff --git a/metadata/md5-cache/app-shells/tcsh-6.17-r1 b/metadata/md5-cache/app-shells/tcsh-6.17-r1
index 5f894efa00c9..04b8eb7a84ac 100644
--- a/metadata/md5-cache/app-shells/tcsh-6.17-r1
+++ b/metadata/md5-cache/app-shells/tcsh-6.17-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.1 virtual/libiconv sys-devel/gettext doc? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.1 virtual/libiconv sys-devel/gettext doc? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Enhanced version of the Berkeley C shell (csh)
 EAPI=3
 HOMEPAGE=http://www.tcsh.org/
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/ncurses-5.1 virtual/libiconv
 RESTRICT=test
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0456b1068e569ed82c4e94532c5e7d4f
diff --git a/metadata/md5-cache/app-shells/tcsh-6.17.06 b/metadata/md5-cache/app-shells/tcsh-6.17.06
index d4b50b1a4f1f..6975e62fabdc 100644
--- a/metadata/md5-cache/app-shells/tcsh-6.17.06
+++ b/metadata/md5-cache/app-shells/tcsh-6.17.06
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.1 virtual/libiconv sys-devel/gettext doc? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.1 virtual/libiconv sys-devel/gettext doc? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Enhanced version of the Berkeley C shell (csh)
 EAPI=3
 HOMEPAGE=http://www.tcsh.org/
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/ncurses-5.1 virtual/libiconv
 RESTRICT=test
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c00a0abcd05c8b0b190e5f99339c2646
diff --git a/metadata/md5-cache/app-shells/tcsh-6.18.01 b/metadata/md5-cache/app-shells/tcsh-6.18.01
index 78124dc5e9f5..ebfe8a03da79 100644
--- a/metadata/md5-cache/app-shells/tcsh-6.18.01
+++ b/metadata/md5-cache/app-shells/tcsh-6.18.01
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.1 virtual/libiconv sys-devel/gettext doc? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.1 virtual/libiconv sys-devel/gettext doc? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Enhanced version of the Berkeley C shell (csh)
 EAPI=3
 HOMEPAGE=http://www.tcsh.org/
 IUSE=nls doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.1 virtual/libiconv
 RESTRICT=test
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cf7d9477cd24042e4a0ee92d4cecfca0
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7a0fee5d55fdb1c4492db9b03c6e1ade
diff --git a/metadata/md5-cache/app-text/a2ps-4.14-r1 b/metadata/md5-cache/app-text/a2ps-4.14-r1
index 7aaff616e418..0892d8c7ca21 100644
--- a/metadata/md5-cache/app-text/a2ps-4.14-r1
+++ b/metadata/md5-cache/app-text/a2ps-4.14-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=>=dev-util/gperf-2.7.2 || ( >=dev-util/yacc-1.9.1 sys-devel/bison ) app-text/ghostscript-gpl >=app-text/psutils-1.17 emacs? ( virtual/emacs ) latex? ( virtual/latex-base ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-util/gperf-2.7.2 || ( >=dev-util/yacc-1.9.1 sys-devel/bison ) app-text/ghostscript-gpl >=app-text/psutils-1.17 emacs? ( virtual/emacs ) latex? ( virtual/latex-base ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Any to PostScript filter
 HOMEPAGE=http://www.inf.enst.fr/~demaille/a2ps/
 IUSE=emacs nls latex vanilla userland_BSD userland_GNU linguas_ja
@@ -9,5 +9,5 @@ RDEPEND=app-text/ghostscript-gpl app-text/wdiff userland_GNU? ( || ( >=sys-apps/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/a2ps/a2ps-4.14.tar.gz linguas_ja? ( mirror://gentoo/a2ps-4.14-ja_nls.patch.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=834a572b5ab537e11828ae094dc20054
diff --git a/metadata/md5-cache/app-text/a2ps-4.14-r2 b/metadata/md5-cache/app-text/a2ps-4.14-r2
index 212f4a3351c5..0db3e6ef5b81 100644
--- a/metadata/md5-cache/app-text/a2ps-4.14-r2
+++ b/metadata/md5-cache/app-text/a2ps-4.14-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Any to PostScript filter
 EAPI=3
 HOMEPAGE=http://www.inf.enst.fr/~demaille/a2ps/
@@ -10,5 +10,5 @@ RDEPEND=app-text/ghostscript-gpl app-text/wdiff app-text/libpaper userland_GNU?
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/a2ps/a2ps-4.14.tar.gz linguas_ja? ( mirror://gentoo/a2ps-4.14-ja_nls.patch.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=20218f4e0097f5017d8d49062dbbb624
diff --git a/metadata/md5-cache/app-text/a2ps-4.14-r3 b/metadata/md5-cache/app-text/a2ps-4.14-r3
index 7bb4852f1f19..6c4e84bf24b5 100644
--- a/metadata/md5-cache/app-text/a2ps-4.14-r3
+++ b/metadata/md5-cache/app-text/a2ps-4.14-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=app-text/ghostscript-gpl app-text/libpaper >=app-text/psutils-1.17 app-text/wdiff emacs? ( virtual/emacs ) latex? ( virtual/latex-base ) nls? ( virtual/libintl ) userland_GNU? ( >=sys-apps/coreutils-6.10-r1 ) userland_BSD? ( sys-freebsd/freebsd-ubin ) >=dev-util/gperf-2.7.2 virtual/yacc nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-text/ghostscript-gpl app-text/libpaper >=app-text/psutils-1.17 app-text/wdiff emacs? ( virtual/emacs ) latex? ( virtual/latex-base ) nls? ( virtual/libintl ) userland_GNU? ( >=sys-apps/coreutils-6.10-r1 ) userland_BSD? ( sys-freebsd/freebsd-ubin ) >=dev-util/gperf-2.7.2 virtual/yacc nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Any to PostScript filter
 EAPI=4
 HOMEPAGE=http://www.inf.enst.fr/~demaille/a2ps/
@@ -10,5 +10,5 @@ RDEPEND=app-text/ghostscript-gpl app-text/libpaper >=app-text/psutils-1.17 app-t
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/a2ps/a2ps-4.14.tar.gz linguas_ja? ( mirror://gentoo/a2ps-4.14-ja_nls.patch.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=49de7da54fdb65edf3e72f8ceff99195
diff --git a/metadata/md5-cache/app-text/active-dvi-1.10.2 b/metadata/md5-cache/app-text/active-dvi-1.10.2
index b328f96e3d37..33cc090aa8d5 100644
--- a/metadata/md5-cache/app-text/active-dvi-1.10.2
+++ b/metadata/md5-cache/app-text/active-dvi-1.10.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=dev-lang/ocaml-3.11.2[ocamlopt?] >=dev-ml/camlimages-4.0.1[truetype,tiff,jpeg,postscript,X] 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-lang/ocaml-3.11.2[ocamlopt?] >=dev-ml/camlimages-4.0.1[truetype,tiff,jpeg,postscript,X] 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A DVI previewer and a presenter for slides written in LaTeX
 EAPI=2
 HOMEPAGE=http://gallium.inria.fr/advi/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-3.11.2[ocamlopt?] >=dev-ml/camlimages-4.0.1[truetype,tiff,jpeg,postscript,X] virtual/latex-base app-text/ghostscript-gpl x11-libs/libXinerama
 SLOT=0
 SRC_URI=http://gallium.inria.fr/advi/advi-1.10.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	texlive-common	dcab7201316e43f118d20a1d6dab09a9	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	texlive-common	dcab7201316e43f118d20a1d6dab09a9	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e7c23c680e7c16fcae99ce6b26ec7b3a
diff --git a/metadata/md5-cache/app-text/asciidoc-9999 b/metadata/md5-cache/app-text/asciidoc-9999
index 3adcdfca6de4..b026ec51c3b5 100644
--- a/metadata/md5-cache/app-text/asciidoc-9999
+++ b/metadata/md5-cache/app-text/asciidoc-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-util/source-highlight media-sound/lilypond media-gfx/imagemagick dev-texlive/texlive-latex app-text/dvipng media-gfx/graphviz python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_pypy1_9? ( dev-python/pypy:1.9 ) python_single_target_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_pypy1_9(+)?,python_single_target_pypy2_0(+)?] ) dev-util/aap www-client/lynx dev-util/source-highlight dev-vcs/mercurial || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=test? ( dev-util/source-highlight media-sound/lilypond media-gfx/imagemagick dev-texlive/texlive-latex app-text/dvipng media-gfx/graphviz python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_pypy1_9? ( dev-python/pypy:1.9 ) python_single_target_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_pypy1_9(+)?,python_single_target_pypy2_0(+)?] ) dev-util/aap www-client/lynx dev-util/source-highlight dev-vcs/mercurial || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A text document format for writing short documents, articles, books and UNIX man pages
 EAPI=5
 HOMEPAGE=http://www.methods.co.nz/asciidoc/
@@ -7,5 +7,5 @@ IUSE=examples graphviz highlight test vim-syntax python_targets_python2_5 python
 LICENSE=GPL-2
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt graphviz? ( media-gfx/graphviz ) app-text/docbook-xml-dtd:4.5 highlight? ( || ( dev-python/pygments[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_pypy1_9(+)?,python_single_target_pypy2_0(+)?] dev-util/source-highlight ) ) python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_pypy1_9? ( dev-python/pypy:1.9 ) python_single_target_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_pypy1_9(+)?,python_single_target_pypy2_0(+)?]
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	mercurial	7e8c2c49cfd90701e20a78850f066802	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	mercurial	7e8c2c49cfd90701e20a78850f066802	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fbff4dc137f2feb6acf482244f516204
diff --git a/metadata/md5-cache/app-text/aspell-0.60.6.1 b/metadata/md5-cache/app-text/aspell-0.60.6.1
index 30d5c9fe1515..e2b00d0a6174 100644
--- a/metadata/md5-cache/app-text/aspell-0.60.6.1
+++ b/metadata/md5-cache/app-text/aspell-0.60.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=sys-libs/ncurses-5.2 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.2 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A spell checker replacement for ispell
 EAPI=4
 HOMEPAGE=http://aspell.net/
@@ -10,5 +10,5 @@ PDEPEND=app-dicts/aspell-en linguas_af? ( app-dicts/aspell-af ) linguas_be? ( ap
 RDEPEND=>=sys-libs/ncurses-5.2 nls? ( virtual/libintl ) !=app-dicts/aspell-en-0.5*
 SLOT=0
 SRC_URI=mirror://gnu/aspell/aspell-0.60.6.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5dcc3365d198d29648af8e99516fc09e
diff --git a/metadata/md5-cache/app-text/calibre-0.9.20 b/metadata/md5-cache/app-text/calibre-0.9.20
deleted file mode 100644
index e16fdc77e5f1..000000000000
--- a/metadata/md5-cache/app-text/calibre-0.9.20
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40:= >=dev-libs/icu-4.4:= >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/freetype-2:= >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4:= virtual/libusb:1= dev-qt/qtdbus:4= dev-qt/qtsvg:4= >=x11-misc/xdg-utils-1.0.2-r2 >=dev-python/setuptools-0.6_rc5 =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
-DESCRIPTION=Ebook management application.
-EAPI=5
-HOMEPAGE=http://calibre-ebook.com/
-IUSE=+udisks
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40:= >=dev-libs/icu-4.4:= >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/freetype-2:= >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4:= virtual/libusb:1= dev-qt/qtdbus:4= dev-qt/qtsvg:4= >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) ) =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
-SLOT=0
-SRC_URI=http://sourceforge.net/projects/calibre/files/0.9.20/calibre-0.9.20.tar.xz
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=22fc1584c7ea2992668e4fecaa42b64c
diff --git a/metadata/md5-cache/app-text/calibre-0.9.26 b/metadata/md5-cache/app-text/calibre-0.9.26
deleted file mode 100644
index 9bcd3520ed7d..000000000000
--- a/metadata/md5-cache/app-text/calibre-0.9.26
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40:= >=dev-libs/icu-4.4:= >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/freetype-2:= >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4:= virtual/libusb:1= dev-qt/qtdbus:4= dev-qt/qtsvg:4= >=x11-misc/xdg-utils-1.0.2-r2 >=dev-python/setuptools-0.6_rc5 =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
-DESCRIPTION=Ebook management application.
-EAPI=5
-HOMEPAGE=http://calibre-ebook.com/
-IUSE=+udisks
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40:= >=dev-libs/icu-4.4:= >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/freetype-2:= >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4:= virtual/libusb:1= dev-qt/qtdbus:4= dev-qt/qtsvg:4= >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) ) =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
-SLOT=0
-SRC_URI=http://sourceforge.net/projects/calibre/files/0.9.26/calibre-0.9.26.tar.xz
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=54f4f81820161f7a740813cf77bd5de6
diff --git a/metadata/md5-cache/app-text/calibre-0.9.27 b/metadata/md5-cache/app-text/calibre-0.9.27
index e27528044e98..a28f487647a1 100644
--- a/metadata/md5-cache/app-text/calibre-0.9.27
+++ b/metadata/md5-cache/app-text/calibre-0.9.27
@@ -4,10 +4,10 @@ DESCRIPTION=Ebook management application.
 EAPI=5
 HOMEPAGE=http://calibre-ebook.com/
 IUSE=+udisks
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40:= >=dev-libs/icu-4.4:= >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/freetype-2:= >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4:= virtual/libusb:1= dev-qt/qtdbus:4= dev-qt/qtsvg:4= >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) ) =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
 SLOT=0
 SRC_URI=http://sourceforge.net/projects/calibre/files/0.9.27/calibre-0.9.27.tar.xz
 _eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=04727604bbad6044c86d13ede553b15f
+_md5_=031191b56b7e2f2172c2d052c84688fc
diff --git a/metadata/md5-cache/app-text/catdoc-0.94.2-r2 b/metadata/md5-cache/app-text/catdoc-0.94.2-r2
index a13829234ec7..fbb3cdd8a8f6 100644
--- a/metadata/md5-cache/app-text/catdoc-0.94.2-r2
+++ b/metadata/md5-cache/app-text/catdoc-0.94.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=tk? ( >=dev-lang/tk-8.1 )
 SLOT=0
 SRC_URI=http://ftp.wagner.pp.ru/pub/catdoc/catdoc-0.94.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a7a5beed7f88d6f527926103f254f41f
diff --git a/metadata/md5-cache/app-text/crf++-0.53 b/metadata/md5-cache/app-text/crf++-0.53
index 6de748345548..c43136214d90 100644
--- a/metadata/md5-cache/app-text/crf++-0.53
+++ b/metadata/md5-cache/app-text/crf++-0.53
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Yet Another CRF toolkit for segmenting/labelling sequential data
 HOMEPAGE=http://crfpp.sourceforge.net/
 IUSE=examples
@@ -7,5 +7,5 @@ KEYWORDS=~x86 ~amd64
 LICENSE=|| ( BSD LGPL-2.1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/crfpp/CRF++-0.53.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db4e1744a444c85431cd21ba0c70380e
diff --git a/metadata/md5-cache/app-text/crf++-0.54 b/metadata/md5-cache/app-text/crf++-0.54
index 96789420e009..17dbe4f2bf88 100644
--- a/metadata/md5-cache/app-text/crf++-0.54
+++ b/metadata/md5-cache/app-text/crf++-0.54
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Yet Another CRF toolkit for segmenting/labelling sequential data
 EAPI=3
 HOMEPAGE=http://crfpp.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=|| ( BSD LGPL-2.1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/crfpp/CRF++-0.54.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b65d46774db8a6d5a31f0dafa25c8049
diff --git a/metadata/md5-cache/app-text/djview-4.7 b/metadata/md5-cache/app-text/djview-4.7
index b063c59149de..9a6453e8012f 100644
--- a/metadata/md5-cache/app-text/djview-4.7
+++ b/metadata/md5-cache/app-text/djview-4.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtgui:4 >=sys-devel/autoconf-2.67 virtual/pkgconfig nsplugin? ( dev-libs/glib:2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtgui:4 >=sys-devel/autoconf-2.67 virtual/pkgconfig nsplugin? ( dev-libs/glib:2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Portable DjVu viewer using Qt4
 EAPI=4
 HOMEPAGE=http://djvu.sourceforge.net/djview4.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtgui:4
 SLOT=0
 SRC_URI=mirror://sourceforge/djvu/djview-4.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a9cf447be09bebfab3831a6207bd7b03
diff --git a/metadata/md5-cache/app-text/djview-4.8 b/metadata/md5-cache/app-text/djview-4.8
index 64480e223f3d..724932c557eb 100644
--- a/metadata/md5-cache/app-text/djview-4.8
+++ b/metadata/md5-cache/app-text/djview-4.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtgui:4[dbus] >=sys-devel/autoconf-2.67 virtual/pkgconfig nsplugin? ( dev-libs/glib:2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtgui:4[dbus] >=sys-devel/autoconf-2.67 virtual/pkgconfig nsplugin? ( dev-libs/glib:2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Portable DjVu viewer using Qt4
 EAPI=4
 HOMEPAGE=http://djvu.sourceforge.net/djview4.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtgui:4[dbus]
 SLOT=0
 SRC_URI=mirror://sourceforge/djvu/djview-4.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3dde4b8816397c9482fc152b46d79d74
diff --git a/metadata/md5-cache/app-text/djview-4.9 b/metadata/md5-cache/app-text/djview-4.9
index 63ec4cbf9a6e..2ace088356ad 100644
--- a/metadata/md5-cache/app-text/djview-4.9
+++ b/metadata/md5-cache/app-text/djview-4.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtgui:4[dbus] >=sys-devel/autoconf-2.67 virtual/pkgconfig nsplugin? ( dev-libs/glib:2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtgui:4[dbus] >=sys-devel/autoconf-2.67 virtual/pkgconfig nsplugin? ( dev-libs/glib:2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Portable DjVu viewer using Qt4
 EAPI=4
 HOMEPAGE=http://djvu.sourceforge.net/djview4.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtgui:4[dbus]
 SLOT=0
 SRC_URI=mirror://sourceforge/djvu/djview-4.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=174fae0e07e09792b05d3fefce2cf08a
diff --git a/metadata/md5-cache/app-text/djvu-3.5.24-r1 b/metadata/md5-cache/app-text/djvu-3.5.24-r1
index 1666989ecd5e..74ab981ade08 100644
--- a/metadata/md5-cache/app-text/djvu-3.5.24-r1
+++ b/metadata/md5-cache/app-text/djvu-3.5.24-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=DjVu viewers, encoders and utilities
 EAPI=4
 HOMEPAGE=http://djvu.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/djvu/djvulibre-3.5.24.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b7337ce6b70ad0a1adba284917864607
diff --git a/metadata/md5-cache/app-text/djvu-3.5.25.3 b/metadata/md5-cache/app-text/djvu-3.5.25.3
index 6ee9c0e04d24..03fc6f2c44b7 100644
--- a/metadata/md5-cache/app-text/djvu-3.5.25.3
+++ b/metadata/md5-cache/app-text/djvu-3.5.25.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0= ) || ( gnome-base/librsvg media-gfx/inkscape ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0= ) || ( gnome-base/librsvg media-gfx/inkscape ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=DjVu viewers, encoders and utilities
 EAPI=5
 HOMEPAGE=http://djvu.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/djvu/djvulibre-3.5.25.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b7b1d2160022d11f5be06abea80311af
diff --git a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r1 b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r1
index 2674dfe144c1..89c41b2df78f 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r1
+++ b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/openjade dev-perl/SGMLSpm ~app-text/docbook-xml-simple-dtd-4.1.2.4 ~app-text/docbook-xml-simple-dtd-1.0 app-text/docbook-xml-dtd ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 jadetex? ( app-text/jadetex ) userland_GNU? ( sys-apps/which ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/openjade dev-perl/SGMLSpm ~app-text/docbook-xml-simple-dtd-4.1.2.4 ~app-text/docbook-xml-simple-dtd-1.0 app-text/docbook-xml-dtd ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 jadetex? ( app-text/jadetex ) userland_GNU? ( sys-apps/which ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Shell scripts to manage DocBook documents
 EAPI=3
 HOMEPAGE=http://sources.redhat.com/docbook-tools/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/openjade dev-perl/SGMLSpm ~app-text/docbook-xml-simple-dtd-4.1.2.4 ~app-text/docbook-xml-simple-dtd-1.0 app-text/docbook-xml-dtd ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 jadetex? ( app-text/jadetex ) userland_GNU? ( sys-apps/which ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m )
 SLOT=0
 SRC_URI=ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=19359147ede198844bd50ff583011e95
diff --git a/metadata/md5-cache/app-text/docbook2X-0.8.8-r2 b/metadata/md5-cache/app-text/docbook2X-0.8.8-r2
index 3c2be34d92f4..7eac98dfd2a1 100644
--- a/metadata/md5-cache/app-text/docbook2X-0.8.8-r2
+++ b/metadata/md5-cache/app-text/docbook2X-0.8.8-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/perl dev-libs/libxslt dev-perl/XML-NamespaceSupport dev-perl/XML-SAX dev-perl/XML-LibXML app-text/docbook-xsl-stylesheets =app-text/docbook-xml-dtd-4.2*
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook2x/docbook2X-0.8.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4b4edd41971af0ec8404d0cd9ecdc342
diff --git a/metadata/md5-cache/app-text/dvipdfmx-20110311 b/metadata/md5-cache/app-text/dvipdfmx-20110311
index 9601fe3aa44e..1801122efa24 100644
--- a/metadata/md5-cache/app-text/dvipdfmx-20110311
+++ b/metadata/md5-cache/app-text/dvipdfmx-20110311
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm prepare
-DEPEND=app-text/libpaper >=media-libs/libpng-1.2:0 sys-libs/zlib dev-libs/kpathsea app-text/libpaper || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-text/libpaper >=media-libs/libpng-1.2:0 sys-libs/zlib dev-libs/kpathsea app-text/libpaper || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=DVI to PDF translator with multi-byte character support
 EAPI=3
 HOMEPAGE=http://project.ktug.or.kr/dvipdfmx/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/libpaper >=media-libs/libpng-1.2:0 sys-libs/zlib dev-libs/kpathsea app-text/libpaper virtual/tex-base >=app-text/poppler-0.12.3-r3 app-text/poppler-data
 SLOT=0
 SRC_URI=http://project.ktug.or.kr/dvipdfmx/snapshot/latest/dvipdfmx-20110311.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	texlive-common	dcab7201316e43f118d20a1d6dab09a9	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	texlive-common	dcab7201316e43f118d20a1d6dab09a9	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9055a53fdbc78dbb7473254abf940cff
diff --git a/metadata/md5-cache/app-text/dvisvgm-1.0.8 b/metadata/md5-cache/app-text/dvisvgm-1.0.8
index 8a2e0f04aa1b..cac01638458b 100644
--- a/metadata/md5-cache/app-text/dvisvgm-1.0.8
+++ b/metadata/md5-cache/app-text/dvisvgm-1.0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=virtual/tex-base app-text/ghostscript-gpl media-libs/freetype:2 sys-libs/zlib virtual/pkgconfig test? ( dev-cpp/gtest ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/tex-base app-text/ghostscript-gpl media-libs/freetype:2 sys-libs/zlib virtual/pkgconfig test? ( dev-cpp/gtest ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Converts DVI files to SVG
 EAPI=3
 HOMEPAGE=http://dvisvgm.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=virtual/tex-base app-text/ghostscript-gpl media-libs/freetype:2 sys-libs
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/dvisvgm/dvisvgm-1.0.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2409399a232b4773f28c8b01bf05807f
diff --git a/metadata/md5-cache/app-text/dvisvgm-1.2 b/metadata/md5-cache/app-text/dvisvgm-1.2
index 281258b36779..04d948792d7d 100644
--- a/metadata/md5-cache/app-text/dvisvgm-1.2
+++ b/metadata/md5-cache/app-text/dvisvgm-1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=virtual/tex-base app-text/ghostscript-gpl >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 sys-libs/zlib virtual/pkgconfig test? ( dev-cpp/gtest ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/tex-base app-text/ghostscript-gpl >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 sys-libs/zlib virtual/pkgconfig test? ( dev-cpp/gtest ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Converts DVI files to SVG
 EAPI=4
 HOMEPAGE=http://dvisvgm.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=virtual/tex-base app-text/ghostscript-gpl >=media-gfx/potrace-1.10-r1 me
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/dvisvgm/dvisvgm-1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d466584325b30a9fd3606cac755c973c
diff --git a/metadata/md5-cache/app-text/enchant-1.6.0 b/metadata/md5-cache/app-text/enchant-1.6.0
index 3b95e4d5e3d3..e912836d1543 100644
--- a/metadata/md5-cache/app-text/enchant-1.6.0
+++ b/metadata/md5-cache/app-text/enchant-1.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1 ) zemberek? ( dev-libs/dbus-glib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1 ) zemberek? ( dev-libs/dbus-glib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Spellchecker wrapping library
 EAPI=4
 HOMEPAGE=http://www.abisource.com/enchant/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunsp
 REQUIRED_USE=|| ( hunspell aspell zemberek )
 SLOT=0
 SRC_URI=http://www.abisource.com/downloads/enchant/1.6.0/enchant-1.6.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d4470d104ac1577617b787aa80f29da6
diff --git a/metadata/md5-cache/app-text/evince-2.32.0-r4 b/metadata/md5-cache/app-text/evince-2.32.0-r4
index 9645c720c3b7..e4b1aebd86bc 100644
--- a/metadata/md5-cache/app-text/evince-2.32.0-r4
+++ b/metadata/md5-cache/app-text/evince-2.32.0-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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-libs/libICE || ( >=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?] ) postscript? ( >=app-text/libspectre-0.2.0 ) 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 virtual/pkgconfig sys-devel/gettext dev-util/gtk-doc-am >=dev-util/intltool-0.35 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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-libs/libICE || ( >=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?] ) postscript? ( >=app-text/libspectre-0.2.0 ) 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 virtual/pkgconfig sys-devel/gettext dev-util/gtk-doc-am >=dev-util/intltool-0.35 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple document viewer for GNOME
 EAPI=4
 HOMEPAGE=http://projects.gnome.org/evince/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.5:2 >=x11-libs/gtk+-2.21.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/evince/2.32/evince-2.32.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d67c929e40f6b57ce13306b4235061f0
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.04-r4 b/metadata/md5-cache/app-text/ghostscript-gpl-9.04-r4
index 57e2d31fa420..fbdb49ec176e 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.04-r4
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.04-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Ghostscript is an interpreter for the PostScript language and for PDF
 EAPI=3
 HOMEPAGE=http://ghostscript.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-3 CPL-1.0
 RDEPEND=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
 SLOT=0
 SRC_URI=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 ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4766557560353051c5ddb0757be59fde
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.05-r1 b/metadata/md5-cache/app-text/ghostscript-gpl-9.05-r1
index 5a566c9ad510..d8c6eaca2065 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.05-r1
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.05-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Ghostscript is an interpreter for the PostScript language and for PDF
 EAPI=3
 HOMEPAGE=http://ghostscript.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-3 CPL-1.0
 RDEPEND=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.5-r1 >=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
 SLOT=0
 SRC_URI=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 ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6c46289813a95ba3f1350b01c0f8f202
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.05-r2 b/metadata/md5-cache/app-text/ghostscript-gpl-9.05-r2
index 5889d5d3880e..f2f20555afac 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.05-r2
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.05-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Ghostscript is an interpreter for the PostScript language and for PDF
 EAPI=3
 HOMEPAGE=http://ghostscript.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-3 CPL-1.0
 RDEPEND=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.5-r1 >=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
 SLOT=0
 SRC_URI=mirror://sourceforge/ghostscript/ghostscript-9.05.tar.bz2 mirror://gentoo/ghostscript-gpl-9.05-patchset-2.tar.bz2 !bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-1.5.tar.gz ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=517bfb7e4ea849ff24107acbffc126a6
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.06 b/metadata/md5-cache/app-text/ghostscript-gpl-9.06
index 54d17d1248ad..e63613a9c293 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.06
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.06
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=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+:3 x11-libs/gtk+:2 ) ) idn? ( net-dns/libidn ) jpeg2k? ( >=media-libs/openjpeg-1.5.0 ) X? ( x11-libs/libXt x11-libs/libXext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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+:3 x11-libs/gtk+:2 ) ) idn? ( net-dns/libidn ) jpeg2k? ( >=media-libs/openjpeg-1.5.0 ) X? ( x11-libs/libXt x11-libs/libXext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Ghostscript is an interpreter for the PostScript language and for PDF
 EAPI=4
 HOMEPAGE=http://ghostscript.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-3 CPL-1.0
 RDEPEND=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+:3 x11-libs/gtk+:2 ) ) idn? ( net-dns/libidn ) jpeg2k? ( >=media-libs/openjpeg-1.5.0 ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.5-r1 >=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
 SLOT=0
 SRC_URI=mirror://sourceforge/ghostscript/ghostscript-9.06.tar.bz2 mirror://gentoo/ghostscript-gpl-9.06-patchset-1.tar.bz2 !bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-1.5.tar.gz ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a2aa67752b4b6c9d1247420d1236b9f1
diff --git a/metadata/md5-cache/app-text/gonzui-1.2 b/metadata/md5-cache/app-text/gonzui-1.2
deleted file mode 100644
index 6f16e3fb994b..000000000000
--- a/metadata/md5-cache/app-text/gonzui-1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND==dev-lang/ruby-1.8* >=sys-libs/db-4.2 >=dev-ruby/ruby-bdb-0.5.2 dev-ruby/ruby-progressbar ocaml? ( dev-lang/ocaml ) =dev-lang/ruby-1.8*
-DESCRIPTION=source code search engine
-HOMEPAGE=http://gonzui.sourceforge.net/
-IUSE=ocaml
-KEYWORDS=~amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND==dev-lang/ruby-1.8* >=sys-libs/db-4.2 >=dev-ruby/ruby-bdb-0.5.2 dev-ruby/ruby-progressbar ocaml? ( dev-lang/ocaml ) =dev-lang/ruby-1.8*
-SLOT=0
-SRC_URI=mirror://sourceforge/gonzui/gonzui-1.2.tar.gz
-_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	ruby	d0d4dafe867eb79ce8953e27d88fc00f	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3a5cbd1d55cea3409074bba0d7c940e9
diff --git a/metadata/md5-cache/app-text/gonzui-1.2-r2 b/metadata/md5-cache/app-text/gonzui-1.2-r2
deleted file mode 100644
index 3064834943fd..000000000000
--- a/metadata/md5-cache/app-text/gonzui-1.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
-DESCRIPTION=source code search engine
-EAPI=2
-HOMEPAGE=http://gonzui.sourceforge.net/
-IUSE=bzip2 cvs gzip lha ocaml perl rpm subversion zip test elibc_FreeBSD ruby_targets_ruby18
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/gonzui/gonzui-1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9aade451948b99ba6f9fb153d47df25c
diff --git a/metadata/md5-cache/app-text/gtkspell-3.0.0 b/metadata/md5-cache/app-text/gtkspell-3.0.0
index a0025d996e4e..fd64643db59c 100644
--- a/metadata/md5-cache/app-text/gtkspell-3.0.0
+++ b/metadata/md5-cache/app-text/gtkspell-3.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=app-text/enchant-1.1.6 dev-libs/glib:2 x11-libs/gtk+:3[introspection?] >=x11-libs/pango-1.8.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.30 ) >=dev-util/gtk-doc-am-1.17 >=dev-util/intltool-0.35.0 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-text/enchant-1.1.6 dev-libs/glib:2 x11-libs/gtk+:3[introspection?] >=x11-libs/pango-1.8.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.30 ) >=dev-util/gtk-doc-am-1.17 >=dev-util/intltool-0.35.0 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Spell checking widget for GTK
 EAPI=5
 HOMEPAGE=http://gtkspell.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-text/enchant-1.1.6 dev-libs/glib:2 x11-libs/gtk+:3[introspection?] >=x11-libs/pango-1.8.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.30 )
 SLOT=3/0
 SRC_URI=mirror://sourceforge/project/gtkspell/3.0.0/gtkspell3-3.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7478eb92ac6f5195afc681ff578c99de
diff --git a/metadata/md5-cache/app-text/gtranslator-1.9.13 b/metadata/md5-cache/app-text/gtranslator-1.9.13
index 1d63e1db287d..abd3a520e01a 100644
--- a/metadata/md5-cache/app-text/gtranslator-1.9.13
+++ b/metadata/md5-cache/app-text/gtranslator-1.9.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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-2* >=gnome-extra/gucharmap-2:0 ) 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 virtual/pkgconfig app-text/gnome-doc-utils app-text/docbook-xml-dtd:4.1.2 gnome-base/gnome-common dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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-2* >=gnome-extra/gucharmap-2:0 ) 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 virtual/pkgconfig app-text/gnome-doc-utils app-text/docbook-xml-dtd:4.1.2 gnome-base/gnome-common dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=An enhanced gettext po file editor for GNOME
 EAPI=3
 HOMEPAGE=http://gtranslator.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=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-2* >=gnome-extra/gucharmap-2:0 ) http? ( >=dev-libs/json-glib-0.7.6 ) spell? ( >=app-text/gtkspell-2.0.2:2 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtranslator/1.9/gtranslator-1.9.13.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=15791785b6e5fae165003a10bfc443cf
diff --git a/metadata/md5-cache/app-text/htmltidy-20090325-r1 b/metadata/md5-cache/app-text/htmltidy-20090325-r1
index 5fb5989ab3f1..58256a748493 100644
--- a/metadata/md5-cache/app-text/htmltidy-20090325-r1
+++ b/metadata/md5-cache/app-text/htmltidy-20090325-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tidy the layout and correct errors in HTML and XML documents
 EAPI=4
 HOMEPAGE=http://tidy.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/tidy-20090325.tar.bz2 mirror://gentoo/tidy-20090325-doc.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7e0e162ee3bedda5c663400948cccde0
diff --git a/metadata/md5-cache/app-text/hunspell-1.3.2-r3 b/metadata/md5-cache/app-text/hunspell-1.3.2-r3
index 0f01b57fc2f5..cf83e3640593 100644
--- a/metadata/md5-cache/app-text/hunspell-1.3.2-r3
+++ b/metadata/md5-cache/app-text/hunspell-1.3.2-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Hunspell spell checker - an improved replacement for myspell in OOo.
 EAPI=4
 HOMEPAGE=http://hunspell.sourceforge.net/
@@ -10,5 +10,5 @@ PDEPEND=app-dicts/myspell-en linguas_af? ( app-dicts/myspell-af ) linguas_bg? (
 RDEPEND=ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=mirror://sourceforge/hunspell/hunspell-1.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=86d7220be6d0ffe0c8d391172c5ce2f9
diff --git a/metadata/md5-cache/app-text/liblangtag-0.4.0-r1 b/metadata/md5-cache/app-text/liblangtag-0.4.0-r1
index 9da7f35d42bb..f444ad0cc238 100644
--- a/metadata/md5-cache/app-text/liblangtag-0.4.0-r1
+++ b/metadata/md5-cache/app-text/liblangtag-0.4.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib dev-libs/libxml2 introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) dev-libs/gobject-introspection-common sys-devel/gettext test? ( dev-libs/check ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib dev-libs/libxml2 introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) dev-libs/gobject-introspection-common sys-devel/gettext test? ( dev-libs/check ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An interface library to access tags for identifying languages
 EAPI=5
 HOMEPAGE=http://tagoh.bitbucket.org/liblangtag/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib dev-libs/libxml2 introspection? ( >=dev-libs/gobject-intro
 RESTRICT=test
 SLOT=0
 SRC_URI=https://bitbucket.org/tagoh/liblangtag/downloads/liblangtag-0.4.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=813797ffb0b62dca563a20b4398a259a
diff --git a/metadata/md5-cache/app-text/libmspub-9999 b/metadata/md5-cache/app-text/libmspub-9999
index 9a44e8a9773c..ea5f40921227 100644
--- a/metadata/md5-cache/app-text/libmspub-9999
+++ b/metadata/md5-cache/app-text/libmspub-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 dev-libs/icu:= sys-libs/zlib virtual/pkgconfig dev-libs/boost sys-devel/libtool doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 dev-libs/icu:= sys-libs/zlib virtual/pkgconfig dev-libs/boost sys-devel/libtool doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Library parsing the Microsoft Publisher documents
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/libmspub
@@ -7,5 +7,5 @@ IUSE=doc static-libs
 LICENSE=LGPL-2.1
 RDEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 dev-libs/icu:= sys-libs/zlib
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ebcea57a7dfd3500a128e92e08e704df
diff --git a/metadata/md5-cache/app-text/libpaper-1.1.24-r1 b/metadata/md5-cache/app-text/libpaper-1.1.24-r1
index 82ff5e7b581b..e1c25b816e6b 100644
--- a/metadata/md5-cache/app-text/libpaper-1.1.24-r1
+++ b/metadata/md5-cache/app-text/libpaper-1.1.24-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for handling paper characteristics
 EAPI=4
 HOMEPAGE=http://packages.debian.org/unstable/source/libpaper
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libp/libpaper/libpaper_1.1.24.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5f6699d188fe7da2c6d27ee851d99820
diff --git a/metadata/md5-cache/app-text/libspectre-0.2.6 b/metadata/md5-cache/app-text/libspectre-0.2.6
index a92ab1ec25de..4751fcba8b8e 100644
--- a/metadata/md5-cache/app-text/libspectre-0.2.6
+++ b/metadata/md5-cache/app-text/libspectre-0.2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=app-text/ghostscript-gpl-8.62 virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-text/ghostscript-gpl-8.62 virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for rendering Postscript documents
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/libspectre
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/ghostscript-gpl-8.62
 RESTRICT=test
 SLOT=0
 SRC_URI=http://libspectre.freedesktop.org/releases/libspectre-0.2.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=64f806fd281569180a501a67670ae330
diff --git a/metadata/md5-cache/app-text/libspectre-0.2.7 b/metadata/md5-cache/app-text/libspectre-0.2.7
index 510bbfb7f098..311e24280101 100644
--- a/metadata/md5-cache/app-text/libspectre-0.2.7
+++ b/metadata/md5-cache/app-text/libspectre-0.2.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=app-text/ghostscript-gpl-8.62 virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-text/ghostscript-gpl-8.62 virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for rendering Postscript documents
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/libspectre
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/ghostscript-gpl-8.62
 RESTRICT=test
 SLOT=0
 SRC_URI=http://libspectre.freedesktop.org/releases/libspectre-0.2.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d283e7ae794c919b75a03b4da01883d9
diff --git a/metadata/md5-cache/app-text/libxmlpatch-0.3.1 b/metadata/md5-cache/app-text/libxmlpatch-0.3.1
index 881339ecc9b2..f7bdebdacff8 100644
--- a/metadata/md5-cache/app-text/libxmlpatch-0.3.1
+++ b/metadata/md5-cache/app-text/libxmlpatch-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=dev-libs/glib virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A set of tools to create and apply patch to XML files using XPath
 HOMEPAGE=http://xmlpatch.sourceforge.net/
 KEYWORDS=~amd64
@@ -7,5 +7,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib
 SLOT=0
 SRC_URI=mirror://sourceforge/xmlpatch/libxmlpatch-0.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e7ebf2f0b1aed76fcc5bc12d949c9217
diff --git a/metadata/md5-cache/app-text/libxmlpatch-0.3.3 b/metadata/md5-cache/app-text/libxmlpatch-0.3.3
index e82dfc8a16ae..d4aac77480c2 100644
--- a/metadata/md5-cache/app-text/libxmlpatch-0.3.3
+++ b/metadata/md5-cache/app-text/libxmlpatch-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 dev-libs/libxml2 test? ( dev-libs/check ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 dev-libs/libxml2 test? ( dev-libs/check ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A set of tools to create and apply patch to XML files using XPath
 EAPI=4
 HOMEPAGE=http://xmlpatch.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2
 SLOT=0
 SRC_URI=mirror://sourceforge/xmlpatch/libxmlpatch-0.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b651834f9072d5ad709126201ba2cfe1
diff --git a/metadata/md5-cache/app-text/lv-4.51-r3 b/metadata/md5-cache/app-text/lv-4.51-r3
index 4842b5b78cd1..f3ff7cd4efe9 100644
--- a/metadata/md5-cache/app-text/lv-4.51-r3
+++ b/metadata/md5-cache/app-text/lv-4.51-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses !app-editors/levee dev-lang/perl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses !app-editors/levee dev-lang/perl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Powerful Multilingual File Viewer
 EAPI=4
 HOMEPAGE=http://www.ff.iij4u.or.jp/~nrt/lv/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses !app-editors/levee
 SLOT=0
 SRC_URI=http://www.ff.iij4u.or.jp/~nrt/freeware/lv451.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=31fccad6f77e247e40b680d4171d4e1f
diff --git a/metadata/md5-cache/app-text/mecab-0.97-r1 b/metadata/md5-cache/app-text/mecab-0.97-r1
index 9bd7a699c700..435b341b5cc7 100644
--- a/metadata/md5-cache/app-text/mecab-0.97-r1
+++ b/metadata/md5-cache/app-text/mecab-0.97-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-lang/perl || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Yet Another Part-of-Speech and Morphological Analyzer
 HOMEPAGE=http://mecab.sourceforge.net/
 IUSE=unicode
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/mecab/mecab-0.97.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=b94ec182006b96dbb47bf9feac014e6d
diff --git a/metadata/md5-cache/app-text/mecab-0.98 b/metadata/md5-cache/app-text/mecab-0.98
index 8561d46532f5..2467385c2673 100644
--- a/metadata/md5-cache/app-text/mecab-0.98
+++ b/metadata/md5-cache/app-text/mecab-0.98
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/perl virtual/libiconv || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl virtual/libiconv || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Yet Another Part-of-Speech and Morphological Analyzer
 EAPI=2
 HOMEPAGE=http://mecab.sourceforge.net/
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/perl virtual/libiconv
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/mecab/mecab-0.98.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6ad1d8ddecc0af5843826fed4c7b27f5
diff --git a/metadata/md5-cache/app-text/mecab-0.991 b/metadata/md5-cache/app-text/mecab-0.991
index f45146a0f5af..3bde20e64a4c 100644
--- a/metadata/md5-cache/app-text/mecab-0.991
+++ b/metadata/md5-cache/app-text/mecab-0.991
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/perl virtual/libiconv || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl virtual/libiconv || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Yet Another Part-of-Speech and Morphological Analyzer
 EAPI=4
 HOMEPAGE=http://mecab.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=|| ( BSD LGPL-2.1 GPL-2 )
 PDEPEND=|| ( >=app-dicts/mecab-ipadic-2.7.0.20070610[unicode=] app-dicts/mecab-naist-jdic[unicode=] )
 SLOT=0
 SRC_URI=http://mecab.googlecode.com/files/mecab-0.991.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2b998d8ed6d4090210609be3e51db373
diff --git a/metadata/md5-cache/app-text/mecab-0.993 b/metadata/md5-cache/app-text/mecab-0.993
index f89bd38e4c3c..3d98c2b52c05 100644
--- a/metadata/md5-cache/app-text/mecab-0.993
+++ b/metadata/md5-cache/app-text/mecab-0.993
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/perl virtual/libiconv || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl virtual/libiconv || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Yet Another Part-of-Speech and Morphological Analyzer
 EAPI=4
 HOMEPAGE=http://mecab.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=|| ( BSD LGPL-2.1 GPL-2 )
 PDEPEND=|| ( >=app-dicts/mecab-ipadic-2.7.0.20070610[unicode=] app-dicts/mecab-naist-jdic[unicode=] )
 SLOT=0
 SRC_URI=http://mecab.googlecode.com/files/mecab-0.993.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=360e50ab76875fef9d60d4da89c94ae7
diff --git a/metadata/md5-cache/app-text/mecab-0.994 b/metadata/md5-cache/app-text/mecab-0.994
index f41388fb4c09..69ef74c2a605 100644
--- a/metadata/md5-cache/app-text/mecab-0.994
+++ b/metadata/md5-cache/app-text/mecab-0.994
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/perl virtual/libiconv || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl virtual/libiconv || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Yet Another Part-of-Speech and Morphological Analyzer
 EAPI=4
 HOMEPAGE=http://mecab.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=|| ( BSD LGPL-2.1 GPL-2 )
 PDEPEND=|| ( >=app-dicts/mecab-ipadic-2.7.0.20070610[unicode=] app-dicts/mecab-naist-jdic[unicode=] )
 SLOT=0
 SRC_URI=http://mecab.googlecode.com/files/mecab-0.994.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d24b539ab74e7360007c4a50516b0278
diff --git a/metadata/md5-cache/app-text/mecab-0.995 b/metadata/md5-cache/app-text/mecab-0.995
index 134bdacdf103..dbdc4c6bfde2 100644
--- a/metadata/md5-cache/app-text/mecab-0.995
+++ b/metadata/md5-cache/app-text/mecab-0.995
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/perl virtual/libiconv || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl virtual/libiconv || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Yet Another Part-of-Speech and Morphological Analyzer
 EAPI=4
 HOMEPAGE=http://mecab.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=|| ( BSD LGPL-2.1 GPL-2 )
 PDEPEND=|| ( >=app-dicts/mecab-ipadic-2.7.0.20070610[unicode=] app-dicts/mecab-naist-jdic[unicode=] )
 SLOT=0
 SRC_URI=http://mecab.googlecode.com/files/mecab-0.995.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ce80703b1019612aca7c25b8614e5f37
diff --git a/metadata/md5-cache/app-text/mecab-0.996 b/metadata/md5-cache/app-text/mecab-0.996
index 8f24e203fd15..5730c14b44b3 100644
--- a/metadata/md5-cache/app-text/mecab-0.996
+++ b/metadata/md5-cache/app-text/mecab-0.996
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/perl virtual/libiconv || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl virtual/libiconv || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Yet Another Part-of-Speech and Morphological Analyzer
 EAPI=5
 HOMEPAGE=http://mecab.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=|| ( BSD LGPL-2.1 GPL-2 )
 PDEPEND=|| ( >=app-dicts/mecab-ipadic-2.7.0.20070610[unicode=] app-dicts/mecab-naist-jdic[unicode=] )
 SLOT=0
 SRC_URI=http://mecab.googlecode.com/files/mecab-0.996.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c81ded70da5bc6eb196134572e9d9ff9
diff --git a/metadata/md5-cache/app-text/migemo-0.40-r5 b/metadata/md5-cache/app-text/migemo-0.40-r5
index 1d6318991e80..148964111db8 100644
--- a/metadata/md5-cache/app-text/migemo-0.40-r5
+++ b/metadata/md5-cache/app-text/migemo-0.40-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-ruby/ruby-romkan[ruby_targets_ruby18] dev-ruby/bsearch[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-ruby/ruby-romkan[ruby_targets_ree18] dev-ruby/bsearch[ruby_targets_ree18] ) app-dicts/migemo-dict[-unicode] emacs? ( virtual/emacs app-emacs/apel ) || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=ruby_targets_ruby18? ( dev-ruby/ruby-romkan[ruby_targets_ruby18] dev-ruby/bsearch[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-ruby/ruby-romkan[ruby_targets_ree18] dev-ruby/bsearch[ruby_targets_ree18] ) app-dicts/migemo-dict[-unicode] emacs? ( virtual/emacs app-emacs/apel ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Migemo is Japanese Incremental Search Tool
 EAPI=4
 HOMEPAGE=http://0xcc.net/migemo/
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby18? ( dev-ruby/ruby-romkan[ruby_targets_ruby18] dev-rub
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 )
 SLOT=0
 SRC_URI=http://0xcc.net/migemo/stable/migemo-0.40.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4a14a44d86fc8e06ea5889713dfcaa41
diff --git a/metadata/md5-cache/app-text/namazu-2.0.22_p1 b/metadata/md5-cache/app-text/namazu-2.0.22_p1
index cdb86b2c3027..90bdb46304af 100644
--- a/metadata/md5-cache/app-text/namazu-2.0.22_p1
+++ b/metadata/md5-cache/app-text/namazu-2.0.22_p1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-perl/File-MMagic-1.20 emacs? ( virtual/emacs ) linguas_ja? ( app-i18n/nkf || ( dev-perl/Text-Kakasi app-i18n/kakasi app-text/chasen app-text/mecab ) ) nls? ( virtual/libintl ) tk? ( dev-lang/tk www-client/lynx )
 SLOT=0
 SRC_URI=http://www.namazu.org/test/namazu-2.0.22pre1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6743efab5b885ecac97942c095fd92af
diff --git a/metadata/md5-cache/app-text/openjade-1.3.2-r4 b/metadata/md5-cache/app-text/openjade-1.3.2-r4
index fd21bad4670a..fe5c52559be9 100644
--- a/metadata/md5-cache/app-text/openjade-1.3.2-r4
+++ b/metadata/md5-cache/app-text/openjade-1.3.2-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare prerm unpack
-DEPEND=dev-lang/perl app-text/sgml-common >=app-text/opensp-1.5.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-text/sgml-common-0.6.3-r2
+DEPEND=dev-lang/perl app-text/sgml-common >=app-text/opensp-1.5.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Jade is an implementation of DSSSL - an ISO standard for formatting SGML and XML documents
 EAPI=2
 HOMEPAGE=http://openjade.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=app-text/sgml-common >=app-text/opensp-1.5.1
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/openjade-1.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	sgml-catalog	115ce04390f5bb32de8fef875ea71b4b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	sgml-catalog	115ce04390f5bb32de8fef875ea71b4b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=716601ee3068281e4f8a7a478ae55951
diff --git a/metadata/md5-cache/app-text/openjade-1.3.2-r5 b/metadata/md5-cache/app-text/openjade-1.3.2-r5
index 99f969fa1442..c601c65ebcd8 100644
--- a/metadata/md5-cache/app-text/openjade-1.3.2-r5
+++ b/metadata/md5-cache/app-text/openjade-1.3.2-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare prerm unpack
-DEPEND=dev-lang/perl app-text/sgml-common >=app-text/opensp-1.5.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-text/sgml-common-0.6.3-r2
+DEPEND=dev-lang/perl app-text/sgml-common >=app-text/opensp-1.5.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Jade is an implementation of DSSSL - an ISO standard for formatting SGML and XML documents
 EAPI=2
 HOMEPAGE=http://openjade.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=app-text/sgml-common >=app-text/opensp-1.5.1
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/openjade-1.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	sgml-catalog	115ce04390f5bb32de8fef875ea71b4b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	sgml-catalog	115ce04390f5bb32de8fef875ea71b4b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1c21782ef971feb8e581de178a424f8d
diff --git a/metadata/md5-cache/app-text/pspdftool-0.03 b/metadata/md5-cache/app-text/pspdftool-0.03
index 6ce78d7a5393..b62889d15b36 100644
--- a/metadata/md5-cache/app-text/pspdftool-0.03
+++ b/metadata/md5-cache/app-text/pspdftool-0.03
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tool for prepress preparation of PDF and PostScript documents
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/pspdftool
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/pspdftool/pspdftool-0.03.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=b8e4f9074a78c5600b9add8f66e88eb7
diff --git a/metadata/md5-cache/app-text/pspdftool-9999 b/metadata/md5-cache/app-text/pspdftool-9999
index 40b10bf461cf..45997749bb45 100644
--- a/metadata/md5-cache/app-text/pspdftool-9999
+++ b/metadata/md5-cache/app-text/pspdftool-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install preinst prepare unpack
-DEPEND=zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=Tool for prepress preparation of PDF and PostScript documents
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/pspdftool
@@ -7,5 +7,5 @@ IUSE=zlib
 LICENSE=GPL-2
 RDEPEND=zlib? ( sys-libs/zlib )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3b9c1ef47561991e0b073f0ea5327509
diff --git a/metadata/md5-cache/app-text/qpdfview-0.4.2 b/metadata/md5-cache/app-text/qpdfview-0.4.2
new file mode 100644
index 000000000000..a51ab9094c76
--- /dev/null
+++ b/metadata/md5-cache/app-text/qpdfview-0.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=app-text/poppler[qt4] dev-qt/qtcore:4[iconv] dev-qt/qtgui:4 cups? ( net-print/cups ) dbus? ( dev-qt/qtdbus:4 ) djvu? ( app-text/djvu ) postscript? ( app-text/libspectre ) sqlite? ( dev-qt/qtsql:4[sqlite] ) svg? ( dev-qt/qtsvg:4 ) !svg? ( virtual/freedesktop-icon-theme ) virtual/pkgconfig
+DESCRIPTION=A tabbed document viewer
+EAPI=5
+HOMEPAGE=http://launchpad.net/qpdfview
+IUSE=cups dbus djvu +pdf postscript sqlite +svg synctex linguas_ast linguas_az linguas_bg linguas_bs linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_eu linguas_fi linguas_fr linguas_he linguas_hr linguas_id linguas_it linguas_ky linguas_ms linguas_my linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_tr linguas_ug linguas_uk linguas_zh_CN
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/poppler[qt4] dev-qt/qtcore:4[iconv] dev-qt/qtgui:4 cups? ( net-print/cups ) dbus? ( dev-qt/qtdbus:4 ) djvu? ( app-text/djvu ) postscript? ( app-text/libspectre ) sqlite? ( dev-qt/qtsql:4[sqlite] ) svg? ( dev-qt/qtsvg:4 ) !svg? ( virtual/freedesktop-icon-theme )
+SLOT=0
+SRC_URI=https://launchpad.net/qpdfview/trunk/0.4.2/+download/qpdfview-0.4.2.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6009fa41af7cc2d21b962d3192cb8058
diff --git a/metadata/md5-cache/app-text/recode-3.6_p17-r2 b/metadata/md5-cache/app-text/recode-3.6_p17-r2
index 528100e3d3df..2acfd30573d0 100644
--- a/metadata/md5-cache/app-text/recode-3.6_p17-r2
+++ b/metadata/md5-cache/app-text/recode-3.6_p17-r2
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/recode/recode-3.6.tar.gz mirror://debian/pool/main/r/recode/recode_3.6-17.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=63f214f6f5c26c47e300e2b7a1ccf168
diff --git a/metadata/md5-cache/app-text/recode-3.6_p20 b/metadata/md5-cache/app-text/recode-3.6_p20
index 1109d6d2efcd..039bfa1efa14 100644
--- a/metadata/md5-cache/app-text/recode-3.6_p20
+++ b/metadata/md5-cache/app-text/recode-3.6_p20
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/recode/recode-3.6.tar.gz mirror://debian/pool/main/r/recode/recode_3.6-20.debian.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed22d7a9b9317e8f6cfbf8266f61d736
diff --git a/metadata/md5-cache/app-text/sablotron-1.0.3 b/metadata/md5-cache/app-text/sablotron-1.0.3
index 8366b6becd64..945d4bbf6319 100644
--- a/metadata/md5-cache/app-text/sablotron-1.0.3
+++ b/metadata/md5-cache/app-text/sablotron-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/expat-1.95.6-r1 >=dev-perl/XML-Parser-2.3 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/expat-1.95.6-r1 >=dev-perl/XML-Parser-2.3 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An XSLT Parser in C++
 EAPI=3
 HOMEPAGE=http://www.gingerall.org/sablotron.html
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=dev-libs/expat-1.95.6-r1
 SLOT=0
 SRC_URI=http://download-1.gingerall.cz/download/sablot/Sablot-1.0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=696bc82df76131c47315b9334142ca49
diff --git a/metadata/md5-cache/app-text/sary-1.2.0-r1 b/metadata/md5-cache/app-text/sary-1.2.0-r1
index 10e87c71163a..1fe169b889d0 100644
--- a/metadata/md5-cache/app-text/sary-1.2.0-r1
+++ b/metadata/md5-cache/app-text/sary-1.2.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Sary: suffix array library and tools
 EAPI=4
 HOMEPAGE=http://sary.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://sary.sourceforge.net/sary-1.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=fa98874167198966e23eafce99977e16
diff --git a/metadata/md5-cache/app-text/teckit-2.5.1 b/metadata/md5-cache/app-text/teckit-2.5.1
index 8056aa47e1c4..c6e9275af8c3 100644
--- a/metadata/md5-cache/app-text/teckit-2.5.1
+++ b/metadata/md5-cache/app-text/teckit-2.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare test
-DEPEND=sys-libs/zlib dev-libs/expat || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib dev-libs/expat || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Text Encoding Conversion toolkit
 EAPI=2
 HOMEPAGE=http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&cat_id=TECkit
@@ -8,5 +8,5 @@ LICENSE=|| ( CPL-0.5 LGPL-2.1 )
 RDEPEND=sys-libs/zlib dev-libs/expat
 SLOT=0
 SRC_URI=http://scripts.sil.org/svn-view/teckit/TAGS/TECkit_2_5_1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=90c7dda5e22e8a3568ff075f9ae7c65f
diff --git a/metadata/md5-cache/app-text/tesseract-3.02 b/metadata/md5-cache/app-text/tesseract-3.02
index 96163bba2acd..12b2638b1521 100644
--- a/metadata/md5-cache/app-text/tesseract-3.02
+++ b/metadata/md5-cache/app-text/tesseract-3.02
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/leptonica[zlib,tiff?,jpeg?,png?,webp?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/leptonica[zlib,tiff?,jpeg?,png?,webp?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An OCR Engine that was developed at HP and now at Google
 EAPI=4
 HOMEPAGE=http://code.google.com/p/tesseract-ocr/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=media-libs/leptonica[zlib,tiff?,jpeg?,png?,webp?]
 SLOT=0
 SRC_URI=http://tesseract-ocr.googlecode.com/files/tesseract-3.02.02.tar.gz http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.eng.tar.gz doc? ( http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02-doc-html.tar.gz ) linguas_ar? ( http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.ara.tar.gz ) linguas_bg? ( http://tesseract-ocr.googlecode.com/files/bul.traineddata.gz ) linguas_ca? ( http://tesseract-ocr.googlecode.com/files/cat.traineddata.gz ) linguas_chr? ( http://tesseract-ocr.googlecode.com/files/chr.traineddata.gz ) linguas_cs? ( http://tesseract-ocr.googlecode.com/files/ces.traineddata.gz ) linguas_de? ( http://tesseract-ocr.googlecode.com/files/deu.traineddata.gz http://tesseract-ocr.googlecode.com/files/deu-frak.traineddata.gz ) linguas_da? ( http://tesseract-ocr.googlecode.com/files/dan.traineddata.gz http://tesseract-ocr.googlecode.com/files/dan-frak.traineddata.gz ) linguas_el? ( http://tesseract-ocr.googlecode.com/files/ell.traineddata.gz ) linguas_es? ( http://tesseract-ocr.googlecode.com/files/spa.traineddata.gz ) linguas_fi? ( http://tesseract-ocr.googlecode.com/files/fin.traineddata.gz ) linguas_fr? ( http://tesseract-ocr.googlecode.com/files/fra.traineddata.gz ) linguas_he? ( http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.heb.tar.gz http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.01.heb-com.tar.gz ) linguas_hi? ( http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.hin.tar.gz ) linguas_hu? ( http://tesseract-ocr.googlecode.com/files/hun.traineddata.gz ) linguas_id? ( http://tesseract-ocr.googlecode.com/files/ind.traineddata.gz ) linguas_it? ( http://tesseract-ocr.googlecode.com/files/ita.traineddata.gz ) linguas_jp? ( http://tesseract-ocr.googlecode.com/files/jpn.traineddata.gz ) linguas_ko? ( http://tesseract-ocr.googlecode.com/files/kor.traineddata.gz ) linguas_lt? ( http://tesseract-ocr.googlecode.com/files/lit.traineddata.gz ) linguas_lv? ( http://tesseract-ocr.googlecode.com/files/lav.traineddata.gz ) linguas_nl? ( http://tesseract-ocr.googlecode.com/files/nld.traineddata.gz ) linguas_no? ( http://tesseract-ocr.googlecode.com/files/nor.traineddata.gz ) linguas_pl? ( http://tesseract-ocr.googlecode.com/files/pol.traineddata.gz ) linguas_pt? ( http://tesseract-ocr.googlecode.com/files/por.traineddata.gz ) linguas_ro? ( http://tesseract-ocr.googlecode.com/files/ron.traineddata.gz ) linguas_ru? ( http://tesseract-ocr.googlecode.com/files/rus.traineddata.gz ) linguas_sk? ( http://tesseract-ocr.googlecode.com/files/slk.traineddata.gz http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.01.slk-frak.tar.gz ) linguas_sl? ( http://tesseract-ocr.googlecode.com/files/slv.traineddata.gz ) linguas_sr? ( http://tesseract-ocr.googlecode.com/files/srp.traineddata.gz ) linguas_sv? ( http://tesseract-ocr.googlecode.com/files/swe.traineddata.gz http://tesseract-ocr.googlecode.com/files/swe-frak.traineddata.gz ) linguas_th? ( http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.tha.tar.gz ) linguas_tl? ( http://tesseract-ocr.googlecode.com/files/tgl.traineddata.gz ) linguas_tr? ( http://tesseract-ocr.googlecode.com/files/tur.traineddata.gz ) linguas_uk? ( http://tesseract-ocr.googlecode.com/files/ukr.traineddata.gz ) linguas_vi? ( http://tesseract-ocr.googlecode.com/files/vie.traineddata.gz ) linguas_zh_CN? ( http://tesseract-ocr.googlecode.com/files/chi_sim.traineddata.gz ) linguas_zh_TW? ( http://tesseract-ocr.googlecode.com/files/chi_tra.traineddata.gz ) osd? ( http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.01.osd.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=304c15598deb3baebe03d4b18ce71dd4
diff --git a/metadata/md5-cache/app-text/tesseract-3.02-r1 b/metadata/md5-cache/app-text/tesseract-3.02-r1
index 0dc10994b4f6..d1f22df69659 100644
--- a/metadata/md5-cache/app-text/tesseract-3.02-r1
+++ b/metadata/md5-cache/app-text/tesseract-3.02-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/leptonica[zlib,tiff?,jpeg?,png?,webp?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/leptonica[zlib,tiff?,jpeg?,png?,webp?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An OCR Engine that was developed at HP and now at Google
 EAPI=4
 HOMEPAGE=http://code.google.com/p/tesseract-ocr/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=media-libs/leptonica[zlib,tiff?,jpeg?,png?,webp?]
 SLOT=0
 SRC_URI=http://tesseract-ocr.googlecode.com/files/tesseract-3.02.02.tar.gz http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.eng.tar.gz doc? ( http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02-doc-html.tar.gz ) linguas_ar? ( http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.ara.tar.gz ) linguas_bg? ( http://tesseract-ocr.googlecode.com/files/bul.traineddata.gz ) linguas_ca? ( http://tesseract-ocr.googlecode.com/files/cat.traineddata.gz ) linguas_chr? ( http://tesseract-ocr.googlecode.com/files/chr.traineddata.gz ) linguas_cs? ( http://tesseract-ocr.googlecode.com/files/ces.traineddata.gz ) linguas_de? ( http://tesseract-ocr.googlecode.com/files/deu.traineddata.gz http://tesseract-ocr.googlecode.com/files/deu-frak.traineddata.gz ) linguas_da? ( http://tesseract-ocr.googlecode.com/files/dan.traineddata.gz http://tesseract-ocr.googlecode.com/files/dan-frak.traineddata.gz ) linguas_el? ( http://tesseract-ocr.googlecode.com/files/ell.traineddata.gz ) linguas_es? ( http://tesseract-ocr.googlecode.com/files/spa.traineddata.gz ) linguas_fi? ( http://tesseract-ocr.googlecode.com/files/fin.traineddata.gz ) linguas_fr? ( http://tesseract-ocr.googlecode.com/files/fra.traineddata.gz ) linguas_he? ( http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.heb.tar.gz http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.01.heb-com.tar.gz ) linguas_hi? ( http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.hin.tar.gz ) linguas_hu? ( http://tesseract-ocr.googlecode.com/files/hun.traineddata.gz ) linguas_id? ( http://tesseract-ocr.googlecode.com/files/ind.traineddata.gz ) linguas_it? ( http://tesseract-ocr.googlecode.com/files/ita.traineddata.gz ) linguas_jp? ( http://tesseract-ocr.googlecode.com/files/jpn.traineddata.gz ) linguas_ko? ( http://tesseract-ocr.googlecode.com/files/kor.traineddata.gz ) linguas_lt? ( http://tesseract-ocr.googlecode.com/files/lit.traineddata.gz ) linguas_lv? ( http://tesseract-ocr.googlecode.com/files/lav.traineddata.gz ) linguas_nl? ( http://tesseract-ocr.googlecode.com/files/nld.traineddata.gz ) linguas_no? ( http://tesseract-ocr.googlecode.com/files/nor.traineddata.gz ) linguas_pl? ( http://tesseract-ocr.googlecode.com/files/pol.traineddata.gz ) linguas_pt? ( http://tesseract-ocr.googlecode.com/files/por.traineddata.gz ) linguas_ro? ( http://tesseract-ocr.googlecode.com/files/ron.traineddata.gz ) linguas_ru? ( http://tesseract-ocr.googlecode.com/files/rus.traineddata.gz ) linguas_sk? ( http://tesseract-ocr.googlecode.com/files/slk.traineddata.gz http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.01.slk-frak.tar.gz ) linguas_sl? ( http://tesseract-ocr.googlecode.com/files/slv.traineddata.gz ) linguas_sr? ( http://tesseract-ocr.googlecode.com/files/srp.traineddata.gz ) linguas_sv? ( http://tesseract-ocr.googlecode.com/files/swe.traineddata.gz http://tesseract-ocr.googlecode.com/files/swe-frak.traineddata.gz ) linguas_th? ( http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.tha.tar.gz ) linguas_tl? ( http://tesseract-ocr.googlecode.com/files/tgl.traineddata.gz ) linguas_tr? ( http://tesseract-ocr.googlecode.com/files/tur.traineddata.gz ) linguas_uk? ( http://tesseract-ocr.googlecode.com/files/ukr.traineddata.gz ) linguas_vi? ( http://tesseract-ocr.googlecode.com/files/vie.traineddata.gz ) linguas_zh_CN? ( http://tesseract-ocr.googlecode.com/files/chi_sim.traineddata.gz ) linguas_zh_TW? ( http://tesseract-ocr.googlecode.com/files/chi_tra.traineddata.gz ) osd? ( http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.01.osd.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fd0294a2ed0471e513b2dfb99d12a0ce
diff --git a/metadata/md5-cache/app-text/txt2pdbdoc-1.4.4 b/metadata/md5-cache/app-text/txt2pdbdoc-1.4.4
index 38cec80ce790..6419e1e5666f 100644
--- a/metadata/md5-cache/app-text/txt2pdbdoc-1.4.4
+++ b/metadata/md5-cache/app-text/txt2pdbdoc-1.4.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=dev-lang/perl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Text/HTML to Doc file converter for the Palm Pilot
 EAPI=5
 HOMEPAGE=http://homepage.mac.com/pauljlucas/software/txt2pdbdoc/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=http://homepage.mac.com/pauljlucas/software/txt2pdbdoc-1.4.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=2d293dcd3ef29db3aafbcfc76f65dba6
diff --git a/metadata/md5-cache/app-text/unac-1.8.0 b/metadata/md5-cache/app-text/unac-1.8.0
index 3211611c8e61..816503853f44 100644
--- a/metadata/md5-cache/app-text/unac-1.8.0
+++ b/metadata/md5-cache/app-text/unac-1.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=virtual/libiconv test? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/libiconv test? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library and command-line tool for removing accents from characters
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/unac/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libiconv
 SLOT=0
 SRC_URI=mirror://debian/pool/main/u/unac/unac_1.8.0.orig.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6d005d4a2778ba192f59eb7fec01d2a6
diff --git a/metadata/md5-cache/app-text/unpaper-9999 b/metadata/md5-cache/app-text/unpaper-9999
index 77f629c8b6d0..4d10bd687987 100644
--- a/metadata/md5-cache/app-text/unpaper-9999
+++ b/metadata/md5-cache/app-text/unpaper-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure prepare test unpack
-DEPEND=test? ( media-libs/netpbm[png] ) dev-libs/libxslt app-text/docbook-xsl-ns-stylesheets dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=test? ( media-libs/netpbm[png] ) dev-libs/libxslt app-text/docbook-xsl-ns-stylesheets dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Post-processor for scanned and photocopied book pages
 EAPI=4
 HOMEPAGE=http://www.flameeyes.eu/projects/unpaper
 IUSE=test
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=ad54cb44d8b2673aa9de042ccff5dd8a
diff --git a/metadata/md5-cache/app-text/unrtf-0.21.1 b/metadata/md5-cache/app-text/unrtf-0.21.1
index 1988e6197036..111b468893fa 100644
--- a/metadata/md5-cache/app-text/unrtf-0.21.1
+++ b/metadata/md5-cache/app-text/unrtf-0.21.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Converts RTF files to various formats
 HOMEPAGE=http://www.gnu.org/software/unrtf/unrtf.html
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://www.gnu.org/software/unrtf/unrtf-0.21.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5f96a7c26a914eb48e5db5590e90c719
diff --git a/metadata/md5-cache/app-text/unrtf-0.21.2 b/metadata/md5-cache/app-text/unrtf-0.21.2
index 61d2b2eac5ce..16ed36e242e9 100644
--- a/metadata/md5-cache/app-text/unrtf-0.21.2
+++ b/metadata/md5-cache/app-text/unrtf-0.21.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Converts RTF files to various formats
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/unrtf/unrtf.html
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/unrtf/unrtf-0.21.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e8d6ce46fe39d23865be4378eceace24
diff --git a/metadata/md5-cache/app-text/uudeview-0.5.20-r1 b/metadata/md5-cache/app-text/uudeview-0.5.20-r1
index 2a7ffd0318af..035a5a0f1c59 100644
--- a/metadata/md5-cache/app-text/uudeview-0.5.20-r1
+++ b/metadata/md5-cache/app-text/uudeview-0.5.20-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=tk? ( dev-lang/tk ) sys-devel/autoconf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=tk? ( dev-lang/tk ) sys-devel/autoconf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=uu, xx, base64, binhex decoder
 EAPI=3
 HOMEPAGE=http://www.fpx.de/fp/Software/UUDeview/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=tk? ( dev-lang/tk )
 SLOT=0
 SRC_URI=http://www.fpx.de/fp/Software/UUDeview/download/uudeview-0.5.20.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bd868cd681175a981b5ad8e75e607499
diff --git a/metadata/md5-cache/app-text/vilistextum-2.6.9 b/metadata/md5-cache/app-text/vilistextum-2.6.9
index 9a0a4b2af4e4..ef5019f66aaa 100644
--- a/metadata/md5-cache/app-text/vilistextum-2.6.9
+++ b/metadata/md5-cache/app-text/vilistextum-2.6.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=virtual/libiconv || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/libiconv || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Html to ascii converter specifically programmed to get the best out of incorrect html
 EAPI=2
 HOMEPAGE=http://bhaak.dyndns.org/vilistextum/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://bhaak.dyndns.org/vilistextum/vilistextum-2.6.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=42f795ac788a761dd25dc8c685f582c5
diff --git a/metadata/md5-cache/app-text/wv-1.2.9-r1 b/metadata/md5-cache/app-text/wv-1.2.9-r1
index 41260e792659..5934f61cc69e 100644
--- a/metadata/md5-cache/app-text/wv-1.2.9-r1
+++ b/metadata/md5-cache/app-text/wv-1.2.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tool for conversion of MSWord doc and rtf files to something readable
 EAPI=3
 HOMEPAGE=http://wvware.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://abiword.org/downloads/wv/1.2.9/wv-1.2.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b9c0de14e1d64bee4cc12cfd2d18155f
diff --git a/metadata/md5-cache/app-text/xfbib-0.0.2-r1 b/metadata/md5-cache/app-text/xfbib-0.0.2-r1
index ca25c20c64ff..5ff38d38e2c8 100644
--- a/metadata/md5-cache/app-text/xfbib-0.0.2-r1
+++ b/metadata/md5-cache/app-text/xfbib-0.0.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.12 >=x11-libs/gtk+-2.10:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8
 SLOT=0
 SRC_URI=http://goodies.xfce.org/releases/xfbib/xfbib-0.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=29f19b94ed2fb5a08e42d4adf28d4616
diff --git a/metadata/md5-cache/app-text/xindy-2.4 b/metadata/md5-cache/app-text/xindy-2.4
index a897b0391dca..214b4bef5a05 100644
--- a/metadata/md5-cache/app-text/xindy-2.4
+++ b/metadata/md5-cache/app-text/xindy-2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=virtual/latex-base >=dev-lisp/clisp-2.44.1-r1 dev-texlive/texlive-langcyrillic dev-lang/perl sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/latex-base >=dev-lisp/clisp-2.44.1-r1 dev-texlive/texlive-langcyrillic dev-lang/perl sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Flexible Indexing System
 EAPI=3
 HOMEPAGE=http://www.xindy.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base >=dev-lisp/clisp-2.44.1-r1 dev-texlive/texlive-langcyrillic
 SLOT=0
 SRC_URI=http://www.xindy.org/xindy-2.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fab53103128bf5bd9f8a736887ba3457
diff --git a/metadata/md5-cache/app-text/xlhtml-0.5 b/metadata/md5-cache/app-text/xlhtml-0.5
index f8cbe0b4036e..53cd57fce611 100644
--- a/metadata/md5-cache/app-text/xlhtml-0.5
+++ b/metadata/md5-cache/app-text/xlhtml-0.5
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Convert MS Excel and Powerpoint files to HTML
 HOMEPAGE=http://chicago.sourceforge.net/xlhtml/
 KEYWORDS=alpha ~amd64 ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/chicago/xlhtml-0.5.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=a0c17a83c947f86edfb0280a2392ece7
diff --git a/metadata/md5-cache/app-text/xlhtml-0.5.1_p6 b/metadata/md5-cache/app-text/xlhtml-0.5.1_p6
index 8702fbd37453..0a144c61794e 100644
--- a/metadata/md5-cache/app-text/xlhtml-0.5.1_p6
+++ b/metadata/md5-cache/app-text/xlhtml-0.5.1_p6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Convert MS Excel and Powerpoint files to HTML
 EAPI=3
 HOMEPAGE=http://chicago.sourceforge.net/xlhtml/ http://packages.debian.org/etch/xlhtml/
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=19595846cfeee91811f7e8f6c06dd47c
diff --git a/metadata/md5-cache/app-text/xml2-0.4 b/metadata/md5-cache/app-text/xml2-0.4
index 5b7009ec59ab..4cab5a6845bf 100644
--- a/metadata/md5-cache/app-text/xml2-0.4
+++ b/metadata/md5-cache/app-text/xml2-0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-libs/libxml2 virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=These tools are used to convert XML and HTML to and from a line-oriented format.
 HOMEPAGE=http://dan.egnor.name/xml2
 KEYWORDS=~amd64 ~x86 ~x86-linux ~ppc-macos
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2
 SLOT=0
 SRC_URI=http://download.ofb.net/gale/xml2-0.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=861be70572f1689b5dec55174cb3e4f5
diff --git a/metadata/md5-cache/app-text/xmlstarlet-1.0.2 b/metadata/md5-cache/app-text/xmlstarlet-1.0.2
index 13c4bc2e9139..14da2ed17b69 100644
--- a/metadata/md5-cache/app-text/xmlstarlet-1.0.2
+++ b/metadata/md5-cache/app-text/xmlstarlet-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.9 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.9 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A set of tools to transform, query, validate, and edit XML documents
 EAPI=2
 HOMEPAGE=http://xmlstar.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.9
 SLOT=0
 SRC_URI=http://xmlstar.sourceforge.net/downloads/xmlstarlet-1.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=ad85141f136fc61ca98dcf28a405b969
diff --git a/metadata/md5-cache/app-text/xmlstarlet-1.0.6 b/metadata/md5-cache/app-text/xmlstarlet-1.0.6
index 1d8b65785cdd..18ccc63bc183 100644
--- a/metadata/md5-cache/app-text/xmlstarlet-1.0.6
+++ b/metadata/md5-cache/app-text/xmlstarlet-1.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libxml2-2.6.23 >=dev-libs/libxslt-1.1.9 dev-libs/libgcrypt virtual/libiconv sys-apps/sed virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libxml2-2.6.23 >=dev-libs/libxslt-1.1.9 dev-libs/libgcrypt virtual/libiconv sys-apps/sed virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A set of tools to transform, query, validate, and edit XML documents
 EAPI=2
 HOMEPAGE=http://xmlstar.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.6.23 >=dev-libs/libxslt-1.1.9 dev-libs/libgcrypt virtual/libiconv
 SLOT=0
 SRC_URI=mirror://sourceforge/xmlstar/xmlstarlet-1.0.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ec4d4973c11b9f27746402596fe32e17
diff --git a/metadata/md5-cache/app-text/xournal-0.4.7 b/metadata/md5-cache/app-text/xournal-0.4.7
index 9acc49cfcb28..ae3ee9ea1658 100644
--- a/metadata/md5-cache/app-text/xournal-0.4.7
+++ b/metadata/md5-cache/app-text/xournal-0.4.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=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 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Xournal is an application for notetaking, sketching, and keeping a journal using a stylus.
 EAPI=5
 HOMEPAGE=http://xournal.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/xournal/xournal-0.4.7.tar.gz !vanilla? ( http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.7-gentoo.patch.xz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=174edecfff0ea729eb2df376e35708a7
diff --git a/metadata/md5-cache/app-text/xournal-9999 b/metadata/md5-cache/app-text/xournal-9999
index d1ba15a9029a..a4f8208c4f6c 100644
--- a/metadata/md5-cache/app-text/xournal-9999
+++ b/metadata/md5-cache/app-text/xournal-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=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 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=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 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Xournal is an application for notetaking, sketching, and keeping a journal using a stylus.
 EAPI=5
 HOMEPAGE=http://xournal.sourceforge.net/
@@ -7,5 +7,5 @@ IUSE=+pdf vanilla
 LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5b3bf2af667a4d3018c401f906b3c118
diff --git a/metadata/md5-cache/dev-ada/adasockets-1.8.4.7 b/metadata/md5-cache/dev-ada/adasockets-1.8.4.7
index 432af68bd47e..f40aec582ff8 100644
--- a/metadata/md5-cache/dev-ada/adasockets-1.8.4.7
+++ b/metadata/md5-cache/dev-ada/adasockets-1.8.4.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup
-DEPEND=virtual/ada >=app-admin/eselect-gnat-1.3 || ( >=sys-devel/automake-1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=virtual/ada >=app-admin/eselect-gnat-1.3 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=An Interface to BSD sockets from Ada (TCP, UDP and multicast).
 HOMEPAGE=http://www.rfc1149.net/devel/adasockets/
 KEYWORDS=~x86 ~amd64
@@ -7,5 +7,5 @@ LICENSE=GMGPL
 RDEPEND=virtual/ada
 SLOT=0
 SRC_URI=http://www.rfc1149.net/download/adasockets/adasockets-1.8.4.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnat	2395d33f9259e627b1fb6f2719f4d235	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnat	2395d33f9259e627b1fb6f2719f4d235	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=55f22224346fce8d52eaf602817bbcc6
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-3.4.6 b/metadata/md5-cache/dev-ada/asis-gcc-3.4.6
index 3828effe309b..be1469508c1c 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-3.4.6
+++ b/metadata/md5-cache/dev-ada/asis-gcc-3.4.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND==dev-lang/gnat-gcc-3.4.6* doc? ( virtual/latex-base app-text/texi2html app-text/ghostscript-gpl ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND==dev-lang/gnat-gcc-3.4.6* doc? ( virtual/latex-base app-text/texi2html app-text/ghostscript-gpl ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=The Ada Semantic Interface Specification (tools tied to compiler). GnuAda version
 HOMEPAGE=http://gnuada.sourceforge.net/
 IUSE=doc nls
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND==dev-lang/gnat-gcc-3.4.6* app-admin/eselect-gnat
 SLOT=3.4
 SRC_URI=http://dev.gentoo.org/~george/src/asis-3.4.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7757963a5476a94f2308af0d03687564
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.1.2 b/metadata/md5-cache/dev-ada/asis-gcc-4.1.2
index 092c10d23d02..9ad73726bf5f 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.1.2
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND==dev-lang/gnat-gcc-4.1.2* doc? ( virtual/latex-base app-text/texi2html ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND==dev-lang/gnat-gcc-4.1.2* doc? ( virtual/latex-base app-text/texi2html ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=The Ada Semantic Interface Specification (tools tied to compiler). GnuAda version
 HOMEPAGE=http://gnuada.sourceforge.net/
 IUSE=doc nls
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND==dev-lang/gnat-gcc-4.1.2* app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gcc-4.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=652f4647b7b17c11414d1c00084c08ba
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.1.2-r1 b/metadata/md5-cache/dev-ada/asis-gcc-4.1.2-r1
index d1bc3e5b4f1b..b07d83e247a2 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.1.2-r1
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.1.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND==dev-lang/gnat-gcc-4.1.2* doc? ( virtual/latex-base app-text/texi2html ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND==dev-lang/gnat-gcc-4.1.2* doc? ( virtual/latex-base app-text/texi2html ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=The Ada Semantic Interface Specification (tools tied to compiler). GnuAda version
 HOMEPAGE=http://gnuada.sourceforge.net/
 IUSE=doc nls
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND==dev-lang/gnat-gcc-4.1.2* app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gcc-4.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ab7ccddf3e19ac4321d3b8564be435d6
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.2.2 b/metadata/md5-cache/dev-ada/asis-gcc-4.2.2
index 2e1c8f2b59d2..14bf4c48dde9 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.2.2
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND==dev-lang/gnat-gcc-4.2* doc? ( virtual/latex-base app-text/ghostscript-gpl app-text/texi2html ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND==dev-lang/gnat-gcc-4.2* doc? ( virtual/latex-base app-text/ghostscript-gpl app-text/texi2html ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=The Ada Semantic Interface Specification (tools tied to compiler). GnuAda version
 HOMEPAGE=http://gnuada.sourceforge.net/
 IUSE=doc nls
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND==dev-lang/gnat-gcc-4.2* app-admin/eselect-gnat
 SLOT=4.2
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gcc-4.2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=38a0146e93d72053d86a69757406240b
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.3.0_pre132166 b/metadata/md5-cache/dev-ada/asis-gcc-4.3.0_pre132166
index 43df343740b0..87d3126f7f64 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.3.0_pre132166
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.3.0_pre132166
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND==dev-lang/gnat-gcc-4.3* doc? ( virtual/latex-base app-text/ghostscript-gpl app-text/texi2html ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND==dev-lang/gnat-gcc-4.3* doc? ( virtual/latex-base app-text/ghostscript-gpl app-text/texi2html ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=The Ada Semantic Interface Specification (tools tied to compiler). GnuAda version
 HOMEPAGE=http://gnuada.sourceforge.net/
 IUSE=doc nls
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND==dev-lang/gnat-gcc-4.3* app-admin/eselect-gnat
 SLOT=4.3
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gcc-4.3.0_pre132166.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=68840231d513338f53b79c966d540c62
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.3.1 b/metadata/md5-cache/dev-ada/asis-gcc-4.3.1
index fe19824d6408..06a31bdb857e 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.3.1
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND==dev-lang/gnat-gcc-4.3* doc? ( virtual/latex-base app-text/texi2html ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND==dev-lang/gnat-gcc-4.3* doc? ( virtual/latex-base app-text/texi2html ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=The Ada Semantic Interface Specification (semantic analysis and tools tied to compiler)
 HOMEPAGE=https://libre.adacore.com/
 IUSE=doc nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gcc-4.3* app-admin/eselect-gnat
 SLOT=4.3
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gpl-2009-src.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c2ca0059f8b393b745173d436bb62235
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.3.1-r1 b/metadata/md5-cache/dev-ada/asis-gcc-4.3.1-r1
index 6082a8bc596c..9595e462db92 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.3.1-r1
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.3.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND==dev-lang/gnat-gcc-4.3* doc? ( virtual/latex-base app-text/texi2html ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND==dev-lang/gnat-gcc-4.3* doc? ( virtual/latex-base app-text/texi2html ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=The Ada Semantic Interface Specification (semantic analysis and tools tied to compiler)
 HOMEPAGE=https://libre.adacore.com/
 IUSE=doc nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gcc-4.3* app-admin/eselect-gnat
 SLOT=4.3
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gpl-2009-src.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=05de62c1a3652ae0e15a94edacc01de8
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.4 b/metadata/md5-cache/dev-ada/asis-gcc-4.4
index 781b5054cc82..fae67611154a 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.4
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND==dev-lang/gnat-gcc-4.4* doc? ( virtual/latex-base app-text/texi2html ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND==dev-lang/gnat-gcc-4.4* doc? ( virtual/latex-base app-text/texi2html ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=The Ada Semantic Interface Specification (semantic analysis and tools tied to compiler)
 HOMEPAGE=https://libre.adacore.com/
 IUSE=doc nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gcc-4.4* app-admin/eselect-gnat
 SLOT=4.4
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gpl-2010-src.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b5d66ed2bd60327e867699e0d75b3bbd
diff --git a/metadata/md5-cache/dev-ada/asis-gpl-3.4.6.2006 b/metadata/md5-cache/dev-ada/asis-gpl-3.4.6.2006
index 39fc9ec98b49..bffef61d247f 100644
--- a/metadata/md5-cache/dev-ada/asis-gpl-3.4.6.2006
+++ b/metadata/md5-cache/dev-ada/asis-gpl-3.4.6.2006
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND==dev-lang/gnat-gpl-3.4.6.2006* doc? ( virtual/latex-base app-text/texi2html ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND==dev-lang/gnat-gpl-3.4.6.2006* doc? ( virtual/latex-base app-text/texi2html ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=The Ada Semantic Interface Specification (tools tied to compiler)
 HOMEPAGE=https://libre.adacore.com/
 IUSE=doc nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gpl-3.4.6.2006* app-admin/eselect-gnat
 SLOT=3.4
 SRC_URI=mirror://gentoo/asis-gpl-2006.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5fac33cb5a302c38f7ec86e84f537d81
diff --git a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r1 b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r1
index 3ef0caa3e98f..419e8d26e9fa 100644
--- a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r1
+++ b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND==dev-lang/gnat-gpl-4.1.3.2007* doc? ( virtual/latex-base app-text/texi2html ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND==dev-lang/gnat-gpl-4.1.3.2007* doc? ( virtual/latex-base app-text/texi2html ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=The Ada Semantic Interface Specification (semantic analysis and tools tied to compiler)
 HOMEPAGE=https://libre.adacore.com/
 IUSE=doc nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gpl-4.1.3.2007* app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=mirror://gentoo/asis-gpl-2007-src.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dd7df46d08b59cba75d34e13d56b743d
diff --git a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r2 b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r2
index 4742fe3f173a..aea3db7c0935 100644
--- a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r2
+++ b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND==dev-lang/gnat-gpl-4.1.3.2007* doc? ( virtual/latex-base app-text/texi2html ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND==dev-lang/gnat-gpl-4.1.3.2007* doc? ( virtual/latex-base app-text/texi2html ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=The Ada Semantic Interface Specification (semantic analysis and tools tied to compiler)
 HOMEPAGE=https://libre.adacore.com/
 IUSE=doc nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gpl-4.1.3.2007* app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=mirror://gentoo/asis-gpl-2007-src.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a5c34e3a423656e567c79b58bc8ac6b8
diff --git a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008 b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008
index 88262dad3bd7..812e57ca914f 100644
--- a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008
+++ b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND==dev-lang/gnat-gpl-4.1.3.2008* doc? ( virtual/latex-base app-text/texi2html ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND==dev-lang/gnat-gpl-4.1.3.2008* doc? ( virtual/latex-base app-text/texi2html ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=The Ada Semantic Interface Specification (semantic analysis and tools tied to compiler)
 HOMEPAGE=https://libre.adacore.com/
 IUSE=doc nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gpl-4.1.3.2008* app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=mirror://gentoo/asis-gpl-2008-src.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9adde28aa9de3413e8c8186c5b6a5b54
diff --git a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008-r1 b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008-r1
index 6b33f1eb4f96..b1da67286467 100644
--- a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008-r1
+++ b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND==dev-lang/gnat-gpl-4.1.3.2008* doc? ( virtual/latex-base app-text/texi2html ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND==dev-lang/gnat-gpl-4.1.3.2008* doc? ( virtual/latex-base app-text/texi2html ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=The Ada Semantic Interface Specification (semantic analysis and tools tied to compiler)
 HOMEPAGE=https://libre.adacore.com/
 IUSE=doc nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gpl-4.1.3.2008* app-admin/eselect-gnat
 SLOT=4.1-2008
 SRC_URI=mirror://gentoo/asis-gpl-2008-src.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=18773019f90bb6d18d89b69e2f4c1e36
diff --git a/metadata/md5-cache/dev-cpp/ETL-0.04.15 b/metadata/md5-cache/dev-cpp/ETL-0.04.15
index be7c5fdd720f..d643ca5a4a7a 100644
--- a/metadata/md5-cache/dev-cpp/ETL-0.04.15
+++ b/metadata/md5-cache/dev-cpp/ETL-0.04.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ETL is a multi-platform class and template library
 EAPI=4
 HOMEPAGE=http://synfig.org
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/synfig/ETL/0.04.15/ETL-0.04.15.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=4c14a64f00e920f2707d8d73f40be81f
diff --git a/metadata/md5-cache/dev-cpp/commoncpp2-1.6.1 b/metadata/md5-cache/dev-cpp/commoncpp2-1.6.1
index 0ed08997290a..7299a6b1dc0f 100644
--- a/metadata/md5-cache/dev-cpp/commoncpp2-1.6.1
+++ b/metadata/md5-cache/dev-cpp/commoncpp2-1.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=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.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU Common C++ is a C++ framework offering portable support for threading, sockets, file access, daemons, persistence, serial I/O, XML parsing, and system services
 HOMEPAGE=http://www.gnu.org/software/commoncpp/
 IUSE=debug doc examples ipv6 gnutls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://gnu/commoncpp/commoncpp2-1.6.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2eee3584f056958eeb48c30c45fb5387
diff --git a/metadata/md5-cache/dev-cpp/commoncpp2-1.6.2 b/metadata/md5-cache/dev-cpp/commoncpp2-1.6.2
index 1fd076395a3c..b5db2a047a96 100644
--- a/metadata/md5-cache/dev-cpp/commoncpp2-1.6.2
+++ b/metadata/md5-cache/dev-cpp/commoncpp2-1.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=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.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU Common C++ is a C++ framework offering portable support for threading, sockets, file access, daemons, persistence, serial I/O, XML parsing, and system services
 HOMEPAGE=http://www.gnu.org/software/commoncpp/
 IUSE=debug doc examples ipv6 gnutls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://gnu/commoncpp/commoncpp2-1.6.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cd44c7111b465e71b19775e03dfa29f7
diff --git a/metadata/md5-cache/dev-cpp/commoncpp2-1.6.3 b/metadata/md5-cache/dev-cpp/commoncpp2-1.6.3
index 0ce65a3f1b1a..38506d6cd028 100644
--- a/metadata/md5-cache/dev-cpp/commoncpp2-1.6.3
+++ b/metadata/md5-cache/dev-cpp/commoncpp2-1.6.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=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.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU Common C++ is a C++ framework offering portable support for threading, sockets, file access, daemons, persistence, serial I/O, XML parsing, and system services
 HOMEPAGE=http://www.gnu.org/software/commoncpp/
 IUSE=debug doc examples ipv6 gnutls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://gnu/commoncpp/commoncpp2-1.6.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=20b139e9ab51152e629294ff2c01667f
diff --git a/metadata/md5-cache/dev-cpp/commoncpp2-1.8.0 b/metadata/md5-cache/dev-cpp/commoncpp2-1.8.0
index 610312643d51..f36658d3bc32 100644
--- a/metadata/md5-cache/dev-cpp/commoncpp2-1.8.0
+++ b/metadata/md5-cache/dev-cpp/commoncpp2-1.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU Common C++ is a C++ framework offering portable support for threading, sockets, file access, daemons, persistence, serial I/O, XML parsing, and system services
 EAPI=2
 HOMEPAGE=http://www.gnu.org/software/commoncpp/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://gnu/commoncpp/commoncpp2-1.8.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b53eaf0a502eb608cf50c3f2c1ca5721
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.36.0 b/metadata/md5-cache/dev-cpp/glibmm-2.36.0
new file mode 100644
index 000000000000..d21d8df798f2
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.36.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=dev-libs/libsigc++-2.2.10:2 >=dev-libs/glib-2.36.1:2 virtual/pkgconfig doc? ( app-doc/doxygen ) app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=C++ interface for glib2
+EAPI=5
+HOMEPAGE=http://www.gtkmm.org
+IUSE=doc debug examples test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2.1+ GPL-2+
+RDEPEND=>=dev-libs/libsigc++-2.2.10:2 >=dev-libs/glib-2.36.1:2
+SLOT=2
+SRC_URI=mirror://gnome/sources/glibmm/2.36/glibmm-2.36.0.tar.xz
+_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=a0fbecf3a636ecbf99ea9979548b972d
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.6.0-r1 b/metadata/md5-cache/dev-cpp/gtest-1.6.0-r1
index 6dd934f2e231..fb6c86a40e74 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.6.0-r1
+++ b/metadata/md5-cache/dev-cpp/gtest-1.6.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=app-arch/unzip =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Google C++ Testing Framework
 EAPI=4
 HOMEPAGE=http://code.google.com/p/googletest/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-lang/python-2*
 SLOT=0
 SRC_URI=http://googletest.googlecode.com/files/gtest-1.6.0.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5c77d7b1128dd368663d82ead4b2ea85
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.6.0-r2 b/metadata/md5-cache/dev-cpp/gtest-1.6.0-r2
index d8be0233f2e0..d4a532e94f4a 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.6.0-r2
+++ b/metadata/md5-cache/dev-cpp/gtest-1.6.0-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-lang/python-2*
 SLOT=0
 SRC_URI=http://googletest.googlecode.com/files/gtest-1.6.0.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b725a1cb18abd6ff783c130f76170715
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-3.4.0 b/metadata/md5-cache/dev-cpp/gtkmm-3.4.0
deleted file mode 100644
index 3c5d22552ffd..000000000000
--- a/metadata/md5-cache/dev-cpp/gtkmm-3.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-cpp/glibmm-2.32.0:2 >=x11-libs/gtk+-3.4.0:3[aqua?,wayland?,X?] >=x11-libs/gdk-pixbuf-2.22.1:2 >=dev-cpp/atkmm-2.22.2 >=dev-cpp/cairomm-1.9.2.2 >=dev-cpp/pangomm-2.27.1:1.4 dev-libs/libsigc++:2 virtual/pkgconfig doc? ( media-gfx/graphviz dev-libs/libxslt app-doc/doxygen ) dev-cpp/mm-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=C++ interface for GTK+
-EAPI=4
-HOMEPAGE=http://www.gtkmm.org
-IUSE=aqua doc examples test wayland +X
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-cpp/glibmm-2.32.0:2 >=x11-libs/gtk+-3.4.0:3[aqua?,wayland?,X?] >=x11-libs/gdk-pixbuf-2.22.1:2 >=dev-cpp/atkmm-2.22.2 >=dev-cpp/cairomm-1.9.2.2 >=dev-cpp/pangomm-2.27.1:1.4 dev-libs/libsigc++:2
-REQUIRED_USE=|| ( aqua wayland X )
-SLOT=3.0
-SRC_URI=mirror://gnome/sources/gtkmm/3.4/gtkmm-3.4.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ba9574a8adca73de9843f0e404b319c1
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-3.7.12 b/metadata/md5-cache/dev-cpp/gtkmm-3.8.0
similarity index 65%
rename from metadata/md5-cache/dev-cpp/gtkmm-3.7.12
rename to metadata/md5-cache/dev-cpp/gtkmm-3.8.0
index 97bfb5b68f5d..ce96c6a5b5f9 100644
--- a/metadata/md5-cache/dev-cpp/gtkmm-3.7.12
+++ b/metadata/md5-cache/dev-cpp/gtkmm-3.8.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-cpp/glibmm-2.34:2 >=x11-libs/gtk+-3.7.10:3[aqua?,wayland?,X?] >=x11-libs/gdk-pixbuf-2.22.1:2 >=dev-cpp/atkmm-2.22.2 >=dev-cpp/cairomm-1.9.2.2 >=dev-cpp/pangomm-2.27.1:1.4 dev-libs/libsigc++:2 virtual/pkgconfig doc? ( media-gfx/graphviz dev-libs/libxslt app-doc/doxygen ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-cpp/glibmm-2.36.0:2 >=x11-libs/gtk+-3.8.0:3[aqua?,wayland?,X?] >=x11-libs/gdk-pixbuf-2.22.1:2 >=dev-cpp/atkmm-2.22.2 >=dev-cpp/cairomm-1.9.2.2 >=dev-cpp/pangomm-2.27.1:1.4 dev-libs/libsigc++:2 virtual/pkgconfig doc? ( media-gfx/graphviz dev-libs/libxslt app-doc/doxygen ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=C++ interface for GTK+
 EAPI=5
 HOMEPAGE=http://www.gtkmm.org
 IUSE=aqua doc examples test wayland +X
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-cpp/glibmm-2.34:2 >=x11-libs/gtk+-3.7.10:3[aqua?,wayland?,X?] >=x11-libs/gdk-pixbuf-2.22.1:2 >=dev-cpp/atkmm-2.22.2 >=dev-cpp/cairomm-1.9.2.2 >=dev-cpp/pangomm-2.27.1:1.4 dev-libs/libsigc++:2
+RDEPEND=>=dev-cpp/glibmm-2.36.0:2 >=x11-libs/gtk+-3.8.0:3[aqua?,wayland?,X?] >=x11-libs/gdk-pixbuf-2.22.1:2 >=dev-cpp/atkmm-2.22.2 >=dev-cpp/cairomm-1.9.2.2 >=dev-cpp/pangomm-2.27.1:1.4 dev-libs/libsigc++:2
 REQUIRED_USE=|| ( aqua wayland X )
 SLOT=3.0
-SRC_URI=mirror://gnome/sources/gtkmm/3.7/gtkmm-3.7.12.tar.xz
+SRC_URI=mirror://gnome/sources/gtkmm/3.8/gtkmm-3.8.0.tar.xz
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6bbe7256630e0c36478d5d2b8b284edd
+_md5_=e6b606951c56460abc1e84a28c5da024
diff --git a/metadata/md5-cache/dev-cpp/libcmis-0.2.3-r1 b/metadata/md5-cache/dev-cpp/libcmis-0.2.3-r1
index 448bb5bb0d49..78d77895d04d 100644
--- a/metadata/md5-cache/dev-cpp/libcmis-0.2.3-r1
+++ b/metadata/md5-cache/dev-cpp/libcmis-0.2.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=!dev-cpp/libcmis:0 dev-libs/boost dev-libs/libxml2 net-misc/curl virtual/pkgconfig man? ( app-text/docbook2X ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!dev-cpp/libcmis:0 dev-libs/boost dev-libs/libxml2 net-misc/curl virtual/pkgconfig man? ( app-text/docbook2X ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C++ client library for the CMIS interface
 EAPI=4
 HOMEPAGE=https://sourceforge.net/projects/libcmis/
@@ -10,5 +10,5 @@ RDEPEND=!dev-cpp/libcmis:0 dev-libs/boost dev-libs/libxml2 net-misc/curl
 RESTRICT=test
 SLOT=0.2
 SRC_URI=mirror://sourceforge/libcmis/libcmis-0.2.3.tar.gz
-_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a392b3b5e8b86ddd8b0c7ee1fa601db3
diff --git a/metadata/md5-cache/dev-cpp/libcmis-0.3.1 b/metadata/md5-cache/dev-cpp/libcmis-0.3.1
index f2102415efb6..f27e350a30e4 100644
--- a/metadata/md5-cache/dev-cpp/libcmis-0.3.1
+++ b/metadata/md5-cache/dev-cpp/libcmis-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=!dev-cpp/libcmis:0 dev-libs/boost dev-libs/libxml2 net-misc/curl virtual/pkgconfig man? ( app-text/docbook2X dev-libs/libxslt ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!dev-cpp/libcmis:0 dev-libs/boost dev-libs/libxml2 net-misc/curl virtual/pkgconfig man? ( app-text/docbook2X dev-libs/libxslt ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C++ client library for the CMIS interface
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/libcmis/
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 LGPL-2 MPL-1.1 )
 RDEPEND=!dev-cpp/libcmis:0 dev-libs/boost dev-libs/libxml2 net-misc/curl
 SLOT=0.3
 SRC_URI=mirror://sourceforge/libcmis/libcmis-0.3.1.tar.gz
-_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=018357a67e1af4f7c3857fd8fdc86262
diff --git a/metadata/md5-cache/dev-cpp/libcmis-9999 b/metadata/md5-cache/dev-cpp/libcmis-9999
index 5dfc20423e32..43f0a9e26ffd 100644
--- a/metadata/md5-cache/dev-cpp/libcmis-9999
+++ b/metadata/md5-cache/dev-cpp/libcmis-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare unpack
-DEPEND=!dev-cpp/libcmis:0 dev-libs/boost dev-libs/libxml2 net-misc/curl virtual/pkgconfig man? ( app-text/docbook2X dev-libs/libxslt ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=!dev-cpp/libcmis:0 dev-libs/boost dev-libs/libxml2 net-misc/curl virtual/pkgconfig man? ( app-text/docbook2X dev-libs/libxslt ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=C++ client library for the CMIS interface
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/libcmis/
@@ -7,5 +7,5 @@ IUSE=static-libs man test
 LICENSE=|| ( GPL-2 LGPL-2 MPL-1.1 )
 RDEPEND=!dev-cpp/libcmis:0 dev-libs/boost dev-libs/libxml2 net-misc/curl
 SLOT=0.3
-_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fbbafa1a2270879d1f23abcf93a399c9
diff --git a/metadata/md5-cache/dev-cpp/libebt-1.3.0 b/metadata/md5-cache/dev-cpp/libebt-1.3.0
index 5377d99a4925..660021c584a6 100644
--- a/metadata/md5-cache/dev-cpp/libebt-1.3.0
+++ b/metadata/md5-cache/dev-cpp/libebt-1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=doc? ( app-doc/doxygen ) test? ( dev-libs/boost ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) test? ( dev-libs/boost ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A pure C++ template library that provides a clean way of getting human-readable backtrace messages
 HOMEPAGE=http://libebt.berlios.de/
 IUSE=doc test
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://berlios/libebt/libebt-1.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4b425ce38d7268c7d69e2dbb3348e23d
diff --git a/metadata/md5-cache/dev-cpp/libxmlpp-1.0.5 b/metadata/md5-cache/dev-cpp/libxmlpp-1.0.5
index 4c15d0f6b795..fdabadc11f29 100644
--- a/metadata/md5-cache/dev-cpp/libxmlpp-1.0.5
+++ b/metadata/md5-cache/dev-cpp/libxmlpp-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=dev-libs/libxml2-2.5.8 virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libxml2-2.5.8 virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C++ wrapper for the libxml2 XML parser library
 HOMEPAGE=http://libxmlplusplus.sourceforge.net/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libxml2-2.5.8
 SLOT=0
 SRC_URI=mirror://gnome/sources/libxml++/1.0/libxml++-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6d1d8b535848a713f03d31656479b3e5
diff --git a/metadata/md5-cache/dev-cpp/rudiments-0.40 b/metadata/md5-cache/dev-cpp/rudiments-0.40
index 07cdf7db0540..851690b8cd65 100644
--- a/metadata/md5-cache/dev-cpp/rudiments-0.40
+++ b/metadata/md5-cache/dev-cpp/rudiments-0.40
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C++ class library for daemons, clients and servers
 EAPI=5
 HOMEPAGE=http://rudiments.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/rudiments/rudiments-0.40.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=457b99ba5721d54d9b20b025eff4e743
diff --git a/metadata/md5-cache/dev-db/ctdb-1.0.114_p1 b/metadata/md5-cache/dev-db/ctdb-1.0.114_p1
index 6d55e72c1cc4..ce59f18327e4 100644
--- a/metadata/md5-cache/dev-db/ctdb-1.0.114_p1
+++ b/metadata/md5-cache/dev-db/ctdb-1.0.114_p1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare test unpack
-DEPEND=dev-libs/popt test? ( sys-apps/iproute2 sys-process/procps ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-arch/rpm2targz-9.0.0.3g
+DEPEND=dev-libs/popt test? ( sys-apps/iproute2 sys-process/procps ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=Cluster implementation of the TDB database used by Samba and other projects to store temporary data.
 EAPI=2
 HOMEPAGE=http://ctdb.samba.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/popt
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1936ede7f57b652549842c6f305df8e2
diff --git a/metadata/md5-cache/dev-db/ctdb-1.0.73 b/metadata/md5-cache/dev-db/ctdb-1.0.73
index e77777b78c31..7844dc70d4ef 100644
--- a/metadata/md5-cache/dev-db/ctdb-1.0.73
+++ b/metadata/md5-cache/dev-db/ctdb-1.0.73
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/popt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/popt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A cluster implementation of the TDB database used by Samba and other projects to store temporary data.
 EAPI=2
 HOMEPAGE=http://ctdb.samba.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/popt
 SLOT=0
 SRC_URI=http://ctdb.samba.org/packages/redhat/RHEL5/ctdb-1.0.73.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=d4ebda60405e1e662a003999b1353558
diff --git a/metadata/md5-cache/dev-db/ctdb-1.0.88 b/metadata/md5-cache/dev-db/ctdb-1.0.88
index e137f4c2cab4..6d4c529ac0a2 100644
--- a/metadata/md5-cache/dev-db/ctdb-1.0.88
+++ b/metadata/md5-cache/dev-db/ctdb-1.0.88
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/popt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/popt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A cluster implementation of the TDB database used by Samba and other projects to store temporary data.
 EAPI=2
 HOMEPAGE=http://ctdb.samba.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/popt
 SLOT=0
 SRC_URI=http://ctdb.samba.org/packages/redhat/RHEL5/ctdb-1.0.88.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=47d4f44b19fbfe5184ae11e82600bdbd
diff --git a/metadata/md5-cache/dev-db/ctdb-9999 b/metadata/md5-cache/dev-db/ctdb-9999
index f3cda453f585..22b027f42374 100644
--- a/metadata/md5-cache/dev-db/ctdb-9999
+++ b/metadata/md5-cache/dev-db/ctdb-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/popt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=dev-libs/popt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=A cluster implementation of the TDB database used to store temporary data.
 EAPI=4
 HOMEPAGE=http://ctdb.samba.org/
 LICENSE=GPL-3
 RDEPEND=dev-libs/popt
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=95bb15200aae9affaf7cacd3ce343952
diff --git a/metadata/md5-cache/dev-db/drizzle-7.1.33 b/metadata/md5-cache/dev-db/drizzle-7.1.33
index c0b286c540e4..14f71b1c96e6 100644
--- a/metadata/md5-cache/dev-db/drizzle-7.1.33
+++ b/metadata/md5-cache/dev-db/drizzle-7.1.33
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=http://launchpad.net/drizzle/7.1/7.1.33/+download/drizzle-7.1.33-stable.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f52b863b6262ee1bdfe3f0a2557176aa
diff --git a/metadata/md5-cache/dev-db/drizzle-7.2.4 b/metadata/md5-cache/dev-db/drizzle-7.2.4
index e40369db52fe..8a26b88fab90 100644
--- a/metadata/md5-cache/dev-db/drizzle-7.2.4
+++ b/metadata/md5-cache/dev-db/drizzle-7.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=tcmalloc? ( dev-util/google-perftools ) sys-libs/readline sys-apps/util-linux dev-libs/libpcre dev-libs/openssl >=dev-libs/libevent-1.4 >=dev-libs/protobuf-2.1.0 dev-libs/libaio >=dev-libs/boost-1.52.0-r1:=[threads] 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 ) ldap? ( net-nds/openldap ) v8? ( dev-lang/v8 ) !dev-db/libdrizzle =dev-lang/python-2* sys-devel/gettext dev-util/intltool dev-util/gperf sys-devel/flex dev-python/sphinx doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=tcmalloc? ( dev-util/google-perftools ) sys-libs/readline sys-apps/util-linux dev-libs/libpcre dev-libs/openssl >=dev-libs/libevent-1.4 >=dev-libs/protobuf-2.1.0 dev-libs/libaio >=dev-libs/boost-1.52.0-r1:=[threads] 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 ) ldap? ( net-nds/openldap ) v8? ( dev-lang/v8 ) !dev-db/libdrizzle =dev-lang/python-2* sys-devel/gettext dev-util/intltool dev-util/gperf sys-devel/flex dev-python/sphinx doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Database optimized for Cloud and Net applications
 EAPI=5
 HOMEPAGE=http://drizzle.org
@@ -10,5 +10,5 @@ RDEPEND=tcmalloc? ( dev-util/google-perftools ) sys-libs/readline sys-apps/util-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/drizzle/7.2/7.2.4/+download/drizzle-7.2.4-alpha.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3c31aa49271fd8d23ee7ea2cd82f4b72
diff --git a/metadata/md5-cache/dev-db/firebird-2.0.3.12981.0-r6 b/metadata/md5-cache/dev-db/firebird-2.0.3.12981.0-r6
index 6d12fce56580..91fb998c440c 100644
--- a/metadata/md5-cache/dev-db/firebird-2.0.3.12981.0-r6
+++ b/metadata/md5-cache/dev-db/firebird-2.0.3.12981.0-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config install postinst setup unpack
-DEPEND=dev-libs/libedit dev-libs/icu doc? ( app-arch/unzip ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libedit dev-libs/icu doc? ( app-arch/unzip ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A relational database offering many ANSI SQL-99 features
 HOMEPAGE=http://www.firebirdsql.org/
 IUSE=doc xinetd examples debug
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/libedit dev-libs/icu xinetd? ( virtual/inetd ) !sys-cluster/gan
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/firebird/Firebird-2.0.3.12981-0.tar.bz2 doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b6b92e4bd191bb45557fde5b447972e4
diff --git a/metadata/md5-cache/dev-db/firebird-2.1.3.18185.0-r1 b/metadata/md5-cache/dev-db/firebird-2.1.3.18185.0-r1
index 6d12078c2493..c42712808327 100644
--- a/metadata/md5-cache/dev-db/firebird-2.1.3.18185.0-r1
+++ b/metadata/md5-cache/dev-db/firebird-2.1.3.18185.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config install postinst setup unpack
-DEPEND=dev-libs/libedit dev-libs/icu doc? ( app-arch/unzip ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libedit dev-libs/icu doc? ( app-arch/unzip ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A relational database offering many ANSI SQL-99 features
 HOMEPAGE=http://www.firebirdsql.org/
 IUSE=doc xinetd examples debug
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/libedit dev-libs/icu xinetd? ( virtual/inetd ) !sys-cluster/gan
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/firebird/Firebird-2.1.3.18185-0.tar.bz2 doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=46c0dfab6087b1a6c101c2f315a56ddb
diff --git a/metadata/md5-cache/dev-db/firebird-2.5.1.26351.0-r1 b/metadata/md5-cache/dev-db/firebird-2.5.1.26351.0-r1
index a36d16c6a002..dfa0a6b89c59 100644
--- a/metadata/md5-cache/dev-db/firebird-2.5.1.26351.0-r1
+++ b/metadata/md5-cache/dev-db/firebird-2.5.1.26351.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare pretend setup unpack
-DEPEND=dev-libs/libedit dev-libs/icu >=dev-util/btyacc-3.0-r2 doc? ( app-arch/unzip ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libedit dev-libs/icu >=dev-util/btyacc-3.0-r2 doc? ( app-arch/unzip ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A relational database offering many ANSI SQL:2003 and some SQL:2008 features
 EAPI=4
 HOMEPAGE=http://www.firebirdsql.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libedit dev-libs/icu xinetd? ( virtual/inetd ) !sys-cluster/gan
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/firebird/Firebird-2.5.1.26351-0.tar.bz2 doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=897299d6e47c8c40a294c51f96247e44
diff --git a/metadata/md5-cache/dev-db/firebird-2.5.2.26539.0 b/metadata/md5-cache/dev-db/firebird-2.5.2.26539.0
index 90dbaaa8cddd..bb87b6ab0db7 100644
--- a/metadata/md5-cache/dev-db/firebird-2.5.2.26539.0
+++ b/metadata/md5-cache/dev-db/firebird-2.5.2.26539.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare pretend setup unpack
-DEPEND=dev-libs/libedit dev-libs/icu >=dev-util/btyacc-3.0-r2 doc? ( app-arch/unzip ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libedit dev-libs/icu >=dev-util/btyacc-3.0-r2 doc? ( app-arch/unzip ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A relational database offering many ANSI SQL:2003 and some SQL:2008 features
 EAPI=4
 HOMEPAGE=http://www.firebirdsql.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libedit dev-libs/icu xinetd? ( virtual/inetd ) !sys-cluster/gan
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/firebird/Firebird-2.5.2.26539-0.tar.bz2 doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=422071deaa04823012df7fd00c823999
diff --git a/metadata/md5-cache/dev-db/freetds-0.82-r3 b/metadata/md5-cache/dev-db/freetds-0.82-r3
index f6c9a13fb7f0..f6e6ad922116 100644
--- a/metadata/md5-cache/dev-db/freetds-0.82-r3
+++ b/metadata/md5-cache/dev-db/freetds-0.82-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tabular Datastream Library.
 EAPI=3
 HOMEPAGE=http://www.freetds.org/
@@ -10,5 +10,5 @@ RDEPEND=iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-0.82.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6fd06f20c9130da73128f3df7889aa5a
diff --git a/metadata/md5-cache/dev-db/freetds-0.91 b/metadata/md5-cache/dev-db/freetds-0.91
index ab4e5afb4f89..c7359e73cf07 100644
--- a/metadata/md5-cache/dev-db/freetds-0.91
+++ b/metadata/md5-cache/dev-db/freetds-0.91
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) odbc? ( dev-db/unixODBC ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) odbc? ( dev-db/unixODBC ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tabular Datastream Library
 EAPI=4
 HOMEPAGE=http://www.freetds.org/
@@ -10,5 +10,5 @@ RDEPEND=iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) odbc? ( dev-db/uni
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-0.91.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=eccef437dfe06149d7a46e1437bf2856
diff --git a/metadata/md5-cache/dev-db/lib_mysqludf_preg-1.0.1 b/metadata/md5-cache/dev-db/lib_mysqludf_preg-1.0.1
index e6efbb65778b..d0ee2d0a2b0e 100644
--- a/metadata/md5-cache/dev-db/lib_mysqludf_preg-1.0.1
+++ b/metadata/md5-cache/dev-db/lib_mysqludf_preg-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=virtual/mysql-5.1 dev-libs/libpcre || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=virtual/mysql-5.1 dev-libs/libpcre || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MySQL UDFs that provide access to the PCRE library for pattern matching
 EAPI=4
 HOMEPAGE=http://www.mysqludf.org/lib_mysqludf_preg/
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/mysql-5.1 dev-libs/libpcre
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mysqludf.org/lib_mysqludf_preg/lib_mysqludf_preg-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1bbf64d816bb14de2f32cb591801c97e
diff --git a/metadata/md5-cache/dev-db/lib_mysqludf_stem-0.9.1 b/metadata/md5-cache/dev-db/lib_mysqludf_stem-0.9.1
index d1136653daa3..d80a68763d1b 100644
--- a/metadata/md5-cache/dev-db/lib_mysqludf_stem-0.9.1
+++ b/metadata/md5-cache/dev-db/lib_mysqludf_stem-0.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=virtual/mysql-5.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=virtual/mysql-5.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MySQL UDFs which provides stemming capability for a variety of languages
 EAPI=4
 HOMEPAGE=http://www.mysqludf.org/lib_mysqludf_stem/
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/mysql-5.1
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mysqludf.org/lib_mysqludf_stem/lib_mysqludf_stem-0.9.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=21a30587f0673ebca61f40f26c51c34c
diff --git a/metadata/md5-cache/dev-db/lib_mysqludf_str-0.3 b/metadata/md5-cache/dev-db/lib_mysqludf_str-0.3
index d68c6c919b47..ec5721b975a1 100644
--- a/metadata/md5-cache/dev-db/lib_mysqludf_str-0.3
+++ b/metadata/md5-cache/dev-db/lib_mysqludf_str-0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=virtual/mysql-5.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=virtual/mysql-5.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MySQL UDFs of string functions that complement the set of native ones
 EAPI=4
 HOMEPAGE=http://www.mysqludf.org/lib_mysqludf_str/
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/mysql-5.1
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mysqludf.org/lib_mysqludf_str/lib_mysqludf_str-0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f19d41e5ab19b4f1a4d59350609b5573
diff --git a/metadata/md5-cache/dev-db/lib_mysqludf_ta-0.1 b/metadata/md5-cache/dev-db/lib_mysqludf_ta-0.1
index bfcb29a8a14a..3a58c14c5a6f 100644
--- a/metadata/md5-cache/dev-db/lib_mysqludf_ta-0.1
+++ b/metadata/md5-cache/dev-db/lib_mysqludf_ta-0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=virtual/mysql-5.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=virtual/mysql-5.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MySQL UDFs with technical analysis functions
 EAPI=4
 HOMEPAGE=http://www.mysqludf.org/lib_mysqludf_ta/
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/mysql-5.1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/joaocosta/lib_mysqludf_ta/tarball/a8e623c -> joaocosta-lib_mysqludf_ta-a8e623c.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d9033e74d8fe1ae22430982714c6c848
diff --git a/metadata/md5-cache/dev-db/lib_mysqludf_xql-1.0.0 b/metadata/md5-cache/dev-db/lib_mysqludf_xql-1.0.0
index c05bb131d65d..ca48c5538a94 100644
--- a/metadata/md5-cache/dev-db/lib_mysqludf_xql-1.0.0
+++ b/metadata/md5-cache/dev-db/lib_mysqludf_xql-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=virtual/mysql-5.1 dev-libs/libxml2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=virtual/mysql-5.1 dev-libs/libxml2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MySQL UDFs which can be used to create XML output directly from MySQL
 EAPI=4
 HOMEPAGE=http://www.mysqludf.org/lib_mysqludf_xql/
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/mysql-5.1 dev-libs/libxml2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mysqludf.org/lib_mysqludf_xql/lib_mysqludf_xql-1.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e501c91f99537cc9918d833a69bedfb5
diff --git a/metadata/md5-cache/dev-db/libdbi-0.8.3 b/metadata/md5-cache/dev-db/libdbi-0.8.3
index fa8a93e663fe..668c506e8a94 100644
--- a/metadata/md5-cache/dev-db/libdbi-0.8.3
+++ b/metadata/md5-cache/dev-db/libdbi-0.8.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=sys-apps/sed-4 virtual/pkgconfig doc? ( app-text/openjade ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-apps/sed-4 virtual/pkgconfig doc? ( app-text/openjade ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=libdbi implements a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl.
 HOMEPAGE=http://libdbi.sourceforge.net/
 IUSE=doc
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 PDEPEND=>=dev-db/libdbi-drivers-0.8.3
 SLOT=0
 SRC_URI=mirror://sourceforge/libdbi/libdbi-0.8.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d6c9c50c4ed2ebfd10aab65089649cc6
diff --git a/metadata/md5-cache/dev-db/libdbi-0.8.4 b/metadata/md5-cache/dev-db/libdbi-0.8.4
index 27d63c394555..1256ac2b23e5 100644
--- a/metadata/md5-cache/dev-db/libdbi-0.8.4
+++ b/metadata/md5-cache/dev-db/libdbi-0.8.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=sys-apps/sed-4 virtual/pkgconfig doc? ( app-text/openjade ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-apps/sed-4 virtual/pkgconfig doc? ( app-text/openjade ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=libdbi is a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl.
 EAPI=4
 HOMEPAGE=http://libdbi.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 PDEPEND=>=dev-db/libdbi-drivers-0.8.3
 SLOT=0
 SRC_URI=mirror://sourceforge/libdbi/libdbi-0.8.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1f069ead4d0af6219b0236b9b4a3536d
diff --git a/metadata/md5-cache/dev-db/libdbi-drivers-0.8.3 b/metadata/md5-cache/dev-db/libdbi-drivers-0.8.3
index c01e2f5f75b2..3aacf97e2291 100644
--- a/metadata/md5-cache/dev-db/libdbi-drivers-0.8.3
+++ b/metadata/md5-cache/dev-db/libdbi-drivers-0.8.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=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.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The libdbi-drivers project maintains drivers for libdbi.
 HOMEPAGE=http://libdbi-drivers.sourceforge.net/
 IUSE=mysql postgres sqlite oci8 firebird sqlite3 bindist doc
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=63810bad23b953e2bab263cc22e1f78c
diff --git a/metadata/md5-cache/dev-db/libdbi-drivers-0.8.3-r2 b/metadata/md5-cache/dev-db/libdbi-drivers-0.8.3-r2
index 07f7ac0a2321..f1b694c2bc6f 100644
--- a/metadata/md5-cache/dev-db/libdbi-drivers-0.8.3-r2
+++ b/metadata/md5-cache/dev-db/libdbi-drivers-0.8.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=>=dev-db/libdbi-0.8.3 firebird? ( dev-db/firebird ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) doc? ( app-text/openjade ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-db/libdbi-0.8.3 firebird? ( dev-db/firebird ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) doc? ( app-text/openjade ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The libdbi-drivers project maintains drivers for libdbi.
 EAPI=4
 HOMEPAGE=http://libdbi-drivers.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/libdbi-0.8.3 firebird? ( dev-db/firebird ) mysql? ( virtual/mys
 REQUIRED_USE=firebird? ( !bindist ) || ( mysql postgres sqlite firebird oci8 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=85c36bb24f51ba9592972ebde3e55214
diff --git a/metadata/md5-cache/dev-db/libiodbc-3.52.8 b/metadata/md5-cache/dev-db/libiodbc-3.52.8
index 8fd2a7d11e1e..363ce16abb8f 100644
--- a/metadata/md5-cache/dev-db/libiodbc-3.52.8
+++ b/metadata/md5-cache/dev-db/libiodbc-3.52.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=app-admin/chrpath >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-admin/chrpath >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ODBC Interface for Linux.
 EAPI=5
 HOMEPAGE=http://www.iodbc.org/
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2 BSD )
 RDEPEND=>=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=https://github.com/openlink/iODBC/archive/v3.52.8.zip -> libiodbc-3.52.8.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=30956f2ab0b932c42873167f79d7421d
diff --git a/metadata/md5-cache/dev-db/libiodbc-3.52.8-r1 b/metadata/md5-cache/dev-db/libiodbc-3.52.8-r1
index 919a5a56f055..0149de91626b 100644
--- a/metadata/md5-cache/dev-db/libiodbc-3.52.8-r1
+++ b/metadata/md5-cache/dev-db/libiodbc-3.52.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ODBC Interface for Linux.
 EAPI=5
 HOMEPAGE=http://www.iodbc.org/
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2 BSD )
 RDEPEND=>=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=https://github.com/openlink/iODBC/archive/v3.52.8.zip -> libiodbc-3.52.8.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7b1921b9da6445b73810a2a1461ba7f0
diff --git a/metadata/md5-cache/dev-db/libzdb-2.10.3 b/metadata/md5-cache/dev-db/libzdb-2.10.3
index 4d9ccdd4858f..7b41b364fde5 100644
--- a/metadata/md5-cache/dev-db/libzdb-2.10.3
+++ b/metadata/md5-cache/dev-db/libzdb-2.10.3
@@ -10,5 +10,5 @@ RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? (
 REQUIRED_USE=|| ( postgres mysql sqlite )
 SLOT=0
 SRC_URI=http://www.tildeslash.com/libzdb/dist/libzdb-2.10.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f1537188ac62cdb4b4c19a821ac22554
diff --git a/metadata/md5-cache/dev-db/mariadb-5.1.66 b/metadata/md5-cache/dev-db/mariadb-5.1.66
index ebbf258b3c75..ed319223eab4 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.1.66
+++ b/metadata/md5-cache/dev-db/mariadb-5.1.66
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 ) >=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 virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
 DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=4
 HOMEPAGE=http://mariadb.org/
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps )
 REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded )
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.1.66/kvm-tarbake-jaunty-x86/mariadb-5.1.66.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.1.66/kvm-tarbake-jaunty-x86/mariadb-5.1.66.tar.gz http://maria.llarian.net/download/mariadb-5.1.66/kvm-tarbake-jaunty-x86/mariadb-5.1.66.tar.gz http://launchpad.net/maria/5.1/ongoing/+download/mariadb-5.1.66.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.1.66/kvm-tarbake-jaunty-x86/mariadb-5.1.66.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.1.66/kvm-tarbake-jaunty-x86/mariadb-5.1.66.tar.gz mirror://gentoo/mysql-extras-20121101-2319Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20121101-2319Z.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql-autotools	488f8c5bb34d6a3165237f1312511ce6	mysql-v2	00edd88f5e58ea0618e5b1d235935d8b	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql-autotools	488f8c5bb34d6a3165237f1312511ce6	mysql-v2	00edd88f5e58ea0618e5b1d235935d8b	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=10b53dd13d8e2096860bd19439bb33a6
diff --git a/metadata/md5-cache/dev-db/mariadb-5.1.67 b/metadata/md5-cache/dev-db/mariadb-5.1.67
index 84c9803aeff4..1b31dc1fd10b 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.1.67
+++ b/metadata/md5-cache/dev-db/mariadb-5.1.67
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 ) >=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 virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
 DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=4
 HOMEPAGE=http://mariadb.org/
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps )
 REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded )
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.1.67/kvm-tarbake-jaunty-x86/mariadb-5.1.67.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.1.67/kvm-tarbake-jaunty-x86/mariadb-5.1.67.tar.gz http://maria.llarian.net/download/mariadb-5.1.67/kvm-tarbake-jaunty-x86/mariadb-5.1.67.tar.gz http://launchpad.net/maria/5.1/ongoing/+download/mariadb-5.1.67.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.1.67/kvm-tarbake-jaunty-x86/mariadb-5.1.67.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.1.67/kvm-tarbake-jaunty-x86/mariadb-5.1.67.tar.gz mirror://gentoo/mysql-extras-20121101-2319Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20121101-2319Z.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql-autotools	488f8c5bb34d6a3165237f1312511ce6	mysql-v2	00edd88f5e58ea0618e5b1d235935d8b	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql-autotools	488f8c5bb34d6a3165237f1312511ce6	mysql-v2	00edd88f5e58ea0618e5b1d235935d8b	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=81dbbd2b8294ed732092d6a69c52ecfb
diff --git a/metadata/md5-cache/dev-db/mariadb-5.2.13 b/metadata/md5-cache/dev-db/mariadb-5.2.13
index 4f1310071811..98454addd451 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.2.13
+++ b/metadata/md5-cache/dev-db/mariadb-5.2.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 ) >=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 oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
 DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=4
 HOMEPAGE=http://mariadb.org/
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps )
 REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded )
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.2.13/kvm-tarbake-jaunty-x86/mariadb-5.2.13.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.2.13/kvm-tarbake-jaunty-x86/mariadb-5.2.13.tar.gz http://maria.llarian.net/download/mariadb-5.2.13/kvm-tarbake-jaunty-x86/mariadb-5.2.13.tar.gz http://launchpad.net/maria/5.2/ongoing/+download/mariadb-5.2.13.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.2.13/kvm-tarbake-jaunty-x86/mariadb-5.2.13.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.2.13/kvm-tarbake-jaunty-x86/mariadb-5.2.13.tar.gz mirror://gentoo/mysql-extras-20121101-2319Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20121101-2319Z.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql-autotools	488f8c5bb34d6a3165237f1312511ce6	mysql-v2	00edd88f5e58ea0618e5b1d235935d8b	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql-autotools	488f8c5bb34d6a3165237f1312511ce6	mysql-v2	00edd88f5e58ea0618e5b1d235935d8b	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2ae196fa561430bec618403ec088c43b
diff --git a/metadata/md5-cache/dev-db/mariadb-5.2.14 b/metadata/md5-cache/dev-db/mariadb-5.2.14
index 9bc2d9587caf..5601ada5cc4d 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.2.14
+++ b/metadata/md5-cache/dev-db/mariadb-5.2.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 ) >=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 oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
 DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=4
 HOMEPAGE=http://mariadb.org/
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps )
 REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded )
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.2.14/kvm-tarbake-jaunty-x86/mariadb-5.2.14.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.2.14/kvm-tarbake-jaunty-x86/mariadb-5.2.14.tar.gz http://maria.llarian.net/download/mariadb-5.2.14/kvm-tarbake-jaunty-x86/mariadb-5.2.14.tar.gz http://launchpad.net/maria/5.2/ongoing/+download/mariadb-5.2.14.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.2.14/kvm-tarbake-jaunty-x86/mariadb-5.2.14.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.2.14/kvm-tarbake-jaunty-x86/mariadb-5.2.14.tar.gz mirror://gentoo/mysql-extras-20121101-2319Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20121101-2319Z.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql-autotools	488f8c5bb34d6a3165237f1312511ce6	mysql-v2	00edd88f5e58ea0618e5b1d235935d8b	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql-autotools	488f8c5bb34d6a3165237f1312511ce6	mysql-v2	00edd88f5e58ea0618e5b1d235935d8b	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eb3a149860c2363cc9e1fa3856a365a0
diff --git a/metadata/md5-cache/dev-db/mariadb-5.3.11 b/metadata/md5-cache/dev-db/mariadb-5.3.11
index 91840a54aa1e..ae84052e6824 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.3.11
+++ b/metadata/md5-cache/dev-db/mariadb-5.3.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 ) >=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 oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
 DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=4
 HOMEPAGE=http://mariadb.org/
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps )
 REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded )
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.3.11/kvm-tarbake-jaunty-x86/mariadb-5.3.11.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.3.11/kvm-tarbake-jaunty-x86/mariadb-5.3.11.tar.gz http://maria.llarian.net/download/mariadb-5.3.11/kvm-tarbake-jaunty-x86/mariadb-5.3.11.tar.gz http://launchpad.net/maria/5.3/ongoing/+download/mariadb-5.3.11.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.3.11/kvm-tarbake-jaunty-x86/mariadb-5.3.11.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.3.11/kvm-tarbake-jaunty-x86/mariadb-5.3.11.tar.gz mirror://gentoo/mysql-extras-20121101-2319Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20121101-2319Z.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql-autotools	488f8c5bb34d6a3165237f1312511ce6	mysql-v2	00edd88f5e58ea0618e5b1d235935d8b	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql-autotools	488f8c5bb34d6a3165237f1312511ce6	mysql-v2	00edd88f5e58ea0618e5b1d235935d8b	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4df1e6cb265d598640e91ce4426560f8
diff --git a/metadata/md5-cache/dev-db/mariadb-5.3.12 b/metadata/md5-cache/dev-db/mariadb-5.3.12
index 909c020181b5..96c5a8e7f5d5 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.3.12
+++ b/metadata/md5-cache/dev-db/mariadb-5.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 ) >=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 oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
 DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=4
 HOMEPAGE=http://mariadb.org/
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps )
 REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded )
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.3.12/kvm-tarbake-jaunty-x86/mariadb-5.3.12.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.3.12/kvm-tarbake-jaunty-x86/mariadb-5.3.12.tar.gz http://maria.llarian.net/download/mariadb-5.3.12/kvm-tarbake-jaunty-x86/mariadb-5.3.12.tar.gz http://launchpad.net/maria/5.3/ongoing/+download/mariadb-5.3.12.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.3.12/kvm-tarbake-jaunty-x86/mariadb-5.3.12.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.3.12/kvm-tarbake-jaunty-x86/mariadb-5.3.12.tar.gz mirror://gentoo/mysql-extras-20121101-2319Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20121101-2319Z.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql-autotools	488f8c5bb34d6a3165237f1312511ce6	mysql-v2	00edd88f5e58ea0618e5b1d235935d8b	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql-autotools	488f8c5bb34d6a3165237f1312511ce6	mysql-v2	00edd88f5e58ea0618e5b1d235935d8b	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=83d6d6b3ea04c29e09796b88b50541d0
diff --git a/metadata/md5-cache/dev-db/myodbc-5.1.6 b/metadata/md5-cache/dev-db/myodbc-5.1.6
index cd43f2b0339a..ce0d8d4e257e 100644
--- a/metadata/md5-cache/dev-db/myodbc-5.1.6
+++ b/metadata/md5-cache/dev-db/myodbc-5.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare unpack
-DEPEND=>=virtual/mysql-4.0 dev-db/unixODBC qt4? ( >=dev-qt/qtgui-4:4 ) doc? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=virtual/mysql-4.0 dev-db/unixODBC qt4? ( >=dev-qt/qtgui-4:4 ) doc? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ODBC driver for MySQL
 EAPI=2
 HOMEPAGE=http://www.mysql.com/products/myodbc/
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/mysql-4.0 dev-db/unixODBC qt4? ( >=dev-qt/qtgui-4:4 )
 RESTRICT=primaryuri
 SLOT=5.1
 SRC_URI=mirror://mysql/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-5.1.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e378428f1758c603e3e411c2a6962468
diff --git a/metadata/md5-cache/dev-db/mysql-4.0.27-r1 b/metadata/md5-cache/dev-db/mysql-4.0.27-r1
index cf69812221d7..89e1e7350f61 100644
--- a/metadata/md5-cache/dev-db/mysql-4.0.27-r1
+++ b/metadata/md5-cache/dev-db/mysql-4.0.27-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config install postinst postrm preinst setup test unpack
-DEPEND=sys-devel/gnuconfig || ( >=sys-devel/automake-1.12 ) >=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 )
+DEPEND=sys-devel/gnuconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=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 )
 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server.
 HOMEPAGE=http://www.mysql.com/
 IUSE=big-tables debug embedded minimal perl selinux ssl static test raid berkdb
@@ -9,5 +9,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-4.0
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/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 )
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/MySQL-4.0/mysql-4.0.27.tar.gz mirror://gentoo/mysql-extras-20070105.tar.bz2 http://g3nt8.org/patches/mysql-extras-20070105.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20070105.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql	f0922843d8ec77e3b8cd291e4497a7b2	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql	f0922843d8ec77e3b8cd291e4497a7b2	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=33d4ff394bcdd03f4f5f14a46173a4fa
diff --git a/metadata/md5-cache/dev-db/mysql-4.1.22-r1 b/metadata/md5-cache/dev-db/mysql-4.1.22-r1
index eabeddf6aa29..cc8d0c2b8caa 100644
--- a/metadata/md5-cache/dev-db/mysql-4.1.22-r1
+++ b/metadata/md5-cache/dev-db/mysql-4.1.22-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config install postinst postrm preinst setup test unpack
-DEPEND=sys-devel/gnuconfig || ( >=sys-devel/automake-1.12 ) >=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 )
+DEPEND=sys-devel/gnuconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=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 )
 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server.
 HOMEPAGE=http://www.mysql.com/
 IUSE=big-tables debug embedded minimal perl selinux ssl static test latin1 extraengine cluster raid berkdb
@@ -9,5 +9,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-4.1
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/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 )
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/MySQL-4.1/mysql-4.1.22.tar.gz mirror://gentoo/mysql-extras-20090228-2228Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20090228-2228Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20090228-2228Z.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql	f0922843d8ec77e3b8cd291e4497a7b2	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql	f0922843d8ec77e3b8cd291e4497a7b2	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=62889e866961d648ba9a08e270ef13f5
diff --git a/metadata/md5-cache/dev-db/mysql-5.0.96 b/metadata/md5-cache/dev-db/mysql-5.0.96
index dc8219ec91f6..22cca97d2069 100644
--- a/metadata/md5-cache/dev-db/mysql-5.0.96
+++ b/metadata/md5-cache/dev-db/mysql-5.0.96
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server.
 EAPI=4
 HOMEPAGE=http://www.mysql.com/
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.0
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/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 )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.0/mysql-5.0.96.tar.gz mirror://mysql/Downloads/MySQL-5.0/mysql-5.0.96.tar.gz mirror://gentoo/mysql-extras-20120401-2131Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20120401-2131Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20120401-2131Z.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql	f0922843d8ec77e3b8cd291e4497a7b2	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql	f0922843d8ec77e3b8cd291e4497a7b2	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6ded32b90ac13c5ff676c484cc7a2778
diff --git a/metadata/md5-cache/dev-db/mysql-5.1.66 b/metadata/md5-cache/dev-db/mysql-5.1.66
index 6861f581060d..e749791fa1a9 100644
--- a/metadata/md5-cache/dev-db/mysql-5.1.66
+++ b/metadata/md5-cache/dev-db/mysql-5.1.66
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
-DEPEND=|| ( >=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.12:1.12 ) >=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/mariadb virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
+DEPEND=|| ( >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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/mariadb virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server.
 EAPI=4
 HOMEPAGE=http://www.mysql.com/
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps )
 REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) xtradb? ( !embedded )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.66.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.66.tar.gz mirror://gentoo/mysql-extras-20121101-2319Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20121101-2319Z.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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql-autotools	488f8c5bb34d6a3165237f1312511ce6	mysql-v2	00edd88f5e58ea0618e5b1d235935d8b	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql-autotools	488f8c5bb34d6a3165237f1312511ce6	mysql-v2	00edd88f5e58ea0618e5b1d235935d8b	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6ca8d61b9f8fde6e48f91d7623fe281a
diff --git a/metadata/md5-cache/dev-db/mysql-5.1.66-r1 b/metadata/md5-cache/dev-db/mysql-5.1.66-r1
index 525f3e644ff4..e579f5584863 100644
--- a/metadata/md5-cache/dev-db/mysql-5.1.66-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.1.66-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
-DEPEND=|| ( >=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.12:1.12 ) >=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/mariadb virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
+DEPEND=|| ( >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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/mariadb virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server.
 EAPI=4
 HOMEPAGE=http://www.mysql.com/
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps )
 REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) xtradb? ( !embedded )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.66.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.66.tar.gz mirror://gentoo/mysql-extras-20130128-0054Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20130128-0054Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20130128-0054Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20130128-0054Z.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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql-autotools	488f8c5bb34d6a3165237f1312511ce6	mysql-v2	00edd88f5e58ea0618e5b1d235935d8b	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql-autotools	488f8c5bb34d6a3165237f1312511ce6	mysql-v2	00edd88f5e58ea0618e5b1d235935d8b	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bca1ffc3775456ee00e65c23ff865ad0
diff --git a/metadata/md5-cache/dev-db/mysql-5.1.67 b/metadata/md5-cache/dev-db/mysql-5.1.67
index 42bc71811013..1cc2a9c1ef09 100644
--- a/metadata/md5-cache/dev-db/mysql-5.1.67
+++ b/metadata/md5-cache/dev-db/mysql-5.1.67
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
-DEPEND=|| ( >=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.12:1.12 ) >=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/mariadb virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
+DEPEND=|| ( >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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/mariadb virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server.
 EAPI=4
 HOMEPAGE=http://www.mysql.com/
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps )
 REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) xtradb? ( !embedded )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.67.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.67.tar.gz mirror://gentoo/mysql-extras-20121101-2319Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20121101-2319Z.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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql-autotools	488f8c5bb34d6a3165237f1312511ce6	mysql-v2	00edd88f5e58ea0618e5b1d235935d8b	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql-autotools	488f8c5bb34d6a3165237f1312511ce6	mysql-v2	00edd88f5e58ea0618e5b1d235935d8b	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b9416eb9a6b73222e3614b589483017d
diff --git a/metadata/md5-cache/dev-db/mysql-5.1.67-r1 b/metadata/md5-cache/dev-db/mysql-5.1.67-r1
index 9ab5166c7d0f..7be89545a59b 100644
--- a/metadata/md5-cache/dev-db/mysql-5.1.67-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.1.67-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
-DEPEND=|| ( >=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.12:1.12 ) >=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/mariadb virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
+DEPEND=|| ( >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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/mariadb virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3
 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server.
 EAPI=4
 HOMEPAGE=http://www.mysql.com/
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps )
 REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) xtradb? ( !embedded )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.67.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.67.tar.gz mirror://gentoo/mysql-extras-20130128-0054Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20130128-0054Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20130128-0054Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20130128-0054Z.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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql-autotools	488f8c5bb34d6a3165237f1312511ce6	mysql-v2	00edd88f5e58ea0618e5b1d235935d8b	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	mysql-autotools	488f8c5bb34d6a3165237f1312511ce6	mysql-v2	00edd88f5e58ea0618e5b1d235935d8b	mysql_fx	f783e104c8bbd017eefc5359f327975b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b769531827086fad41940c87e2ab53bb
diff --git a/metadata/md5-cache/dev-db/mysql-super-smack-1.2 b/metadata/md5-cache/dev-db/mysql-super-smack-1.2
index 8652b61240ef..3cb5f67c898f 100644
--- a/metadata/md5-cache/dev-db/mysql-super-smack-1.2
+++ b/metadata/md5-cache/dev-db/mysql-super-smack-1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server )
 SLOT=0
 SRC_URI=http://jeremy.zawodny.com/mysql/super-smack/super-smack-1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=500a182bf852107e02c953a01e9f6762
diff --git a/metadata/md5-cache/dev-db/mysql-super-smack-1.3-r2 b/metadata/md5-cache/dev-db/mysql-super-smack-1.3-r2
index 173d4f08f912..d40896a8e87b 100644
--- a/metadata/md5-cache/dev-db/mysql-super-smack-1.3-r2
+++ b/metadata/md5-cache/dev-db/mysql-super-smack-1.3-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server )
 SLOT=0
 SRC_URI=http://vegan.net/tony/supersmack/super-smack-1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5c2342eccd15afe175da943dc28d6093
diff --git a/metadata/md5-cache/dev-db/mysql-udf-http-1.0 b/metadata/md5-cache/dev-db/mysql-udf-http-1.0
index ce9a8473a5e2..6abcba9aefad 100644
--- a/metadata/md5-cache/dev-db/mysql-udf-http-1.0
+++ b/metadata/md5-cache/dev-db/mysql-udf-http-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=virtual/mysql-5.1 net-misc/curl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=virtual/mysql-5.1 net-misc/curl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MySQL User-defined function (UDF) for HTTP REST
 EAPI=4
 HOMEPAGE=http://code.google.com/p/mysql-udf-http/
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/mysql-5.1 net-misc/curl
 SLOT=0
 SRC_URI=http://mysql-udf-http.googlecode.com/files/mysql-udf-http-1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=78a2304a674d6f1f18caa54aef6d2f05
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-5.2.45 b/metadata/md5-cache/dev-db/mysql-workbench-5.2.45
index 57bcd098be85..19d8b2e00dde 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-5.2.45
+++ b/metadata/md5-cache/dev-db/mysql-workbench-5.2.45
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=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-db/libiodbc 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-1.7.4 gnome-keyring? ( gnome-base/libgnome-keyring ) nls? ( sys-devel/gettext ) virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2* doc? ( =dev-lang/python-2*[sqlite] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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-db/libiodbc 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-1.7.4 gnome-keyring? ( gnome-base/libgnome-keyring ) nls? ( sys-devel/gettext ) virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2* doc? ( =dev-lang/python-2*[sqlite] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MySQL Workbench
 EAPI=5
 HOMEPAGE=http://dev.mysql.com/workbench/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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-db/libiodbc 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-1.7.4 gnome-keyring? ( gnome-base/libgnome-keyring ) nls? ( sys-devel/gettext ) app-admin/sudo >=sys-apps/net-tools-1.60_p20120127084908 =dev-lang/python-2* doc? ( =dev-lang/python-2*[sqlite] )
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-5.2.45-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=44b47250a7d99e73b2d77dd7ff4db36e
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-5.2.46 b/metadata/md5-cache/dev-db/mysql-workbench-5.2.46
index b37f17ac4fd6..7783700d8217 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-5.2.46
+++ b/metadata/md5-cache/dev-db/mysql-workbench-5.2.46
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=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-db/libiodbc 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-1.7.4 gnome-keyring? ( gnome-base/libgnome-keyring ) nls? ( sys-devel/gettext ) virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2* doc? ( =dev-lang/python-2*[sqlite] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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-db/libiodbc 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-1.7.4 gnome-keyring? ( gnome-base/libgnome-keyring ) nls? ( sys-devel/gettext ) virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2* doc? ( =dev-lang/python-2*[sqlite] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MySQL Workbench
 EAPI=5
 HOMEPAGE=http://dev.mysql.com/workbench/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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-db/libiodbc 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-1.7.4 gnome-keyring? ( gnome-base/libgnome-keyring ) nls? ( sys-devel/gettext ) app-admin/sudo >=sys-apps/net-tools-1.60_p20120127084908 =dev-lang/python-2* doc? ( =dev-lang/python-2*[sqlite] )
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-5.2.46-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7f04a750a955eff9eeb4abc07360eb31
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-5.2.47 b/metadata/md5-cache/dev-db/mysql-workbench-5.2.47
index 31860e8c0add..4580a767570e 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-5.2.47
+++ b/metadata/md5-cache/dev-db/mysql-workbench-5.2.47
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=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-db/libiodbc 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-1.7.4 gnome-keyring? ( gnome-base/libgnome-keyring ) nls? ( sys-devel/gettext ) virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2* doc? ( =dev-lang/python-2*[sqlite] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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-db/libiodbc 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-1.7.4 gnome-keyring? ( gnome-base/libgnome-keyring ) nls? ( sys-devel/gettext ) virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2* doc? ( =dev-lang/python-2*[sqlite] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MySQL Workbench
 EAPI=5
 HOMEPAGE=http://dev.mysql.com/workbench/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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-db/libiodbc 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-1.7.4 gnome-keyring? ( gnome-base/libgnome-keyring ) nls? ( sys-devel/gettext ) app-admin/sudo >=sys-apps/net-tools-1.60_p20120127084908 =dev-lang/python-2* doc? ( =dev-lang/python-2*[sqlite] )
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-5.2.47-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=12d38f228c04853c7cc97dfe270a7edc
diff --git a/metadata/md5-cache/dev-db/pg_top-3.6.2 b/metadata/md5-cache/dev-db/pg_top-3.6.2
index 4dce9ea06559..0d0556930fb6 100644
--- a/metadata/md5-cache/dev-db/pg_top-3.6.2
+++ b/metadata/md5-cache/dev-db/pg_top-3.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-db/postgresql-base virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-db/postgresql-base virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION='top' for PostgreSQL
 HOMEPAGE=http://ptop.projects.postgresql.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-db/postgresql-base
 SLOT=0
 SRC_URI=http://pgfoundry.org/frs/download.php/1780/pg_top-3.6.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3ff60912349a803e299ee9f2b609fb83
diff --git a/metadata/md5-cache/dev-db/postgis-2.0.2-r2 b/metadata/md5-cache/dev-db/postgis-2.0.2-r2
index 7274acc45b4f..feb78ec7a06c 100644
--- a/metadata/md5-cache/dev-db/postgis-2.0.2-r2
+++ b/metadata/md5-cache/dev-db/postgis-2.0.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup
-DEPEND=|| ( dev-db/postgresql-server:9.2 dev-db/postgresql-server:9.1 dev-db/postgresql-server:9.0 dev-db/postgresql-server:8.4 ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.3.3 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.9 gtk? ( x11-libs/gtk+:2 ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( dev-db/postgresql-server:9.2 dev-db/postgresql-server:9.1 dev-db/postgresql-server:9.0 dev-db/postgresql-server:8.4 ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.3.3 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.9 gtk? ( x11-libs/gtk+:2 ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Geographic Objects for PostgreSQL
 EAPI=4
 HOMEPAGE=http://postgis.net
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-db/postgresql-server:9.2 dev-db/postgresql-server:9.1 dev-db/po
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/postgis/source/postgis-2.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d6a1a28f7068fb09ab789f53957d2f78
diff --git a/metadata/md5-cache/dev-db/postgis-2.0.3 b/metadata/md5-cache/dev-db/postgis-2.0.3
index 14c2dbae278a..9eb96de64cb2 100644
--- a/metadata/md5-cache/dev-db/postgis-2.0.3
+++ b/metadata/md5-cache/dev-db/postgis-2.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup
-DEPEND=|| ( dev-db/postgresql-server:9.2 dev-db/postgresql-server:9.1 dev-db/postgresql-server:9.0 dev-db/postgresql-server:8.4 ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.3.8 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.9 gtk? ( x11-libs/gtk+:2 ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( dev-db/postgresql-server:9.2 dev-db/postgresql-server:9.1 dev-db/postgresql-server:9.0 dev-db/postgresql-server:8.4 ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.3.8 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.9 gtk? ( x11-libs/gtk+:2 ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Geographic Objects for PostgreSQL
 EAPI=4
 HOMEPAGE=http://postgis.net
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-db/postgresql-server:9.2 dev-db/postgresql-server:9.1 dev-db/po
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/postgis/source/postgis-2.0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=38ff190536691ecb94b5a6afed7724bd
diff --git a/metadata/md5-cache/dev-db/postgresql-base-8.4.17 b/metadata/md5-cache/dev-db/postgresql-base-8.4.17
index dc338a32944b..2436e9a761e0 100644
--- a/metadata/md5-cache/dev-db/postgresql-base-8.4.17
+++ b/metadata/md5-cache/dev-db/postgresql-base-8.4.17
@@ -11,5 +11,5 @@ RDEPEND=>=app-admin/eselect-postgresql-1.0.7 virtual/libintl !!dev-db/libpq !!de
 RESTRICT=test
 SLOT=8.4
 SRC_URI=mirror://postgresql/source/v8.4.17/postgresql-8.4.17.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-8.4-r3.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=91d9049f6d3e41760cc53272e3d1a7ed
diff --git a/metadata/md5-cache/dev-db/postgresql-base-9.0.13 b/metadata/md5-cache/dev-db/postgresql-base-9.0.13
index ac4e5886d366..bba35e33ef1b 100644
--- a/metadata/md5-cache/dev-db/postgresql-base-9.0.13
+++ b/metadata/md5-cache/dev-db/postgresql-base-9.0.13
@@ -11,5 +11,5 @@ RDEPEND=>=app-admin/eselect-postgresql-1.0.7 virtual/libintl !!dev-db/libpq !!de
 RESTRICT=test
 SLOT=9.0
 SRC_URI=mirror://postgresql/source/v9.0.13/postgresql-9.0.13.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.0-r4.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eec82deffe3dd637e814a1fefd68cefd
diff --git a/metadata/md5-cache/dev-db/postgresql-base-9.1.9 b/metadata/md5-cache/dev-db/postgresql-base-9.1.9
index 21390aaf6300..fa9d09b47452 100644
--- a/metadata/md5-cache/dev-db/postgresql-base-9.1.9
+++ b/metadata/md5-cache/dev-db/postgresql-base-9.1.9
@@ -11,5 +11,5 @@ RDEPEND=!!dev-db/libpq !!dev-db/postgresql !!dev-db/postgresql-client !!dev-db/p
 RESTRICT=test
 SLOT=9.1
 SRC_URI=mirror://postgresql/source/v9.1.9/postgresql-9.1.9.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.1-r2.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fb776e830844004d2af007167d6ddac3
diff --git a/metadata/md5-cache/dev-db/postgresql-base-9.2.4 b/metadata/md5-cache/dev-db/postgresql-base-9.2.4
index ab9ecee79e5b..148e37be083a 100644
--- a/metadata/md5-cache/dev-db/postgresql-base-9.2.4
+++ b/metadata/md5-cache/dev-db/postgresql-base-9.2.4
@@ -11,5 +11,5 @@ RDEPEND=!!dev-db/libpq !!dev-db/postgresql !!dev-db/postgresql-client !!dev-db/p
 RESTRICT=test
 SLOT=9.2
 SRC_URI=mirror://postgresql/source/v9.2.4/postgresql-9.2.4.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.2.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f4fc002bc0a5e586b539be8a74da27c7
diff --git a/metadata/md5-cache/dev-db/postgresql-base-9999 b/metadata/md5-cache/dev-db/postgresql-base-9999
index b8bbc53b70fc..3dd3d0a037bf 100644
--- a/metadata/md5-cache/dev-db/postgresql-base-9999
+++ b/metadata/md5-cache/dev-db/postgresql-base-9999
@@ -9,5 +9,5 @@ RDEPEND=!!dev-db/libpq !!dev-db/postgresql !!dev-db/postgresql-client !!dev-db/p
 RESTRICT=test
 SLOT=9.3
 SRC_URI=http://dev.gentoo.org/~titanofold/postgresql-patches-9.2beta2.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3893c6753c636eff2056c42db40fdce5
diff --git a/metadata/md5-cache/dev-db/postgresql-server-8.4.17 b/metadata/md5-cache/dev-db/postgresql-server-8.4.17
index 138e75300735..454bdc8a025a 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-8.4.17
+++ b/metadata/md5-cache/dev-db/postgresql-server-8.4.17
@@ -10,5 +10,5 @@ PDEPEND=doc? ( ~dev-db/postgresql-docs-8.4.17 )
 RDEPEND=~dev-db/postgresql-base-8.4.17:8.4[kerberos?,pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt )
 SLOT=8.4
 SRC_URI=mirror://postgresql/source/v8.4.17/postgresql-8.4.17.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-8.4-r3.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-pre92-2.4.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=55a76ae36e2765996e1ac1410266e913
diff --git a/metadata/md5-cache/dev-db/postgresql-server-9.0.13 b/metadata/md5-cache/dev-db/postgresql-server-9.0.13
index cdb2952664bc..a6e44fd3c42f 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9.0.13
+++ b/metadata/md5-cache/dev-db/postgresql-server-9.0.13
@@ -10,5 +10,5 @@ PDEPEND=doc? ( ~dev-db/postgresql-docs-9.0.13 )
 RDEPEND=~dev-db/postgresql-base-9.0.13:9.0[kerberos?,pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_python3_1? ( dev-lang/python:3.1 ) python_single_target_python3_2? ( dev-lang/python:3.2 ) python_single_target_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt )
 SLOT=9.0
 SRC_URI=mirror://postgresql/source/v9.0.13/postgresql-9.0.13.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.0-r4.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-pre92-2.4.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bab1f5e7e247470a470efe54577e6d72
diff --git a/metadata/md5-cache/dev-db/postgresql-server-9.1.9 b/metadata/md5-cache/dev-db/postgresql-server-9.1.9
index e6517e50c37f..8b2b5acad77d 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9.1.9
+++ b/metadata/md5-cache/dev-db/postgresql-server-9.1.9
@@ -10,5 +10,5 @@ PDEPEND=doc? ( ~dev-db/postgresql-docs-9.1.9 )
 RDEPEND=~dev-db/postgresql-base-9.1.9:9.1[kerberos?,pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_python3_1? ( dev-lang/python:3.1 ) python_single_target_python3_2? ( dev-lang/python:3.2 ) python_single_target_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt )
 SLOT=9.1
 SRC_URI=mirror://postgresql/source/v9.1.9/postgresql-9.1.9.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.1-r2.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-pre92-2.4.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ff510dc4a9e3152d68d19f8cc69118e2
diff --git a/metadata/md5-cache/dev-db/postgresql-server-9.2.4 b/metadata/md5-cache/dev-db/postgresql-server-9.2.4
index 0eb94b469969..9c690a31363b 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9.2.4
+++ b/metadata/md5-cache/dev-db/postgresql-server-9.2.4
@@ -10,5 +10,5 @@ PDEPEND=doc? ( ~dev-db/postgresql-docs-9.2.4 )
 RDEPEND=~dev-db/postgresql-base-9.2.4:9.2[kerberos?,pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_python3_1? ( dev-lang/python:3.1 ) python_single_target_python3_2? ( dev-lang/python:3.2 ) python_single_target_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt )
 SLOT=9.2
 SRC_URI=mirror://postgresql/source/v9.2.4/postgresql-9.2.4.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.2.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.4.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=611fc51f918c6b707767e157a5ce095c
diff --git a/metadata/md5-cache/dev-db/postgresql-server-9999 b/metadata/md5-cache/dev-db/postgresql-server-9999
index 8a8233a65df7..f4238d0e0af2 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9999
+++ b/metadata/md5-cache/dev-db/postgresql-server-9999
@@ -8,5 +8,5 @@ LICENSE=POSTGRESQL GPL-2
 RDEPEND=~dev-db/postgresql-base-9999:9.3[kerberos?,pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_python3_1? ( dev-lang/python:3.1 ) python_single_target_python3_2? ( dev-lang/python:3.2 ) python_single_target_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt )
 SLOT=9.3
 SRC_URI=http://dev.gentoo.org/~titanofold/postgresql-initscript-2.4.tbz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.2beta2.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=37a2ccfd84cc475828f4dc74d732a224
diff --git a/metadata/md5-cache/dev-db/recutils-1.5 b/metadata/md5-cache/dev-db/recutils-1.5
index 012bff6b986b..ccd169d4dbb0 100644
--- a/metadata/md5-cache/dev-db/recutils-1.5
+++ b/metadata/md5-cache/dev-db/recutils-1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=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 ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tools and libraries to access human-editable, plain text databases
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/recutils/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://gnu/recutils/recutils-1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=684f4d03bf2e9b9aa344cfa3f2ab68a5
diff --git a/metadata/md5-cache/dev-db/redis-2.4.10 b/metadata/md5-cache/dev-db/redis-2.4.10
index 02f97dd3d0c9..68cd85d9bcd9 100644
--- a/metadata/md5-cache/dev-db/redis-2.4.10
+++ b/metadata/md5-cache/dev-db/redis-2.4.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare setup
-DEPEND=>=sys-devel/autoconf-2.63 test? ( dev-lang/tcl ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( dev-libs/jemalloc ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-devel/autoconf-2.63 test? ( dev-lang/tcl ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( dev-libs/jemalloc ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A persistent caching system, key-value and data structures database.
 EAPI=4
 HOMEPAGE=http://redis.io/
@@ -10,5 +10,5 @@ RDEPEND=tcmalloc? ( dev-util/google-perftools ) jemalloc? ( dev-libs/jemalloc )
 REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
 SLOT=0
 SRC_URI=http://redis.googlecode.com/files/redis-2.4.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b27d620c1b09dd7bcf6e819c5a08aeaf
diff --git a/metadata/md5-cache/dev-db/redis-2.4.18 b/metadata/md5-cache/dev-db/redis-2.4.18
index 83acfd8a2c26..20c554149885 100644
--- a/metadata/md5-cache/dev-db/redis-2.4.18
+++ b/metadata/md5-cache/dev-db/redis-2.4.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=>=sys-devel/autoconf-2.63 test? ( dev-lang/tcl ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-devel/autoconf-2.63 test? ( dev-lang/tcl ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A persistent caching system, key-value and data structures database.
 EAPI=4
 HOMEPAGE=http://redis.io/
@@ -10,5 +10,5 @@ RDEPEND=tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-
 REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
 SLOT=0
 SRC_URI=http://redis.googlecode.com/files/redis-2.4.18.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=506b102ee8490490a74940c8109a9fd4
diff --git a/metadata/md5-cache/dev-db/redis-2.6.7 b/metadata/md5-cache/dev-db/redis-2.6.7
index ab1eba8f91f7..94a217a77135 100644
--- a/metadata/md5-cache/dev-db/redis-2.6.7
+++ b/metadata/md5-cache/dev-db/redis-2.6.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=>=sys-devel/autoconf-2.63 test? ( dev-lang/tcl ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-devel/autoconf-2.63 test? ( dev-lang/tcl ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A persistent caching system, key-value and data structures database.
 EAPI=4
 HOMEPAGE=http://redis.io/
@@ -10,5 +10,5 @@ RDEPEND=tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-
 REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
 SLOT=0
 SRC_URI=http://redis.googlecode.com/files/redis-2.6.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5a0961cc9b1a10828844b174200cea64
diff --git a/metadata/md5-cache/dev-db/redis-2.6.8 b/metadata/md5-cache/dev-db/redis-2.6.8
index 65599213c796..ee8993179f64 100644
--- a/metadata/md5-cache/dev-db/redis-2.6.8
+++ b/metadata/md5-cache/dev-db/redis-2.6.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=>=sys-devel/autoconf-2.63 test? ( dev-lang/tcl ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-devel/autoconf-2.63 test? ( dev-lang/tcl ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A persistent caching system, key-value and data structures database.
 EAPI=4
 HOMEPAGE=http://redis.io/
@@ -10,5 +10,5 @@ RDEPEND=tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-
 REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
 SLOT=0
 SRC_URI=http://redis.googlecode.com/files/redis-2.6.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8ba63cfdbf79e391953d942d1a29cfff
diff --git a/metadata/md5-cache/dev-db/redis-2.6.9 b/metadata/md5-cache/dev-db/redis-2.6.9
index 82232875d257..89afece0d0be 100644
--- a/metadata/md5-cache/dev-db/redis-2.6.9
+++ b/metadata/md5-cache/dev-db/redis-2.6.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=sys-devel/autoconf-2.63 test? ( dev-lang/tcl ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-devel/autoconf-2.63 test? ( dev-lang/tcl ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A persistent caching system, key-value and data structures database.
 EAPI=4
 HOMEPAGE=http://redis.io/
@@ -10,5 +10,5 @@ RDEPEND=tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-
 REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
 SLOT=0
 SRC_URI=http://redis.googlecode.com/files/redis-2.6.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e2272e65301b223a5f65728261a7e0bd
diff --git a/metadata/md5-cache/dev-db/sqlite-3.7.14.1 b/metadata/md5-cache/dev-db/sqlite-3.7.14.1
index 30d34626857e..887ca742b467 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.7.14.1
+++ b/metadata/md5-cache/dev-db/sqlite-3.7.14.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A SQL Database Engine in a C Library
 EAPI=5
 HOMEPAGE=http://sqlite.org/
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl )
 SLOT=3
 SRC_URI=doc? ( http://sqlite.org/sqlite-doc-3071400.zip ) tcl? ( http://sqlite.org/sqlite-src-3071401.zip ) !tcl? ( test? ( http://sqlite.org/sqlite-src-3071401.zip ) !test? ( http://sqlite.org/sqlite-autoconf-3071401.tar.gz ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=564586231cbb2ea0b134af375cac2ecc
diff --git a/metadata/md5-cache/dev-db/sqlite-3.7.15.2 b/metadata/md5-cache/dev-db/sqlite-3.7.15.2
index 28115282c98d..9a0525366b85 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.7.15.2
+++ b/metadata/md5-cache/dev-db/sqlite-3.7.15.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A SQL Database Engine in a C Library
 EAPI=5
 HOMEPAGE=http://sqlite.org/
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl:= )
 SLOT=3
 SRC_URI=doc? ( http://sqlite.org/sqlite-doc-3071502.zip ) tcl? ( http://sqlite.org/sqlite-src-3071502.zip ) !tcl? ( test? ( http://sqlite.org/sqlite-src-3071502.zip ) !test? ( http://sqlite.org/sqlite-autoconf-3071502.tar.gz ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=987ad2037f4239d64bf092b88ab71a48
diff --git a/metadata/md5-cache/dev-db/sqlite-3.7.16 b/metadata/md5-cache/dev-db/sqlite-3.7.16
index 18296bc1dd5e..41bb6074dee2 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.7.16
+++ b/metadata/md5-cache/dev-db/sqlite-3.7.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A SQL Database Engine in a C Library
 EAPI=5
 HOMEPAGE=http://sqlite.org/
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl:= )
 SLOT=3
 SRC_URI=doc? ( http://sqlite.org/2013/sqlite-doc-3071600.zip ) tcl? ( http://sqlite.org/2013/sqlite-src-3071600.zip ) !tcl? ( test? ( http://sqlite.org/2013/sqlite-src-3071600.zip ) !test? ( http://sqlite.org/2013/sqlite-autoconf-3071600.tar.gz ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c1cd09b01ff752e41677e7772eb15c96
diff --git a/metadata/md5-cache/dev-db/sqlite-3.7.16.1 b/metadata/md5-cache/dev-db/sqlite-3.7.16.1
index 130b8821fdd6..5ce5b0884cc9 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.7.16.1
+++ b/metadata/md5-cache/dev-db/sqlite-3.7.16.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A SQL Database Engine in a C Library
 EAPI=5
 HOMEPAGE=http://sqlite.org/
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl:= )
 SLOT=3
 SRC_URI=doc? ( http://sqlite.org/2013/sqlite-doc-3071601.zip ) tcl? ( http://sqlite.org/2013/sqlite-src-3071601.zip ) !tcl? ( test? ( http://sqlite.org/2013/sqlite-src-3071601.zip ) !test? ( http://sqlite.org/2013/sqlite-autoconf-3071601.tar.gz ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=187730b687b34b4ae0cbea12891b6b12
diff --git a/metadata/md5-cache/dev-db/sqlite-3.7.16.2 b/metadata/md5-cache/dev-db/sqlite-3.7.16.2
index 37e08fed25e7..945d3723bddd 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.7.16.2
+++ b/metadata/md5-cache/dev-db/sqlite-3.7.16.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A SQL Database Engine in a C Library
 EAPI=5
 HOMEPAGE=http://sqlite.org/
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl:= )
 SLOT=3
 SRC_URI=doc? ( http://sqlite.org/2013/sqlite-doc-3071602.zip ) tcl? ( http://sqlite.org/2013/sqlite-src-3071602.zip ) !tcl? ( test? ( http://sqlite.org/2013/sqlite-src-3071602.zip ) !test? ( http://sqlite.org/2013/sqlite-autoconf-3071602.tar.gz ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=635219251329cfdbd07cc77784375e3d
diff --git a/metadata/md5-cache/dev-db/tokyocabinet-1.4.47 b/metadata/md5-cache/dev-db/tokyocabinet-1.4.47
index ab0dce69bf92..7fabf0a5eca9 100644
--- a/metadata/md5-cache/dev-db/tokyocabinet-1.4.47
+++ b/metadata/md5-cache/dev-db/tokyocabinet-1.4.47
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=sys-libs/zlib app-arch/bzip2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib app-arch/bzip2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library of routines for managing a database
 EAPI=2
 HOMEPAGE=http://fallabs.com/tokyocabinet/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/zlib app-arch/bzip2
 SLOT=0
 SRC_URI=http://fallabs.com/tokyocabinet/tokyocabinet-1.4.47.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=987da600cb8fc2fc285caf664ffcb787
diff --git a/metadata/md5-cache/dev-db/tokyocabinet-1.4.48 b/metadata/md5-cache/dev-db/tokyocabinet-1.4.48
index b567a03da532..e406c2e61b74 100644
--- a/metadata/md5-cache/dev-db/tokyocabinet-1.4.48
+++ b/metadata/md5-cache/dev-db/tokyocabinet-1.4.48
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=sys-libs/zlib app-arch/bzip2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib app-arch/bzip2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library of routines for managing a database
 EAPI=2
 HOMEPAGE=http://fallabs.com/tokyocabinet/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/zlib app-arch/bzip2
 SLOT=0
 SRC_URI=http://fallabs.com/tokyocabinet/tokyocabinet-1.4.48.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=81fbc136971654ea8a940613f732ce7c
diff --git a/metadata/md5-cache/dev-db/virtuoso-odbc-6.1.6 b/metadata/md5-cache/dev-db/virtuoso-odbc-6.1.6
index ea00775e6981..ae8eb905ea03 100644
--- a/metadata/md5-cache/dev-db/virtuoso-odbc-6.1.6
+++ b/metadata/md5-cache/dev-db/virtuoso-odbc-6.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/openssl-0.9.7i:0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
+DEPEND=>=dev-libs/openssl-0.9.7i:0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
 DESCRIPTION=ODBC driver for OpenLink Virtuoso Open-Source Edition
 EAPI=4
 HOMEPAGE=http://virtuoso.openlinksw.com/wiki/main/Main/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/openssl-0.9.7i:0
 SLOT=0
 SRC_URI=mirror://sourceforge/virtuoso/virtuoso-opensource-6.1.6.tar.gz mirror://gentoo/VOS-genpatches-6.1.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtuoso	3cc59a9fc96b5c88423917b495413056
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtuoso	3cc59a9fc96b5c88423917b495413056
 _md5_=01c650c35c8a7ec54faec94e786b542c
diff --git a/metadata/md5-cache/dev-db/virtuoso-server-6.1.6 b/metadata/md5-cache/dev-db/virtuoso-server-6.1.6
index 592b76307125..b5e8b02b9ec7 100644
--- a/metadata/md5-cache/dev-db/virtuoso-server-6.1.6
+++ b/metadata/md5-cache/dev-db/virtuoso-server-6.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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-util/gperf-2.7.2 sys-apps/gawk >=sys-devel/bison-2.3 >=sys-devel/flex-2.5.33 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
+DEPEND=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-util/gperf-2.7.2 sys-apps/gawk >=sys-devel/bison-2.3 >=sys-devel/flex-2.5.33 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
 DESCRIPTION=Server binaries for Virtuoso, high-performance object-relational SQL database
 EAPI=4
 HOMEPAGE=http://virtuoso.openlinksw.com/wiki/main/Main/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 >=sys-libs/zlib-1.2.5.1-r
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/virtuoso/virtuoso-opensource-6.1.6.tar.gz mirror://gentoo/VOS-genpatches-6.1.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtuoso	3cc59a9fc96b5c88423917b495413056
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtuoso	3cc59a9fc96b5c88423917b495413056
 _md5_=3ab736589669b57a9d1739fcc9e99ee8
diff --git a/metadata/md5-cache/dev-db/xbase-3.1.2 b/metadata/md5-cache/dev-db/xbase-3.1.2
index 37fcd1deb3f8..c82c99481f57 100644
--- a/metadata/md5-cache/dev-db/xbase-3.1.2
+++ b/metadata/md5-cache/dev-db/xbase-3.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library
 EAPI=4
 HOMEPAGE=http://linux.techass.com/projects/xdb/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/xdb/xbase64-3.1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aacebccfce25509628d69f677b8151bc
diff --git a/metadata/md5-cache/dev-db/xbsql-0.11-r2 b/metadata/md5-cache/dev-db/xbsql-0.11-r2
index 3d9b5fca173f..6b9b49d65239 100644
--- a/metadata/md5-cache/dev-db/xbsql-0.11-r2
+++ b/metadata/md5-cache/dev-db/xbsql-0.11-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/xbase-3.1.2 sys-libs/readline sys-devel/automake sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-db/xbase-3.1.2 sys-libs/readline sys-devel/automake sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An SQL Wrapper for the XBase library
 EAPI=4
 HOMEPAGE=http://www.rekallrevealed.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-db/xbase-3.1.2 sys-libs/readline
 SLOT=0
 SRC_URI=http://www.rekallrevealed.org/packages/xbsql-0.11.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c73d830c5b4a8a5b06b263edf7802498
diff --git a/metadata/md5-cache/dev-dotnet/art-sharp-2.24.2 b/metadata/md5-cache/dev-dotnet/art-sharp-2.24.2
index 8470a6caefda..9b3118b2f946 100644
--- a/metadata/md5-cache/dev-dotnet/art-sharp-2.24.2
+++ b/metadata/md5-cache/dev-dotnet/art-sharp-2.24.2
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* >=dev-lang/mono-2.7 >=media-libs/libart_lgpl
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6abb44a7d4c074f88a4f6084964e3e6d
diff --git a/metadata/md5-cache/dev-dotnet/atk-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/atk-sharp-2.12.10
index 810b780ac3fc..2b3aec6b3b43 100644
--- a/metadata/md5-cache/dev-dotnet/atk-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/atk-sharp-2.12.10
@@ -10,5 +10,5 @@ RDEPEND=~dev-dotnet/glib-sharp-2.12.10 dev-libs/atk !<=dev-dotnet/gtk-sharp-2.12
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=79654b5310d31474e94410a7d47ef269
diff --git a/metadata/md5-cache/dev-dotnet/gconf-sharp-2.24.2 b/metadata/md5-cache/dev-dotnet/gconf-sharp-2.24.2
index 2a5816e6e486..9f255bab9454 100644
--- a/metadata/md5-cache/dev-dotnet/gconf-sharp-2.24.2
+++ b/metadata/md5-cache/dev-dotnet/gconf-sharp-2.24.2
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* >=dev-lang/mono-2.7 >=gnome-base/gconf-2.24:
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b3c34eedcf5def6a3730a0d3f110ee75
diff --git a/metadata/md5-cache/dev-dotnet/gdk-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/gdk-sharp-2.12.10
index b5b4cd6fde22..eb85d8c354ec 100644
--- a/metadata/md5-cache/dev-dotnet/gdk-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/gdk-sharp-2.12.10
@@ -10,5 +10,5 @@ RDEPEND=~dev-dotnet/glib-sharp-2.12.10 x11-libs/gtk+:2 ~dev-dotnet/pango-sharp-2
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3b21d5329f8242b75768bb8a118e12e6
diff --git a/metadata/md5-cache/dev-dotnet/gio-sharp-0.3 b/metadata/md5-cache/dev-dotnet/gio-sharp-0.3
index d347c2d466a9..cdc2d1dfce46 100644
--- a/metadata/md5-cache/dev-dotnet/gio-sharp-0.3
+++ b/metadata/md5-cache/dev-dotnet/gio-sharp-0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=>=dev-dotnet/glib-sharp-2.12 >=dev-dotnet/gtk-sharp-gapi-2.12 >=dev-libs/glib-2.22:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-dotnet/glib-sharp-2.12 >=dev-dotnet/gtk-sharp-gapi-2.12 >=dev-libs/glib-2.22:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GIO API C# binding
 EAPI=4
 HOMEPAGE=http://github.com/mono/gio-sharp
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-dotnet/glib-sharp-2.12 >=dev-dotnet/gtk-sharp-gapi-2.12 >=dev-libs/glib-2.22:2
 SLOT=0
 SRC_URI=http://github.com/mono/gio-sharp/tarball/0.3 -> gio-sharp-0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=e5ae2e6788566d2b7487f9208ba6ae3e
diff --git a/metadata/md5-cache/dev-dotnet/gkeyfile-sharp-0.1 b/metadata/md5-cache/dev-dotnet/gkeyfile-sharp-0.1
index 706da9a96e15..744b528ee5a2 100644
--- a/metadata/md5-cache/dev-dotnet/gkeyfile-sharp-0.1
+++ b/metadata/md5-cache/dev-dotnet/gkeyfile-sharp-0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare unpack
-DEPEND=>=dev-dotnet/glib-sharp-2.12.9 >=dev-dotnet/gtk-sharp-gapi-1.9 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-dotnet/glib-sharp-2.12.9 >=dev-dotnet/gtk-sharp-gapi-1.9 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C# binding for gkeyfile
 EAPI=2
 HOMEPAGE=http://launchpad.net/gkeyfile-sharp http://github.com/mono/gkeyfile-sharp
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-dotnet/glib-sharp-2.12.9 >=dev-dotnet/gtk-sharp-gapi-1.9
 SLOT=0
 SRC_URI=http://github.com/mono/gkeyfile-sharp/tarball/GKEYFILE_SHARP_0_1 -> gkeyfile-sharp-0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=75b46aeb6ffab7b22292fd3a25521f13
diff --git a/metadata/md5-cache/dev-dotnet/glade-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/glade-sharp-2.12.10
index 23c9d0661a53..a3ce6af44884 100644
--- a/metadata/md5-cache/dev-dotnet/glade-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/glade-sharp-2.12.10
@@ -10,5 +10,5 @@ RDEPEND=~dev-dotnet/glib-sharp-2.12.10 ~dev-dotnet/atk-sharp-2.12.10 ~dev-dotnet
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a9ce382a498a3cab63dba3772b98cb14
diff --git a/metadata/md5-cache/dev-dotnet/glib-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/glib-sharp-2.12.10
index b15aac9470bc..847e5a934f79 100644
--- a/metadata/md5-cache/dev-dotnet/glib-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/glib-sharp-2.12.10
@@ -10,5 +10,5 @@ RDEPEND=!<=dev-dotnet/gtk-sharp-2.12.7:2 dev-libs/glib:2 >=dev-lang/mono-2.0.1
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3d177b2e6777a4fbe2119435147584f1
diff --git a/metadata/md5-cache/dev-dotnet/gnome-desktop-sharp-2.26.0-r1 b/metadata/md5-cache/dev-dotnet/gnome-desktop-sharp-2.26.0-r1
index 3426dbe45d00..8d31cbebb7e2 100644
--- a/metadata/md5-cache/dev-dotnet/gnome-desktop-sharp-2.26.0-r1
+++ b/metadata/md5-cache/dev-dotnet/gnome-desktop-sharp-2.26.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/gnome-desktop-2.30:2 =dev-dotnet/gtk-sharp-2.12* =dev-dotne
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-desktop-sharp/2.26/gnome-desktop-sharp-2.26.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1b6286566736396f9fadf4c86e1a55c3
diff --git a/metadata/md5-cache/dev-dotnet/gnome-sharp-2.24.2 b/metadata/md5-cache/dev-dotnet/gnome-sharp-2.24.2
index 928f07271fc9..f874c4484cf9 100644
--- a/metadata/md5-cache/dev-dotnet/gnome-sharp-2.24.2
+++ b/metadata/md5-cache/dev-dotnet/gnome-sharp-2.24.2
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* >=dev-lang/mono-2.7 >=gnome-base/libgnomeui-
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=87fd9bd9f78fb26afaa3f24c7f8b919b
diff --git a/metadata/md5-cache/dev-dotnet/gnomevfs-sharp-2.24.2 b/metadata/md5-cache/dev-dotnet/gnomevfs-sharp-2.24.2
index c9bb5eef8236..b49ad4120cd5 100644
--- a/metadata/md5-cache/dev-dotnet/gnomevfs-sharp-2.24.2
+++ b/metadata/md5-cache/dev-dotnet/gnomevfs-sharp-2.24.2
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* >=dev-lang/mono-2.7 >=gnome-base/gnome-vfs-2
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2f67567bd6cbfbe5263e2b9969e45eaf
diff --git a/metadata/md5-cache/dev-dotnet/gsf-sharp-0.8.1 b/metadata/md5-cache/dev-dotnet/gsf-sharp-0.8.1
index 4ae2a047e1d0..21f5bd474d07 100644
--- a/metadata/md5-cache/dev-dotnet/gsf-sharp-0.8.1
+++ b/metadata/md5-cache/dev-dotnet/gsf-sharp-0.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-lang/mono >=gnome-extra/libgsf-1.14.1 >=dev-dotnet/gtk-sharp-2.4.0 virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/mono >=gnome-extra/libgsf-1.14.1 >=dev-dotnet/gtk-sharp-2.4.0 virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C# bindings for libgsf
 HOMEPAGE=http://www.mono-project.com/
 KEYWORDS=amd64 ppc x86
@@ -7,5 +7,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-lang/mono >=gnome-extra/libgsf-1.14.1 >=dev-dotnet/gtk-sharp-2.4.0
 SLOT=0
 SRC_URI=mirror://gentoo/gsf-sharp-0.8.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6cd412594dbe29a518ab4c3e2c78eb28
diff --git a/metadata/md5-cache/dev-dotnet/gtk-dotnet-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/gtk-dotnet-sharp-2.12.10
index 3cc6cea55d13..56f4efedd008 100644
--- a/metadata/md5-cache/dev-dotnet/gtk-dotnet-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/gtk-dotnet-sharp-2.12.10
@@ -10,5 +10,5 @@ RDEPEND=~dev-dotnet/glib-sharp-2.12.10 ~dev-dotnet/gdk-sharp-2.12.10 ~dev-dotnet
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eb74ac1640f8c4eb4ac381758886a627
diff --git a/metadata/md5-cache/dev-dotnet/gtk-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/gtk-sharp-2.12.10
index 619d429a7018..92483fb225b0 100644
--- a/metadata/md5-cache/dev-dotnet/gtk-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/gtk-sharp-2.12.10
@@ -10,5 +10,5 @@ RDEPEND=~dev-dotnet/glib-sharp-2.12.10 ~dev-dotnet/atk-sharp-2.12.10 ~dev-dotnet
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a817ae3ce0b81fbfcb50029bbd77c7cd
diff --git a/metadata/md5-cache/dev-dotnet/gtk-sharp-beans-2.14.0 b/metadata/md5-cache/dev-dotnet/gtk-sharp-beans-2.14.0
index 38d0fac8d2e1..0c97051f4de5 100644
--- a/metadata/md5-cache/dev-dotnet/gtk-sharp-beans-2.14.0
+++ b/metadata/md5-cache/dev-dotnet/gtk-sharp-beans-2.14.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=dev-dotnet/gio-sharp >=dev-dotnet/glib-sharp-2.12 >=dev-dotnet/gtk-sharp-2.12 >=dev-dotnet/gtk-sharp-gapi-2.12 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-dotnet/gio-sharp >=dev-dotnet/glib-sharp-2.12 >=dev-dotnet/gtk-sharp-2.12 >=dev-dotnet/gtk-sharp-gapi-2.12 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK+ API C# binding
 EAPI=2
 HOMEPAGE=http://github.com/mono/gtk-sharp-beans
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-dotnet/gio-sharp >=dev-dotnet/glib-sharp-2.12 >=dev-dotnet/gtk-sharp-2.12 >=dev-dotnet/gtk-sharp-gapi-2.12
 SLOT=0
 SRC_URI=http://github.com/mono/gtk-sharp-beans/tarball/2.14.0 -> gtk-sharp-beans-2.14.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=37d1f672ebfbc54e3b2e06e53c1f027a
diff --git a/metadata/md5-cache/dev-dotnet/gtk-sharp-docs-2.12.10 b/metadata/md5-cache/dev-dotnet/gtk-sharp-docs-2.12.10
index e24adcb0009e..7b03c9db9c18 100644
--- a/metadata/md5-cache/dev-dotnet/gtk-sharp-docs-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/gtk-sharp-docs-2.12.10
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/monodoc-2.0 >=dev-lang/mono-2.0.1
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7e74ac1477ab07bbb0f42af741c45439
diff --git a/metadata/md5-cache/dev-dotnet/gtk-sharp-gapi-2.12.10 b/metadata/md5-cache/dev-dotnet/gtk-sharp-gapi-2.12.10
index 2b40bb1120b0..5ec4d8b1baaf 100644
--- a/metadata/md5-cache/dev-dotnet/gtk-sharp-gapi-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/gtk-sharp-gapi-2.12.10
@@ -10,5 +10,5 @@ RDEPEND=!<=dev-dotnet/gtk-sharp-2.12.7:2 dev-perl/XML-LibXML >=dev-lang/mono-2.0
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5f556a1fe86ff888029a20cd5288ae93
diff --git a/metadata/md5-cache/dev-dotnet/gtkhtml-sharp-2.26.0 b/metadata/md5-cache/dev-dotnet/gtkhtml-sharp-2.26.0
index 596c52cd0d84..0bba9c886fa5 100644
--- a/metadata/md5-cache/dev-dotnet/gtkhtml-sharp-2.26.0
+++ b/metadata/md5-cache/dev-dotnet/gtkhtml-sharp-2.26.0
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* =dev-dotnet/gnome-sharp-2.24* gnome-base/gno
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-desktop-sharp/2.26/gnome-desktop-sharp-2.26.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5dee914b29e1ab81a10743f7684a6131
diff --git a/metadata/md5-cache/dev-dotnet/gtksourceview-sharp-2.24.0-r10 b/metadata/md5-cache/dev-dotnet/gtksourceview-sharp-2.24.0-r10
index c75d23253bea..6203d55073a7 100644
--- a/metadata/md5-cache/dev-dotnet/gtksourceview-sharp-2.24.0-r10
+++ b/metadata/md5-cache/dev-dotnet/gtksourceview-sharp-2.24.0-r10
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* =dev-dotnet/gnome-sharp-2.24* gnome-base/gno
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-desktop-sharp/2.24/gnome-desktop-sharp-2.24.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f46cb2be6a4193bc317980a63b284a29
diff --git a/metadata/md5-cache/dev-dotnet/notify-sharp-0.4.0_pre20090305 b/metadata/md5-cache/dev-dotnet/notify-sharp-0.4.0_pre20090305
index 9718deff8758..91b611d925a1 100644
--- a/metadata/md5-cache/dev-dotnet/notify-sharp-0.4.0_pre20090305
+++ b/metadata/md5-cache/dev-dotnet/notify-sharp-0.4.0_pre20090305
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a C# client implementation for Desktop Notifications
 EAPI=4
 HOMEPAGE=http://www.ndesk.org/NotifySharp
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://gentoo/notify-sharp-20090305.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d0d44daa4ee3fe1a8a5160756d4848b9
diff --git a/metadata/md5-cache/dev-dotnet/pango-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/pango-sharp-2.12.10
index 515cd585872f..39c8697098cc 100644
--- a/metadata/md5-cache/dev-dotnet/pango-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/pango-sharp-2.12.10
@@ -10,5 +10,5 @@ RDEPEND=~dev-dotnet/glib-sharp-2.12.10 x11-libs/pango !<=dev-dotnet/gtk-sharp-2.
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7027265a765e32c1b9dbe0c079a901ec
diff --git a/metadata/md5-cache/dev-dotnet/pe-format-2.1.1 b/metadata/md5-cache/dev-dotnet/pe-format-2.1.1
index 09f249f62635..b21a6adc14e8 100644
--- a/metadata/md5-cache/dev-dotnet/pe-format-2.1.1
+++ b/metadata/md5-cache/dev-dotnet/pe-format-2.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<sys-apps/openrc-0.9.4
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/pe-format2/downloads/pe-format-2.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=49c6c989708943673ae4e6b2bbdeb066
diff --git a/metadata/md5-cache/dev-dotnet/pe-format-2.9999 b/metadata/md5-cache/dev-dotnet/pe-format-2.9999
index ae952fed6ab6..7bb7807ccfe0 100644
--- a/metadata/md5-cache/dev-dotnet/pe-format-2.9999
+++ b/metadata/md5-cache/dev-dotnet/pe-format-2.9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=sys-devel/systemd-sdk dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=sys-devel/systemd-sdk dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Intelligent PE executable wrapper for binfmt_misc
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/pe-format2/
 LICENSE=GPL-2
 RDEPEND=!<sys-apps/openrc-0.9.4
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b1f6fb3ad5271be8e9beaeebbae98be0
diff --git a/metadata/md5-cache/dev-dotnet/rsvg-sharp-2.24.0-r10 b/metadata/md5-cache/dev-dotnet/rsvg-sharp-2.24.0-r10
index 6b3e93895c6d..165875f91b37 100644
--- a/metadata/md5-cache/dev-dotnet/rsvg-sharp-2.24.0-r10
+++ b/metadata/md5-cache/dev-dotnet/rsvg-sharp-2.24.0-r10
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* =dev-dotnet/gnome-sharp-2.24* gnome-base/gno
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-desktop-sharp/2.24/gnome-desktop-sharp-2.24.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=04d876f75c9a3ebd58e1ad15dad4305f
diff --git a/metadata/md5-cache/dev-dotnet/vte-sharp-2.24.0-r10 b/metadata/md5-cache/dev-dotnet/vte-sharp-2.24.0-r10
index afae4a85352d..811921e9f104 100644
--- a/metadata/md5-cache/dev-dotnet/vte-sharp-2.24.0-r10
+++ b/metadata/md5-cache/dev-dotnet/vte-sharp-2.24.0-r10
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* =dev-dotnet/gnome-sharp-2.24* gnome-base/gno
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-desktop-sharp/2.24/gnome-desktop-sharp-2.24.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=53c638cbb33b33b18cc79619d4d35138
diff --git a/metadata/md5-cache/dev-dotnet/wnck-sharp-2.24.0-r10 b/metadata/md5-cache/dev-dotnet/wnck-sharp-2.24.0-r10
index 03d3ae42d05d..1d27e63d5c59 100644
--- a/metadata/md5-cache/dev-dotnet/wnck-sharp-2.24.0-r10
+++ b/metadata/md5-cache/dev-dotnet/wnck-sharp-2.24.0-r10
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* =dev-dotnet/gnome-sharp-2.24* gnome-base/gno
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-desktop-sharp/2.24/gnome-desktop-sharp-2.24.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=60f21dc618a729da8f4bf554d2104be4
diff --git a/metadata/md5-cache/dev-dotnet/zeitgeist-sharp-0.8.0.0 b/metadata/md5-cache/dev-dotnet/zeitgeist-sharp-0.8.0.0
index 7ef5e15a81d1..02f7078d8295 100644
--- a/metadata/md5-cache/dev-dotnet/zeitgeist-sharp-0.8.0.0
+++ b/metadata/md5-cache/dev-dotnet/zeitgeist-sharp-0.8.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-dotnet/glib-sharp dev-lang/mono gnome-extra/zeitgeist virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-dotnet/glib-sharp dev-lang/mono gnome-extra/zeitgeist virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Mono DBus API wrapper for Zeitgeist
 EAPI=4
 HOMEPAGE=https://launchpad.net/zeitgeist-sharp/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-dotnet/glib-sharp dev-lang/mono gnome-extra/zeitgeist
 SLOT=0
 SRC_URI=http://launchpad.net/zeitgeist-sharp/0.8/0.8.0/+download/zeitgeist-sharp-0.8.0.0.tar.gz doc? ( http://launchpad.net/zeitgeist-sharp/0.8/0.8.0/+download/zeitgeist-sharp-docs-0.8.0.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e26204d85c8a671c037e4e85dde0503f
diff --git a/metadata/md5-cache/dev-dotnet/zeitgeist-sharp-0.8.0.0-r1 b/metadata/md5-cache/dev-dotnet/zeitgeist-sharp-0.8.0.0-r1
index 835e766ac59e..a82713899380 100644
--- a/metadata/md5-cache/dev-dotnet/zeitgeist-sharp-0.8.0.0-r1
+++ b/metadata/md5-cache/dev-dotnet/zeitgeist-sharp-0.8.0.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-dotnet/glib-sharp dev-lang/mono gnome-extra/zeitgeist virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-dotnet/glib-sharp dev-lang/mono gnome-extra/zeitgeist virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Mono DBus API wrapper for Zeitgeist
 EAPI=4
 HOMEPAGE=https://launchpad.net/zeitgeist-sharp/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-dotnet/glib-sharp dev-lang/mono gnome-extra/zeitgeist
 SLOT=0
 SRC_URI=http://launchpad.net/zeitgeist-sharp/0.8/0.8.0/+download/zeitgeist-sharp-0.8.0.0.tar.gz doc? ( http://launchpad.net/zeitgeist-sharp/0.8/0.8.0/+download/zeitgeist-sharp-docs-0.8.0.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=52c4cb0a74d25734b7f20afbe7936006
diff --git a/metadata/md5-cache/dev-embedded/avra-1.3.0 b/metadata/md5-cache/dev-embedded/avra-1.3.0
index e7f6a42a0d08..876e132bb26b 100644
--- a/metadata/md5-cache/dev-embedded/avra-1.3.0
+++ b/metadata/md5-cache/dev-embedded/avra-1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Atmel AVR Assembler
 EAPI=4
 HOMEPAGE=http://avra.sourceforge.net
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/avra/avra-1.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=3b0fec42c48bd4146758d752f4ba88ea
diff --git a/metadata/md5-cache/dev-embedded/dfu-programmer-0.5.4-r1 b/metadata/md5-cache/dev-embedded/dfu-programmer-0.5.4-r1
index ec7abbacc8cd..47613dd63efe 100644
--- a/metadata/md5-cache/dev-embedded/dfu-programmer-0.5.4-r1
+++ b/metadata/md5-cache/dev-embedded/dfu-programmer-0.5.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=virtual/libusb:1 virtual/udev || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=virtual/libusb:1 virtual/udev || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=A Device Firmware Update based USB programmer for Atmel chips
 EAPI=4
 HOMEPAGE=http://dfu-programmer.sourceforge.net
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:1 virtual/udev
 SLOT=0
 SRC_URI=mirror://sourceforge/dfu-programmer/dfu-programmer-0.5.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c41f90f4308478cdaae57a32199e4b14
diff --git a/metadata/md5-cache/dev-embedded/gnome-avrdude-0.1 b/metadata/md5-cache/dev-embedded/gnome-avrdude-0.1
index 7bf4ef9f262b..abe79662b71d 100644
--- a/metadata/md5-cache/dev-embedded/gnome-avrdude-0.1
+++ b/metadata/md5-cache/dev-embedded/gnome-avrdude-0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 gnome-base/gconf gnome-base/libgnome gnome-base/libgnomeui gnome-base/libglade x11-libs/pango virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 gnome-base/gconf gnome-base/libgnome gnome-base/libgnomeui gnome-base/libglade x11-libs/pango virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNOME GUI for avrdude
 EAPI=1
 HOMEPAGE=http://www.sourceforge.net/projects/gnome-avrdude/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://sourceforge/gnome-avrdude/gnome-avrdude-0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2643f54b2999ed3099b53e93b00fd02f
diff --git a/metadata/md5-cache/dev-embedded/gnusim8085-1.3.7 b/metadata/md5-cache/dev-embedded/gnusim8085-1.3.7
index e1a1cc7c2678..aaed523d94e4 100644
--- a/metadata/md5-cache/dev-embedded/gnusim8085-1.3.7
+++ b/metadata/md5-cache/dev-embedded/gnusim8085-1.3.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 x11-libs/gtksourceview:2.0 x11-libs/pango virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 x11-libs/gtksourceview:2.0 x11-libs/pango virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A GTK2 8085 Simulator
 EAPI=4
 HOMEPAGE=http://gnusim8085.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 x11-libs/gtksourceview:2.0 x11-libs/pango
 SLOT=0
 SRC_URI=http://launchpad.net/gnusim8085/trunk/1.3.7/+download/gnusim8085-1.3.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=07fda960d2387fe126dcdb4188f30a0d
diff --git a/metadata/md5-cache/dev-embedded/gpsim-0.26.1 b/metadata/md5-cache/dev-embedded/gpsim-0.26.1
index 2d545c1a0cc8..8f53225bebd4 100644
--- a/metadata/md5-cache/dev-embedded/gpsim-0.26.1
+++ b/metadata/md5-cache/dev-embedded/gpsim-0.26.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-embedded/gputils-0.12 !dev-embedded/gpsim-lcd dev-libs/glib:2 dev-libs/popt sys-libs/readline gtk? ( >=x11-libs/gtk+extra-2 ) sys-devel/flex virtual/pkgconfig virtual/yacc || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-embedded/gputils-0.12 !dev-embedded/gpsim-lcd dev-libs/glib:2 dev-libs/popt sys-libs/readline gtk? ( >=x11-libs/gtk+extra-2 ) sys-devel/flex virtual/pkgconfig virtual/yacc || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A simulator for the Microchip PIC microcontrollers
 EAPI=4
 HOMEPAGE=http://gpsim.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-embedded/gputils-0.12 !dev-embedded/gpsim-lcd dev-libs/glib:2 dev-libs/popt sys-libs/readline gtk? ( >=x11-libs/gtk+extra-2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gpsim/gpsim-0.26.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=60565c192b8302601a74e3cc56813c76
diff --git a/metadata/md5-cache/dev-embedded/lpc21isp-1.85 b/metadata/md5-cache/dev-embedded/lpc21isp-1.85
new file mode 100644
index 000000000000..468e0c6354df
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/lpc21isp-1.85
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=In-circuit programming (ISP) tool for the NXP microcontrollers
+EAPI=5
+HOMEPAGE=http://sourceforge.net/projects/lpc21isp/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+SLOT=0
+SRC_URI=mirror://sourceforge/lpc21isp/lpc21isp_185.tar.gz
+_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=203773ca7995fa24c50531fb8f7795c6
diff --git a/metadata/md5-cache/dev-embedded/openocd-0.6.1 b/metadata/md5-cache/dev-embedded/openocd-0.6.1
index 271caa600104..f4eb7f34abd6 100644
--- a/metadata/md5-cache/dev-embedded/openocd-0.6.1
+++ b/metadata/md5-cache/dev-embedded/openocd-0.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/openocd/openocd/0.6.1/openocd-0.6.1.tar.bz2
-_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=69afe96e5c505a2bfc4c9e628dc0f67b
+_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=91cbea9ea6fb42acf8aaab3888ebd264
diff --git a/metadata/md5-cache/dev-embedded/openocd-9999 b/metadata/md5-cache/dev-embedded/openocd-9999
index 3ec9da7d8e6d..734edd42b665 100644
--- a/metadata/md5-cache/dev-embedded/openocd-9999
+++ b/metadata/md5-cache/dev-embedded/openocd-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=dev-lang/jimtcl-0.73 usb? ( virtual/libusb:0 ) presto? ( dev-embedded/libftd2xx ) ftd2xx? ( dev-embedded/libftd2xx ) ftdi? ( dev-embedded/libftdi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=dev-lang/jimtcl-0.73 usb? ( virtual/libusb:0 ) presto? ( dev-embedded/libftd2xx ) ftd2xx? ( dev-embedded/libftd2xx ) ftdi? ( dev-embedded/libftdi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=OpenOCD - Open On-Chip Debugger
 EAPI=4
 HOMEPAGE=http://openocd.sourceforge.net
@@ -9,5 +9,5 @@ RDEPEND=>=dev-lang/jimtcl-0.73 usb? ( virtual/libusb:0 ) presto? ( dev-embedded/
 REQUIRED_USE=blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )
 RESTRICT=strip
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2c5d42fe37537859801d45fe44d25a58
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e82a959a5aef140e507a264dd4810b80
diff --git a/metadata/md5-cache/dev-embedded/scratchbox2-2.0-r1 b/metadata/md5-cache/dev-embedded/scratchbox2-2.0-r1
index 4ba6e88dd9e9..a59b6c07fa46 100644
--- a/metadata/md5-cache/dev-embedded/scratchbox2-2.0-r1
+++ b/metadata/md5-cache/dev-embedded/scratchbox2-2.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/lua-5.1.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-lang/lua-5.1.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A cross-compilation toolkit designed to make embedded Linux application development easier.
 EAPI=2
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/sbox2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/lua-5.1.4
 SLOT=0
 SRC_URI=http://cgit.freedesktop.org/sbox2/snapshot/sbox2-2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=37e189134f06694789a04452c6a690f6
diff --git a/metadata/md5-cache/dev-embedded/sdcc-2.8.0 b/metadata/md5-cache/dev-embedded/sdcc-2.8.0
index 7b064656144e..75d142fe128b 100644
--- a/metadata/md5-cache/dev-embedded/sdcc-2.8.0
+++ b/metadata/md5-cache/dev-embedded/sdcc-2.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-embedded/gputils-0.13.2 boehm-gc? ( dev-libs/boehm-gc ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-embedded/gputils-0.13.2 boehm-gc? ( dev-libs/boehm-gc ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Small device C compiler (for various microprocessors).
 HOMEPAGE=http://sdcc.sourceforge.net/
 IUSE=boehm-gc doc
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!dev-embedded/sdcc-svn
 SLOT=0
 SRC_URI=mirror://sourceforge/sdcc/sdcc-src-2.8.0.tar.bz2 doc? ( mirror://sourceforge/sdcc/sdcc-doc-2.8.0.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=74bfb91807a74d45aa73baf12a35e2cc
diff --git a/metadata/md5-cache/dev-embedded/sdcc-9999 b/metadata/md5-cache/dev-embedded/sdcc-9999
index ac1a83bfaaa4..1c7fd4ae866c 100644
--- a/metadata/md5-cache/dev-embedded/sdcc-9999
+++ b/metadata/md5-cache/dev-embedded/sdcc-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install preinst prepare unpack
-DEPEND=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[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Small device C compiler (for various microprocessors)
 EAPI=2
 HOMEPAGE=http://sdcc.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses sys-libs/readline >=dev-embedded/gputils-0.13.7 boehm-gc? ( dev-libs/boehm-gc ) !dev-embedded/sdcc-svn
 RESTRICT=strip
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=04099d8efd2d85f1776bb5fe018c10cd
diff --git a/metadata/md5-cache/dev-embedded/srecord-1.59 b/metadata/md5-cache/dev-embedded/srecord-1.59
index a3fdfda5b406..92dfd54ee14c 100644
--- a/metadata/md5-cache/dev-embedded/srecord-1.59
+++ b/metadata/md5-cache/dev-embedded/srecord-1.59
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libgcrypt dev-libs/boost sys-apps/groff test? ( app-arch/sharutils ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libgcrypt dev-libs/boost sys-apps/groff test? ( app-arch/sharutils ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A collection of powerful tools for manipulating EPROM load files.
 EAPI=4
 HOMEPAGE=http://srecord.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt
 SLOT=0
 SRC_URI=mirror://sourceforge/srecord/srecord-1.59.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1bb0bb56a895f499f4af7c32120b6b6c
diff --git a/metadata/md5-cache/dev-embedded/srecord-1.60 b/metadata/md5-cache/dev-embedded/srecord-1.60
index 86c6d3850249..8d3faac74f60 100644
--- a/metadata/md5-cache/dev-embedded/srecord-1.60
+++ b/metadata/md5-cache/dev-embedded/srecord-1.60
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libgcrypt dev-libs/boost sys-apps/groff test? ( app-arch/sharutils ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libgcrypt dev-libs/boost sys-apps/groff test? ( app-arch/sharutils ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A collection of powerful tools for manipulating EPROM load files.
 EAPI=4
 HOMEPAGE=http://srecord.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt
 SLOT=0
 SRC_URI=mirror://sourceforge/srecord/srecord-1.60.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e1b0ecdffb1cc05e2d126d5d1e9fc5ab
diff --git a/metadata/md5-cache/dev-embedded/srecord-1.61 b/metadata/md5-cache/dev-embedded/srecord-1.61
index 0bc5a1989ef1..bac2aae31c75 100644
--- a/metadata/md5-cache/dev-embedded/srecord-1.61
+++ b/metadata/md5-cache/dev-embedded/srecord-1.61
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libgcrypt dev-libs/boost sys-apps/groff test? ( app-arch/sharutils ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libgcrypt dev-libs/boost sys-apps/groff test? ( app-arch/sharutils ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A collection of powerful tools for manipulating EPROM load files
 EAPI=4
 HOMEPAGE=http://srecord.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt
 SLOT=0
 SRC_URI=mirror://sourceforge/srecord/srecord-1.61.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3a76ed2fd5c316f18d6335bb8b73f4d4
diff --git a/metadata/md5-cache/dev-embedded/urjtag-9999 b/metadata/md5-cache/dev-embedded/urjtag-9999
index 3602a85026f8..8d52c9cef206 100644
--- a/metadata/md5-cache/dev-embedded/urjtag-9999
+++ b/metadata/md5-cache/dev-embedded/urjtag-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=ftdi? ( dev-embedded/libftdi ) ftd2xx? ( dev-embedded/libftd2xx ) readline? ( sys-libs/readline ) usb? ( virtual/libusb:1 ) dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ftdi? ( dev-embedded/libftdi ) ftd2xx? ( dev-embedded/libftd2xx ) readline? ( sys-libs/readline ) usb? ( virtual/libusb:1 ) dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=tool for communicating over JTAG with flash chips, CPUs, and many more (fork of openwince jtag)
 EAPI=4
 HOMEPAGE=http://urjtag.sourceforge.net/
@@ -7,5 +7,5 @@ IUSE=ftd2xx ftdi readline static-libs usb
 LICENSE=GPL-2
 RDEPEND=ftdi? ( dev-embedded/libftdi ) ftd2xx? ( dev-embedded/libftd2xx ) readline? ( sys-libs/readline ) usb? ( virtual/libusb:1 ) !dev-embedded/jtag
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=13a8205ee7d0ff1251bac2bfe016c41f
diff --git a/metadata/md5-cache/dev-games/KXL-1.1.7-r2 b/metadata/md5-cache/dev-games/KXL-1.1.7-r2
index dda44e0377fb..aee590fffaa5 100644
--- a/metadata/md5-cache/dev-games/KXL-1.1.7-r2
+++ b/metadata/md5-cache/dev-games/KXL-1.1.7-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Development Library for making games for X
 EAPI=2
 HOMEPAGE=http://kxl.orz.hm/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://kxl.hn.org/download/KXL-1.1.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=da8d04610c7f7e7a40f676df26938775
diff --git a/metadata/md5-cache/dev-games/cegui-0.6.2b b/metadata/md5-cache/dev-games/cegui-0.6.2b
index 10af5d4853dd..b3f54d4fd410 100644
--- a/metadata/md5-cache/dev-games/cegui-0.6.2b
+++ b/metadata/md5-cache/dev-games/cegui-0.6.2b
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Crazy Eddie's GUI System
 EAPI=2
 HOMEPAGE=http://www.cegui.org.uk/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/crayzedsgui/CEGUI-0.6.2b.tar.gz doc? ( mirror://sourceforge/crayzedsgui/CEGUI-0.6.2-DOCS.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=82e380ebeb93e637720640a2324d0584
diff --git a/metadata/md5-cache/dev-games/clanlib-2.3.6 b/metadata/md5-cache/dev-games/clanlib-2.3.6
index 0da098c7bc6c..775bfb7dd3e1 100644
--- a/metadata/md5-cache/dev-games/clanlib-2.3.6
+++ b/metadata/md5-cache/dev-games/clanlib-2.3.6
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib X? ( media-libs/libpng virtual/jpeg media-libs/freetype me
 REQUIRED_USE=opengl? ( X )
 SLOT=2.3
 SRC_URI=http://clanlib.org/download/releases-2.0/ClanLib-2.3.6.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2eb31d7f610abaad60ad31a01797a3da
diff --git a/metadata/md5-cache/dev-games/crystalspace-2.0 b/metadata/md5-cache/dev-games/crystalspace-2.0
index bbe57529f33c..70ddffcb9ad7 100644
--- a/metadata/md5-cache/dev-games/crystalspace-2.0
+++ b/metadata/md5-cache/dev-games/crystalspace-2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=virtual/opengl media-libs/openal x11-libs/libXt x11-libs/libXxf86vm sys-libs/zlib cg? ( media-gfx/nvidia-cg-toolkit ) ode? ( <dev-games/ode-0.12 ) cal3d? ( >=media-libs/cal3d-0.11 ) jpeg? ( virtual/jpeg ) bullet? ( sci-physics/bullet ) 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:0 ) 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 virtual/pkgconfig java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/opengl media-libs/openal x11-libs/libXt x11-libs/libXxf86vm sys-libs/zlib cg? ( media-gfx/nvidia-cg-toolkit ) ode? ( <dev-games/ode-0.12 ) cal3d? ( >=media-libs/cal3d-0.11 ) jpeg? ( virtual/jpeg ) bullet? ( sci-physics/bullet ) 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:0 ) 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 virtual/pkgconfig java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Portable 3D Game Development Kit written in C++
 EAPI=5
 HOMEPAGE=http://crystal.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/opengl media-libs/openal x11-libs/libXt x11-libs/libXxf86vm sys-libs/zlib cg? ( media-gfx/nvidia-cg-toolkit ) ode? ( <dev-games/ode-0.12 ) cal3d? ( >=media-libs/cal3d-0.11 ) jpeg? ( virtual/jpeg ) bullet? ( sci-physics/bullet ) 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:0 ) 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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/crystal/crystalspace-src-2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=2e8a3cc2317a841c4e29e6c3abaeb83b
diff --git a/metadata/md5-cache/dev-games/ggz-client-libs-0.0.14.1 b/metadata/md5-cache/dev-games/ggz-client-libs-0.0.14.1
index b1b373bd93f8..3fdb7cc6086a 100644
--- a/metadata/md5-cache/dev-games/ggz-client-libs-0.0.14.1
+++ b/metadata/md5-cache/dev-games/ggz-client-libs-0.0.14.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=~dev-games/libggz-0.0.14.1 dev-libs/expat virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=~dev-games/libggz-0.0.14.1 dev-libs/expat virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The client libraries for GGZ Gaming Zone
 EAPI=4
 HOMEPAGE=http://www.ggzgamingzone.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=~dev-games/libggz-0.0.14.1 dev-libs/expat virtual/libintl
 SLOT=0
 SRC_URI=mirror://ggz/0.0.14.1/ggz-client-libs-0.0.14.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games-ggz	7957d0a0b68d2703b8bb71ec7ddd87a8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games-ggz	7957d0a0b68d2703b8bb71ec7ddd87a8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=45b0e5e80c8cd2653a77376810398a2e
diff --git a/metadata/md5-cache/dev-games/ggz-client-libs-0.0.14.1-r1 b/metadata/md5-cache/dev-games/ggz-client-libs-0.0.14.1-r1
index 3eb8c05013f0..f4e89ebac90b 100644
--- a/metadata/md5-cache/dev-games/ggz-client-libs-0.0.14.1-r1
+++ b/metadata/md5-cache/dev-games/ggz-client-libs-0.0.14.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=~dev-games/libggz-0.0.14.1 dev-libs/expat virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=~dev-games/libggz-0.0.14.1 dev-libs/expat virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The client libraries for GGZ Gaming Zone
 EAPI=4
 HOMEPAGE=http://www.ggzgamingzone.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=~dev-games/libggz-0.0.14.1 dev-libs/expat virtual/libintl
 SLOT=0
 SRC_URI=mirror://ggz/0.0.14.1/ggz-client-libs-0.0.14.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games-ggz	7957d0a0b68d2703b8bb71ec7ddd87a8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games-ggz	7957d0a0b68d2703b8bb71ec7ddd87a8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=adc4627d080f824c8c69c60b9741bf21
diff --git a/metadata/md5-cache/dev-games/guichan-0.8.2 b/metadata/md5-cache/dev-games/guichan-0.8.2
index 9312d94af390..26621e0ea386 100644
--- a/metadata/md5-cache/dev-games/guichan-0.8.2
+++ b/metadata/md5-cache/dev-games/guichan-0.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=allegro? ( <media-libs/allegro-5 ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl media-libs/sdl-image ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=allegro? ( <media-libs/allegro-5 ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl media-libs/sdl-image ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a portable C++ GUI library designed for games using Allegro, SDL and/or OpenGL
 EAPI=2
 HOMEPAGE=http://guichan.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=allegro? ( <media-libs/allegro-5 ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl media-libs/sdl-image )
 SLOT=0
 SRC_URI=http://guichan.googlecode.com/files/guichan-0.8.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6d8b63df041d228b593f5d402f7d8fda
diff --git a/metadata/md5-cache/dev-games/libgrapple-0.9.8 b/metadata/md5-cache/dev-games/libgrapple-0.9.8
index b0b0e3e234b8..6329dad845ec 100644
--- a/metadata/md5-cache/dev-games/libgrapple-0.9.8
+++ b/metadata/md5-cache/dev-games/libgrapple-0.9.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=ssl? ( dev-libs/openssl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ssl? ( dev-libs/openssl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A high level network layer for multiuser applications
 EAPI=2
 HOMEPAGE=http://grapple.linuxgamepublishing.com/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=http://osfiles.linuxgamepublishing.com/libgrapple-0.9.8.tbz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f0829d26be98aa3db3dd1c94392e791a
diff --git a/metadata/md5-cache/dev-games/neoengine-0.8.2-r1 b/metadata/md5-cache/dev-games/neoengine-0.8.2-r1
index 5ec67834171c..2b942eff0d7b 100644
--- a/metadata/md5-cache/dev-games/neoengine-0.8.2-r1
+++ b/metadata/md5-cache/dev-games/neoengine-0.8.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=virtual/opengl media-libs/alsa-lib media-libs/libpng virtual/jpeg doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/opengl media-libs/alsa-lib media-libs/libpng virtual/jpeg doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An open source, platform independent, 3D game engine written in C++
 EAPI=2
 HOMEPAGE=http://www.neoengine.org/
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=virtual/opengl media-libs/alsa-lib media-libs/libpng virtual/jpeg
 SLOT=0
 SRC_URI=mirror://sourceforge/neoengine/neoengine-0.8.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=162eb1f128a684a23a3f19b4af8680f5
diff --git a/metadata/md5-cache/dev-games/neotools-0.8.2-r1 b/metadata/md5-cache/dev-games/neotools-0.8.2-r1
index a0467d251197..1b2ad279dc37 100644
--- a/metadata/md5-cache/dev-games/neotools-0.8.2-r1
+++ b/metadata/md5-cache/dev-games/neotools-0.8.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=dev-games/neoengine-0.8.2 app-arch/bzip2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-games/neoengine-0.8.2 app-arch/bzip2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Various development tools for NeoEngine
 EAPI=2
 HOMEPAGE=http://www.neoengine.org/
@@ -8,5 +8,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=dev-games/neoengine-0.8.2 app-arch/bzip2
 SLOT=0
 SRC_URI=mirror://sourceforge/neoengine/neotools-0.8.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=37b6b3ac1da670794db8a4ee02001c05
diff --git a/metadata/md5-cache/dev-games/ois-1.3 b/metadata/md5-cache/dev-games/ois-1.3
index e452ec608d55..c13324db186d 100644
--- a/metadata/md5-cache/dev-games/ois-1.3
+++ b/metadata/md5-cache/dev-games/ois-1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libXaw x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libXaw x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Object-oriented Input System - A cross-platform C++ input handling library
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/wgois/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=mirror://sourceforge/wgois/ois_v1-3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3fec701e00130fd431ed38ec10d37a0f
diff --git a/metadata/md5-cache/dev-haskell/alex-2.3.5 b/metadata/md5-cache/dev-haskell/alex-2.3.5
index f7e456806cda..efa8251e3ebb 100644
--- a/metadata/md5-cache/dev-haskell/alex-2.3.5
+++ b/metadata/md5-cache/dev-haskell/alex-2.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-haskell/cabal-1.1.4
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Alex is a tool for generating lexical analysers in Haskell
 EAPI=3
 HOMEPAGE=http://www.haskell.org/alex/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/alex/2.3.5/alex-2.3.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=22f93a473752eca0405e3768a87e940f
diff --git a/metadata/md5-cache/dev-haskell/alex-3.0.2 b/metadata/md5-cache/dev-haskell/alex-3.0.2
index ca258bb769dc..810b6c9b09f8 100644
--- a/metadata/md5-cache/dev-haskell/alex-3.0.2
+++ b/metadata/md5-cache/dev-haskell/alex-3.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=>=dev-haskell/cabal-1.6 >=dev-haskell/quickcheck-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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-haskell/cabal-1.1.4
+DEPEND=>=dev-haskell/cabal-1.6 >=dev-haskell/quickcheck-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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Alex is a tool for generating lexical analysers in Haskell
 EAPI=3
 HOMEPAGE=http://www.haskell.org/alex/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/alex/3.0.2/alex-3.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2cfaeb3c070ec87a2b20602d978c88f1
diff --git a/metadata/md5-cache/dev-haskell/alex-3.0.5 b/metadata/md5-cache/dev-haskell/alex-3.0.5
index 0b50a8849ad9..574be82a60e3 100644
--- a/metadata/md5-cache/dev-haskell/alex-3.0.5
+++ b/metadata/md5-cache/dev-haskell/alex-3.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=>=dev-haskell/cabal-1.8 >=dev-haskell/quickcheck-2 >=dev-lang/ghc-6.10.4 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-haskell/cabal-1.1.4
+DEPEND=>=dev-haskell/cabal-1.8 >=dev-haskell/quickcheck-2 >=dev-lang/ghc-6.10.4 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Alex is a tool for generating lexical analysers in Haskell
 EAPI=5
 HOMEPAGE=http://www.haskell.org/alex/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/alex/3.0.5/alex-3.0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0e2f045e2878fb48226de5e1560eedef
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.6.1 b/metadata/md5-cache/dev-haskell/haddock-2.6.1
index 818da9af42e1..696af1e7aa0f 100644
--- a/metadata/md5-cache/dev-haskell/haddock-2.6.1
+++ b/metadata/md5-cache/dev-haskell/haddock-2.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prerm setup test unpack
-DEPEND=>=dev-lang/ghc-6.12 <dev-lang/ghc-7 >=dev-haskell/cabal-1.6 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) >=dev-haskell/cabal-1.1.4 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-lang/ghc-6.12 <dev-lang/ghc-7 >=dev-haskell/cabal-1.6 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) >=dev-haskell/cabal-1.1.4 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A documentation-generation tool for Haskell libraries
 HOMEPAGE=http://www.haskell.org/haddock/
 IUSE=doc
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12 <dev-lang/ghc-7
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/haddock/2.6.1/haddock-2.6.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1d1fd9ee8e20a525561976d7499c749b
diff --git a/metadata/md5-cache/dev-haskell/happy-1.18.10 b/metadata/md5-cache/dev-haskell/happy-1.18.10
index 99db4f592144..a6d06c71b0b8 100644
--- a/metadata/md5-cache/dev-haskell/happy-1.18.10
+++ b/metadata/md5-cache/dev-haskell/happy-1.18.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
-DEPEND=>=dev-haskell/cabal-1.2.3 >=dev-haskell/mtl-1.0 >=dev-lang/ghc-6.8.2 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets ) >=dev-haskell/cabal-1.1.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-haskell/cabal-1.2.3 >=dev-haskell/mtl-1.0 >=dev-lang/ghc-6.8.2 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets ) >=dev-haskell/cabal-1.1.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Happy is a parser generator for Haskell
 EAPI=4
 HOMEPAGE=http://www.haskell.org/happy/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/happy/1.18.10/happy-1.18.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=753f48378d08994bb4148166f1565d10
diff --git a/metadata/md5-cache/dev-haskell/happy-1.18.9 b/metadata/md5-cache/dev-haskell/happy-1.18.9
index e1b95eb266a6..19bc965f4f96 100644
--- a/metadata/md5-cache/dev-haskell/happy-1.18.9
+++ b/metadata/md5-cache/dev-haskell/happy-1.18.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
-DEPEND=>=dev-haskell/cabal-1.2.3 >=dev-haskell/mtl-1.0 >=dev-lang/ghc-6.8.2 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets ) >=dev-haskell/cabal-1.1.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-haskell/cabal-1.2.3 >=dev-haskell/mtl-1.0 >=dev-lang/ghc-6.8.2 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets ) >=dev-haskell/cabal-1.1.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Happy is a parser generator for Haskell
 EAPI=4
 HOMEPAGE=http://www.haskell.org/happy/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/happy/1.18.9/happy-1.18.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1792e715a09a239cc9f27fa4565cdc55
diff --git a/metadata/md5-cache/dev-haskell/language-c-0.4.2 b/metadata/md5-cache/dev-haskell/language-c-0.4.2
index dfc9568ba6b5..9641c24ba303 100644
--- a/metadata/md5-cache/dev-haskell/language-c-0.4.2
+++ b/metadata/md5-cache/dev-haskell/language-c-0.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Analysis and generation of C code
 EAPI=4
 HOMEPAGE=http://www.sivity.net/projects/language.c/
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=dev-haskell/syb[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/language-c/0.4.2/language-c-0.4.2.tar.gz
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5a7e13f42b51393cb5ec94fd75fe617e
+_md5_=83c1e0368590c8a2efa3673913883376
diff --git a/metadata/md5-cache/dev-haskell/network-2.2.1.7 b/metadata/md5-cache/dev-haskell/network-2.2.1.7
index fd3ec3229dc7..f2e611dda4b1 100644
--- a/metadata/md5-cache/dev-haskell/network-2.2.1.7
+++ b/metadata/md5-cache/dev-haskell/network-2.2.1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prerm setup test unpack
-DEPEND=>=dev-lang/ghc-6.6.1 dev-haskell/parsec >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) >=dev-haskell/cabal-1.1.4 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-lang/ghc-6.6.1 dev-haskell/parsec >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) >=dev-haskell/cabal-1.1.4 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Networking-related facilities
 HOMEPAGE=http://hackage.haskell.org/cgi-bin/hackage-scripts/package/network
 IUSE=doc profile
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.6.1 dev-haskell/parsec
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/network/2.2.1.7/network-2.2.1.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0a1b748fdacc1b5865c1e0b9567b4c36
diff --git a/metadata/md5-cache/dev-haskell/network-2.3.0.11 b/metadata/md5-cache/dev-haskell/network-2.3.0.11
index f2475090360d..96916ff33625 100644
--- a/metadata/md5-cache/dev-haskell/network-2.3.0.11
+++ b/metadata/md5-cache/dev-haskell/network-2.3.0.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
-DEPEND=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.7[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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.7[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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Low-level networking interface
 EAPI=4
 HOMEPAGE=http://github.com/haskell/network
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/parsec[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/network/2.3.0.11/network-2.3.0.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=16f4f5a2fbca851e9e281ac9440f2709
diff --git a/metadata/md5-cache/dev-haskell/network-2.3.0.13 b/metadata/md5-cache/dev-haskell/network-2.3.0.13
index 8d1fe3b11407..029cccfb98db 100644
--- a/metadata/md5-cache/dev-haskell/network-2.3.0.13
+++ b/metadata/md5-cache/dev-haskell/network-2.3.0.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
-DEPEND=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.7[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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.7[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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Low-level networking interface
 EAPI=4
 HOMEPAGE=http://github.com/haskell/network
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/parsec[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/network/2.3.0.13/network-2.3.0.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3ad1561ca252a312c198166c3b720cc5
diff --git a/metadata/md5-cache/dev-haskell/network-2.3.0.14 b/metadata/md5-cache/dev-haskell/network-2.3.0.14
index dbf30528b9b2..c8bde00acbbb 100644
--- a/metadata/md5-cache/dev-haskell/network-2.3.0.14
+++ b/metadata/md5-cache/dev-haskell/network-2.3.0.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
-DEPEND=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.7[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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.7[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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Low-level networking interface
 EAPI=4
 HOMEPAGE=http://github.com/haskell/network
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/parsec[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/network/2.3.0.14/network-2.3.0.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1ac11aef71c5739c9ec4ae2bb3dc3ae7
diff --git a/metadata/md5-cache/dev-haskell/network-2.3.0.2 b/metadata/md5-cache/dev-haskell/network-2.3.0.2
index ae8d5578be97..634927301765 100644
--- a/metadata/md5-cache/dev-haskell/network-2.3.0.2
+++ b/metadata/md5-cache/dev-haskell/network-2.3.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Low-level networking interface
 EAPI=3
 HOMEPAGE=http://github.com/haskell/network
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/parsec >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/network/2.3.0.2/network-2.3.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d7407e832a7630c52d41f3a4dd90ddb2
diff --git a/metadata/md5-cache/dev-haskell/network-2.3.0.7 b/metadata/md5-cache/dev-haskell/network-2.3.0.7
index e1a8a2fdc66d..6a7a8db78454 100644
--- a/metadata/md5-cache/dev-haskell/network-2.3.0.7
+++ b/metadata/md5-cache/dev-haskell/network-2.3.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Low-level networking interface
 EAPI=3
 HOMEPAGE=http://github.com/haskell/network
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/parsec >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/network/2.3.0.7/network-2.3.0.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1a31162fd5cccfef508f3238a9b6501b
diff --git a/metadata/md5-cache/dev-haskell/terminfo-0.3.2.3 b/metadata/md5-cache/dev-haskell/terminfo-0.3.2.3
index 7a92c47cfea2..070461613c97 100644
--- a/metadata/md5-cache/dev-haskell/terminfo-0.3.2.3
+++ b/metadata/md5-cache/dev-haskell/terminfo-0.3.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=>=dev-lang/ghc-6.10.4 sys-libs/ncurses >=dev-haskell/cabal-1.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEPEND=>=dev-lang/ghc-6.10.4 sys-libs/ncurses >=dev-haskell/cabal-1.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Haskell bindings to the terminfo library.
 EAPI=3
 HOMEPAGE=http://code.haskell.org/terminfo
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4 sys-libs/ncurses
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/terminfo/0.3.2.3/terminfo-0.3.2.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f41fa044ca61dda405b2472bc833e9f2
diff --git a/metadata/md5-cache/dev-haskell/terminfo-0.3.2.5 b/metadata/md5-cache/dev-haskell/terminfo-0.3.2.5
index 2d1f4c939434..bdd94fdbe5df 100644
--- a/metadata/md5-cache/dev-haskell/terminfo-0.3.2.5
+++ b/metadata/md5-cache/dev-haskell/terminfo-0.3.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=>=dev-lang/ghc-6.10.4:= sys-libs/ncurses >=dev-haskell/cabal-1.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEPEND=>=dev-lang/ghc-6.10.4:= sys-libs/ncurses >=dev-haskell/cabal-1.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Haskell bindings to the terminfo library.
 EAPI=5
 HOMEPAGE=http://code.haskell.org/terminfo
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:= sys-libs/ncurses
 SLOT=0/0.3.2.5
 SRC_URI=mirror://hackage/packages/archive/terminfo/0.3.2.5/terminfo-0.3.2.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	ghc-package	f8674c44668a01a8b05d66a7c140008b	haskell-cabal	a2a8de4cff4a18a175b08057c65a7c4d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=34ab7dee79fbd49a3bc5a877b59f5587
diff --git a/metadata/md5-cache/dev-java/cacao-0.99.4 b/metadata/md5-cache/dev-java/cacao-0.99.4
index f3359ae39ed6..878100aaa76e 100644
--- a/metadata/md5-cache/dev-java/cacao-0.99.4
+++ b/metadata/md5-cache/dev-java/cacao-0.99.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup
-DEPEND=dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj dev-java/ecj-gcj ) test? ( dev-java/junit:4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
+DEPEND=dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj dev-java/ecj-gcj ) test? ( dev-java/junit:4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 DESCRIPTION=Cacao Java Virtual Machine
 EAPI=2
 HOMEPAGE=http://www.cacaojvm.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 SLOT=0
 SRC_URI=http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/cacao-0.99.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e72fba2357c97504b1485e0a43bc8860
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.0.2 b/metadata/md5-cache/dev-java/commons-daemon-1.0.2
index b759263a8dc7..06496a2410bb 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.0.2
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tools to allow java programs to run as unix daemons
 EAPI=2
 HOMEPAGE=http://commons.apache.org/daemon/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.0.2-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=713eb56b466b0f3e8670bb8ebfa92e08
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.0.4 b/metadata/md5-cache/dev-java/commons-daemon-1.0.4
index 74fabc7893b6..05b858928635 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.0.4
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tools to allow java programs to run as unix daemons
 EAPI=2
 HOMEPAGE=http://commons.apache.org/daemon/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.0.4-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=29f3f5034e32354dfae472a9bd94782d
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.0.7 b/metadata/md5-cache/dev-java/commons-daemon-1.0.7
index fa1863ee1738..3f949e775d30 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.0.7
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jdk-1.4 || ( >=sys-devel/automake-1.12:1.12 ) >=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.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jdk-1.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
 DESCRIPTION=Tools to allow Java programs to run as UNIX daemons
 EAPI=4
 HOMEPAGE=http://commons.apache.org/daemon/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.0.7-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d60d5bd59a43f1c118b64bdd994ad925
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.0.8 b/metadata/md5-cache/dev-java/commons-daemon-1.0.8
index ea64d750f63a..94dbba74ddc7 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.0.8
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jdk-1.4 || ( >=sys-devel/automake-1.12:1.12 ) >=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.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jdk-1.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
 DESCRIPTION=Tools to allow Java programs to run as UNIX daemons
 EAPI=4
 HOMEPAGE=http://commons.apache.org/daemon/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.0.8-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f6ab02baf8f8a0fc4ce41254eacc176b
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.0.9 b/metadata/md5-cache/dev-java/commons-daemon-1.0.9
index 770ec5c2a1a1..233896a034c1 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.0.9
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.0.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jdk-1.4 || ( >=sys-devel/automake-1.12:1.12 ) >=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.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jdk-1.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
 DESCRIPTION=Tools to allow Java programs to run as UNIX daemons
 EAPI=4
 HOMEPAGE=http://commons.apache.org/daemon/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.0.9-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d4bd8981c466b832bfbbb94515edce58
diff --git a/metadata/md5-cache/dev-java/gjdoc-0.7.9-r1 b/metadata/md5-cache/dev-java/gjdoc-0.7.9-r1
index 6ef71a433cdc..6e0f61365597 100644
--- a/metadata/md5-cache/dev-java/gjdoc-0.7.9-r1
+++ b/metadata/md5-cache/dev-java/gjdoc-0.7.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jre-1.4 >=dev-java/antlr-2.7.1:0[java] >=virtual/jdk-1.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+DEPEND=>=virtual/jre-1.4 >=dev-java/antlr-2.7.1:0[java] >=virtual/jdk-1.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 DESCRIPTION=A javadoc compatible Java source documentation generator.
 EAPI=2
 HOMEPAGE=http://www.gnu.org/software/cp-tools/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/antlr-2.7.1:0[java] >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gnu/classpath/gjdoc-0.7.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5b082306f961038448c4b3652d02353b
diff --git a/metadata/md5-cache/dev-java/gjdoc-0.7.9-r2 b/metadata/md5-cache/dev-java/gjdoc-0.7.9-r2
index 1d0c6707c831..4b30ce61165f 100644
--- a/metadata/md5-cache/dev-java/gjdoc-0.7.9-r2
+++ b/metadata/md5-cache/dev-java/gjdoc-0.7.9-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jre-1.4 >=dev-java/antlr-2.7.1:0[java] >=virtual/jdk-1.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+DEPEND=>=virtual/jre-1.4 >=dev-java/antlr-2.7.1:0[java] >=virtual/jdk-1.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 DESCRIPTION=A javadoc compatible Java source documentation generator.
 EAPI=2
 HOMEPAGE=http://www.gnu.org/software/cp-tools/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/antlr-2.7.1:0[java] >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gnu/classpath/gjdoc-0.7.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f5f27b93aed9b93e5609dd91eb3135aa
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.3 b/metadata/md5-cache/dev-java/icedtea-web-1.3
index a878a8f818e0..0f81ff604176 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.3
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup
-DEPEND=dev-java/icedtea:6 nsplugin? ( >=dev-libs/glib-2.16 gtk2? ( !gtk3? ( >=x11-libs/gtk+-2.6:2 ) gtk3? ( x11-libs/gtk+:3 ) ) !gtk2? ( x11-libs/gtk+:3 ) ) virtual/pkgconfig javascript? ( dev-java/rhino:1.6 ) nsplugin? ( net-misc/npapi-sdk ) test? ( >=dev-java/junit-4.8:4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
+DEPEND=dev-java/icedtea:6 nsplugin? ( >=dev-libs/glib-2.16 gtk2? ( !gtk3? ( >=x11-libs/gtk+-2.6:2 ) gtk3? ( x11-libs/gtk+:3 ) ) !gtk2? ( x11-libs/gtk+:3 ) ) virtual/pkgconfig javascript? ( dev-java/rhino:1.6 ) nsplugin? ( net-misc/npapi-sdk ) test? ( >=dev-java/junit-4.8:4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 DESCRIPTION=FOSS Java browser plugin and Web Start implementation
 EAPI=4
 HOMEPAGE=http://icedtea.classpath.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
 RDEPEND=dev-java/icedtea:6 nsplugin? ( >=dev-libs/glib-2.16 gtk2? ( !gtk3? ( >=x11-libs/gtk+-2.6:2 ) gtk3? ( x11-libs/gtk+:3 ) ) !gtk2? ( x11-libs/gtk+:3 ) ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 SLOT=6
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9945420895bc08e5b2b0012524809034
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.3-r7 b/metadata/md5-cache/dev-java/icedtea-web-1.3-r7
index 1d6b5a6de1e7..bee0a61d0d68 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.3-r7
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.3-r7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup
-DEPEND=dev-java/icedtea:7 nsplugin? ( >=dev-libs/glib-2.16 gtk2? ( !gtk3? ( >=x11-libs/gtk+-2.6:2 ) gtk3? ( x11-libs/gtk+:3 ) ) !gtk2? ( x11-libs/gtk+:3 ) ) virtual/pkgconfig javascript? ( dev-java/rhino:1.6 ) nsplugin? ( net-misc/npapi-sdk ) test? ( >=dev-java/junit-4.8:4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
+DEPEND=dev-java/icedtea:7 nsplugin? ( >=dev-libs/glib-2.16 gtk2? ( !gtk3? ( >=x11-libs/gtk+-2.6:2 ) gtk3? ( x11-libs/gtk+:3 ) ) !gtk2? ( x11-libs/gtk+:3 ) ) virtual/pkgconfig javascript? ( dev-java/rhino:1.6 ) nsplugin? ( net-misc/npapi-sdk ) test? ( >=dev-java/junit-4.8:4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 DESCRIPTION=FOSS Java browser plugin and Web Start implementation
 EAPI=4
 HOMEPAGE=http://icedtea.classpath.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
 RDEPEND=dev-java/icedtea:7 nsplugin? ( >=dev-libs/glib-2.16 gtk2? ( !gtk3? ( >=x11-libs/gtk+-2.6:2 ) gtk3? ( x11-libs/gtk+:3 ) ) !gtk2? ( x11-libs/gtk+:3 ) ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 SLOT=7
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e567efa2e813c7ae01f8ca96b4d50e4c
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.3.1 b/metadata/md5-cache/dev-java/icedtea-web-1.3.1
index 7ffd1e44c76a..5cd8349844f2 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.3.1
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup
-DEPEND=dev-java/icedtea:6 nsplugin? ( >=dev-libs/glib-2.16 gtk2? ( !gtk3? ( >=x11-libs/gtk+-2.6:2 ) gtk3? ( x11-libs/gtk+:3 ) ) !gtk2? ( x11-libs/gtk+:3 ) ) virtual/pkgconfig javascript? ( dev-java/rhino:1.6 ) nsplugin? ( net-misc/npapi-sdk ) test? ( >=dev-java/junit-4.8:4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
+DEPEND=dev-java/icedtea:6 nsplugin? ( >=dev-libs/glib-2.16 gtk2? ( !gtk3? ( >=x11-libs/gtk+-2.6:2 ) gtk3? ( x11-libs/gtk+:3 ) ) !gtk2? ( x11-libs/gtk+:3 ) ) virtual/pkgconfig javascript? ( dev-java/rhino:1.6 ) nsplugin? ( net-misc/npapi-sdk ) test? ( >=dev-java/junit-4.8:4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 DESCRIPTION=FOSS Java browser plugin and Web Start implementation
 EAPI=4
 HOMEPAGE=http://icedtea.classpath.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
 RDEPEND=dev-java/icedtea:6 nsplugin? ( >=dev-libs/glib-2.16 gtk2? ( !gtk3? ( >=x11-libs/gtk+-2.6:2 ) gtk3? ( x11-libs/gtk+:3 ) ) !gtk2? ( x11-libs/gtk+:3 ) ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 SLOT=6
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bdac402ff1a324fc3813982cc2878238
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.3.1-r7 b/metadata/md5-cache/dev-java/icedtea-web-1.3.1-r7
index b4a3ba710049..5fdccbed5610 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.3.1-r7
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.3.1-r7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup
-DEPEND=dev-java/icedtea:7 nsplugin? ( >=dev-libs/glib-2.16 gtk2? ( !gtk3? ( >=x11-libs/gtk+-2.6:2 ) gtk3? ( x11-libs/gtk+:3 ) ) !gtk2? ( x11-libs/gtk+:3 ) ) virtual/pkgconfig javascript? ( dev-java/rhino:1.6 ) nsplugin? ( net-misc/npapi-sdk ) test? ( >=dev-java/junit-4.8:4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
+DEPEND=dev-java/icedtea:7 nsplugin? ( >=dev-libs/glib-2.16 gtk2? ( !gtk3? ( >=x11-libs/gtk+-2.6:2 ) gtk3? ( x11-libs/gtk+:3 ) ) !gtk2? ( x11-libs/gtk+:3 ) ) virtual/pkgconfig javascript? ( dev-java/rhino:1.6 ) nsplugin? ( net-misc/npapi-sdk ) test? ( >=dev-java/junit-4.8:4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 DESCRIPTION=FOSS Java browser plugin and Web Start implementation
 EAPI=4
 HOMEPAGE=http://icedtea.classpath.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
 RDEPEND=dev-java/icedtea:7 nsplugin? ( >=dev-libs/glib-2.16 gtk2? ( !gtk3? ( >=x11-libs/gtk+-2.6:2 ) gtk3? ( x11-libs/gtk+:3 ) ) !gtk2? ( x11-libs/gtk+:3 ) ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 SLOT=7
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d06900d05721023afc9ad4baffd9d3aa
diff --git a/metadata/md5-cache/dev-java/jamvm-1.5.4-r1 b/metadata/md5-cache/dev-java/jamvm-1.5.4-r1
index abc05c382041..7e6e10882185 100644
--- a/metadata/md5-cache/dev-java/jamvm-1.5.4-r1
+++ b/metadata/md5-cache/dev-java/jamvm-1.5.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare prerm setup
-DEPEND=dev-java/gnu-classpath:0.98 libffi? ( virtual/libffi ) amd64? ( virtual/libffi ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-java/gnu-classpath:0.98 libffi? ( virtual/libffi ) amd64? ( virtual/libffi ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An extremely small and specification-compliant virtual machine.
 EAPI=2
 HOMEPAGE=http://jamvm.sourceforge.net/
@@ -10,5 +10,5 @@ PDEPEND=dev-java/gjdoc dev-java/eclipse-ecj
 RDEPEND=dev-java/gnu-classpath:0.98 libffi? ( virtual/libffi ) amd64? ( virtual/libffi ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/jamvm/jamvm-1.5.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=524b76530c4bfc9f17885ec643578f30
diff --git a/metadata/md5-cache/dev-java/jamvm-1.5.4-r2 b/metadata/md5-cache/dev-java/jamvm-1.5.4-r2
index affc677ca81b..b16305d9bfa8 100644
--- a/metadata/md5-cache/dev-java/jamvm-1.5.4-r2
+++ b/metadata/md5-cache/dev-java/jamvm-1.5.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare prerm setup
-DEPEND=dev-java/gnu-classpath:0.98 libffi? ( virtual/libffi ) amd64? ( virtual/libffi ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-java/gnu-classpath:0.98 libffi? ( virtual/libffi ) amd64? ( virtual/libffi ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An extremely small and specification-compliant virtual machine.
 EAPI=4
 HOMEPAGE=http://jamvm.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/gnu-classpath:0.98 libffi? ( virtual/libffi ) amd64? ( virtual/libffi ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/jamvm/jamvm-1.5.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c21f585249eb64b205002a67320b7bbd
diff --git a/metadata/md5-cache/dev-java/jicmp-1.0.2 b/metadata/md5-cache/dev-java/jicmp-1.0.2
index eb5d7d5a264d..985769cd92b5 100644
--- a/metadata/md5-cache/dev-java/jicmp-1.0.2
+++ b/metadata/md5-cache/dev-java/jicmp-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.5 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.5 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 DESCRIPTION=Java Interface to Tobias Oetiker's RRDtool
 EAPI=2
 HOMEPAGE=http://www.opennms.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/opennms/jicmp-1.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7f175f192b49f96e9595609f98337dd9
diff --git a/metadata/md5-cache/dev-java/jjtraveler-0.4.3-r2 b/metadata/md5-cache/dev-java/jjtraveler-0.4.3-r2
index 3b1e8a001214..7545ff9a3842 100644
--- a/metadata/md5-cache/dev-java/jjtraveler-0.4.3-r2
+++ b/metadata/md5-cache/dev-java/jjtraveler-0.4.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 =dev-java/junit-3.8* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.4 =dev-java/junit-3.8* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 DESCRIPTION=A visitor combinator framework for Java
 HOMEPAGE=http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATermLibrary
 IUSE=elibc_FreeBSD source doc
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 =dev-java/junit-3.8* >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.cwi.nl/projects/MetaEnv/jjtraveler/JJTraveler-0.4.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=157b32a452189db5a24fb780c1fa2e25
diff --git a/metadata/md5-cache/dev-java/jrrd-1.0.1-r1 b/metadata/md5-cache/dev-java/jrrd-1.0.1-r1
index d37359fc9390..ef8c749ac5de 100644
--- a/metadata/md5-cache/dev-java/jrrd-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/jrrd-1.0.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 net-analyzer/rrdtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/opennms/jrrd-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=adb778d9dc53b0bfc4fc3a4d2389fddd
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.7.0.21 b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.7.0.21
index 129384f7fecb..fc0198444a3c 100644
--- a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.7.0.21
+++ b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.7.0.21
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle's Java SE Development Kit
 EAPI=5
 HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
 IUSE=+X alsa derby doc examples +fontconfig jce nsplugin pax_kernel source
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Oracle-BCLA-JavaSE examples? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) doc? ( dev-java/java-sdk-docs:1.7 ) fontconfig? ( media-libs/fontconfig ) !prefix? ( sys-libs/glibc ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 RESTRICT=fetch strip
 SLOT=1.7
 SRC_URI=amd64? ( jdk-7u21-linux-x64.tar.gz examples? ( javafx_samples-2_2_21-linux.zip jdk-7u21-linux-x64-demos.tar.gz ) ) arm? ( jdk-7u21-linux-arm-sfp.tar.gz examples? ( javafx_samples-2_2_21-linux.zip jdk-7u21-linux-arm-sfp-demos.tar.gz ) ) x86? ( jdk-7u21-linux-i586.tar.gz examples? ( javafx_samples-2_2_21-linux.zip jdk-7u21-linux-i586-demos.tar.gz ) ) x64-solaris? ( jdk-7u21-solaris-i586.tar.gz jdk-7u21-solaris-x64.tar.gz examples? ( jdk-7u21-solaris-i586-demos.tar.gz jdk-7u21-solaris-x64-demos.tar.gz ) ) x86-solaris? ( jdk-7u21-solaris-i586.tar.gz examples? ( jdk-7u21-solaris-i586-demos.tar.gz ) ) sparc-solaris? ( jdk-7u21-solaris-sparc.tar.gz examples? ( jdk-7u21-solaris-sparc-demos.tar.gz ) ) sparc64-solaris? ( jdk-7u21-solaris-sparc.tar.gz jdk-7u21-solaris-sparcv9.tar.gz examples? ( jdk-7u21-solaris-sparc-demos.tar.gz jdk-7u21-solaris-sparcv9-demos.tar.gz ) ) jce? ( UnlimitedJCEPolicyJDK7.zip )
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=66d0d59ebbe80448957d776e3dadaaa1
+_md5_=c50b254dbc3159b8fa204724bc174216
diff --git a/metadata/md5-cache/dev-java/oracle-jre-bin-1.7.0.21 b/metadata/md5-cache/dev-java/oracle-jre-bin-1.7.0.21
index 108af47ceeae..621076437b82 100644
--- a/metadata/md5-cache/dev-java/oracle-jre-bin-1.7.0.21
+++ b/metadata/md5-cache/dev-java/oracle-jre-bin-1.7.0.21
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle's Java SE Runtime Environment
 EAPI=5
 HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
 IUSE=X alsa fontconfig jce nsplugin pax_kernel
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=Oracle-BCLA-JavaSE
 RDEPEND=X? ( x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libX11 ) alsa? ( media-libs/alsa-lib ) fontconfig? ( media-libs/fontconfig ) !prefix? ( sys-libs/glibc ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 RESTRICT=fetch strip
 SLOT=1.7
 SRC_URI=x86? ( jre-7u21-linux-i586.tar.gz ) amd64? ( jre-7u21-linux-x64.tar.gz ) jce? ( UnlimitedJCEPolicyJDK7.zip )
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ee90c7db941494f807c41ee0fbf7f274
+_md5_=35208618937778e6744fb9297190d534
diff --git a/metadata/md5-cache/dev-java/rxtx-2.1.7.2-r2 b/metadata/md5-cache/dev-java/rxtx-2.1.7.2-r2
index 7cbab2ae6624..56317b672cc6 100644
--- a/metadata/md5-cache/dev-java/rxtx-2.1.7.2-r2
+++ b/metadata/md5-cache/dev-java/rxtx-2.1.7.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip dev-java/ant-core lfd? ( sys-apps/xinetd ) source? ( app-arch/zip ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1
+DEPEND=>=virtual/jdk-1.4 app-arch/unzip dev-java/ant-core lfd? ( sys-apps/xinetd ) source? ( app-arch/zip ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1
 DESCRIPTION=Native lib providing serial and parallel communication for Java
 HOMEPAGE=http://rxtx.qbang.org/
 IUSE=doc source lfd elibc_FreeBSD
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 SLOT=2
 SRC_URI=ftp://ftp.qbang.org/pub/rxtx/rxtx-2.1-7r2.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3a79166011aa7a1afe843740675e790c
diff --git a/metadata/md5-cache/dev-java/rxtx-2.1.7.2-r3 b/metadata/md5-cache/dev-java/rxtx-2.1.7.2-r3
index 4003b26711ba..5ce7231f01c8 100644
--- a/metadata/md5-cache/dev-java/rxtx-2.1.7.2-r3
+++ b/metadata/md5-cache/dev-java/rxtx-2.1.7.2-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip dev-java/ant-core lfd? ( sys-apps/xinetd ) source? ( app-arch/zip ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1
+DEPEND=>=virtual/jdk-1.4 app-arch/unzip dev-java/ant-core lfd? ( sys-apps/xinetd ) source? ( app-arch/zip ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1
 DESCRIPTION=Native lib providing serial and parallel communication for Java
 HOMEPAGE=http://rxtx.qbang.org/
 IUSE=doc source lfd elibc_FreeBSD
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 SLOT=2
 SRC_URI=ftp://ftp.qbang.org/pub/rxtx/rxtx-2.1-7r2.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c7df0482b4e1a6576b7a617795086434
diff --git a/metadata/md5-cache/dev-java/rxtx-2.2_pre2 b/metadata/md5-cache/dev-java/rxtx-2.2_pre2
index 01bc19b75cc3..005b8e0688e0 100644
--- a/metadata/md5-cache/dev-java/rxtx-2.2_pre2
+++ b/metadata/md5-cache/dev-java/rxtx-2.2_pre2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip dev-java/ant-core lfd? ( sys-apps/xinetd ) source? ( app-arch/zip ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1
+DEPEND=>=virtual/jdk-1.4 app-arch/unzip dev-java/ant-core lfd? ( sys-apps/xinetd ) source? ( app-arch/zip ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1
 DESCRIPTION=Native lib providing serial and parallel communication for Java
 EAPI=4
 HOMEPAGE=http://rxtx.qbang.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 SLOT=2
 SRC_URI=ftp://ftp.qbang.org/pub/rxtx/rxtx-2.2pre2.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=824ec5d8572a8204ee081f92ebd51818
diff --git a/metadata/md5-cache/dev-java/sun-jdk-1.6.0.45 b/metadata/md5-cache/dev-java/sun-jdk-1.6.0.45
index 0b1782794751..cb6e9c8ec1e6 100644
--- a/metadata/md5-cache/dev-java/sun-jdk-1.6.0.45
+++ b/metadata/md5-cache/dev-java/sun-jdk-1.6.0.45
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle's Java SE Development Kit
 EAPI=5
 HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
 IUSE=+X alsa derby doc examples jce kernel_SunOS nsplugin pax_kernel source
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Oracle-BCLA-JavaSE examples? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) doc? ( dev-java/java-sdk-docs:1.6.0 ) !prefix? ( sys-libs/glibc ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 RESTRICT=fetch strip
 SLOT=1.6
 SRC_URI=amd64? ( jdk-6u45-linux-x64.bin examples? ( jdk-6u45-linux-x64-demos.tar.gz ) ) ia64? ( jdk-6u45-linux-ia64.bin examples? ( jdk-6u45-linux-ia64-demos.tar.gz ) ) x86? ( jdk-6u45-linux-i586.bin examples? ( jdk-6u45-linux-i586-demos.tar.gz ) ) x64-solaris? ( jdk-6u45-solaris-i586.sh jdk-6u45-solaris-x64.sh examples? ( jdk-6u45-solaris-i586-demos.tar.Z jdk-6u45-solaris-x64-demos.tar.Z ) ) x86-solaris? ( jdk-6u45-solaris-i586.sh examples? ( jdk-6u45-solaris-i586-demos.tar.Z ) ) sparc-solaris? ( jdk-6u45-solaris-sparc.sh examples? ( jdk-6u45-solaris-sparc-demos.tar.Z ) ) sparc64-solaris? ( jdk-6u45-solaris-sparc.sh jdk-6u45-solaris-sparcv9.sh examples? ( jdk-6u45-solaris-sparc-demos.tar.Z jdk-6u45-solaris-sparcv9-demos.tar.Z ) ) jce? ( jce_policy-6.zip )
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=945f252af9ba540a03c08b80320f38b8
+_md5_=90f88fa7383c5bb56be4aa109bf12e24
diff --git a/metadata/md5-cache/dev-java/sun-jre-bin-1.6.0.45 b/metadata/md5-cache/dev-java/sun-jre-bin-1.6.0.45
index 5440ee1c54a5..03662744c9de 100644
--- a/metadata/md5-cache/dev-java/sun-jre-bin-1.6.0.45
+++ b/metadata/md5-cache/dev-java/sun-jre-bin-1.6.0.45
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle's Java SE Runtime Environment
 EAPI=5
 HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
 IUSE=X alsa jce nsplugin pax_kernel
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Oracle-BCLA-JavaSE
 RDEPEND=X? ( x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libX11 ) alsa? ( media-libs/alsa-lib ) jce? ( dev-java/sun-jce-bin:1.6 ) !prefix? ( sys-libs/glibc ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 RESTRICT=fetch strip
 SLOT=1.6
 SRC_URI=amd64? ( jre-6u45-linux-x64.bin ) ia64? ( jre-6u45-linux-ia64.bin ) x86? ( jre-6u45-linux-i586.bin )
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a50af9a74dab11f99d79f6ee99adf68f
+_md5_=342be92499b766d2bcb57d7f0da3aced
diff --git a/metadata/md5-cache/dev-java/tijmp-0.8 b/metadata/md5-cache/dev-java/tijmp-0.8
index 2082fb7ce73b..2ff327b81baf 100644
--- a/metadata/md5-cache/dev-java/tijmp-0.8
+++ b/metadata/md5-cache/dev-java/tijmp-0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1
+DEPEND=>=virtual/jdk-1.6 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1
 DESCRIPTION=Java Memory Profiler for java 1.6+
 EAPI=2
 HOMEPAGE=http://www.khelekore.org/jmp/tijmp/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=http://www.khelekore.org/jmp/tijmp/tijmp-0.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fc5e23cd3bb0572767d25baa08964357
diff --git a/metadata/md5-cache/dev-lang/R-2.15.2 b/metadata/md5-cache/dev-lang/R-2.15.2
index 6718a2b9aad6..3d2a8f6b3ded 100644
--- a/metadata/md5-cache/dev-lang/R-2.15.2
+++ b/metadata/md5-cache/dev-lang/R-2.15.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=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 ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=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 ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Language and environment for statistical computing and graphics
 EAPI=4
 HOMEPAGE=http://www.r-project.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo
 RESTRICT=minimal? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-2/R-2.15.2.tar.gz bash-completion? ( http://dev.gentoo.org/~bicatali/distfiles/R-20120306.bash_completion.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dac92745132deeef8aa6348f25628b13
diff --git a/metadata/md5-cache/dev-lang/R-2.15.2-r2 b/metadata/md5-cache/dev-lang/R-2.15.2-r2
index 058b3b2e1102..49fdc9bd8a2c 100644
--- a/metadata/md5-cache/dev-lang/R-2.15.2-r2
+++ b/metadata/md5-cache/dev-lang/R-2.15.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=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 ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=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 ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Language and environment for statistical computing and graphics
 EAPI=5
 HOMEPAGE=http://www.r-project.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo
 RESTRICT=minimal? ( test )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/R-2.15.2.tar.bz2 bash-completion? ( http://dev.gentoo.org/~bicatali/distfiles/R-20130129.bash_completion.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=486b2dc8ce34ca0e88b789d197a04964
diff --git a/metadata/md5-cache/dev-lang/R-2.15.3 b/metadata/md5-cache/dev-lang/R-2.15.3
index ac4498126dc3..d82c8793704f 100644
--- a/metadata/md5-cache/dev-lang/R-2.15.3
+++ b/metadata/md5-cache/dev-lang/R-2.15.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=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 ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=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 ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Language and environment for statistical computing and graphics
 EAPI=5
 HOMEPAGE=http://www.r-project.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo
 RESTRICT=minimal? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-2/R-2.15.3.tar.gz bash-completion? ( http://dev.gentoo.org/~bicatali/distfiles/R-20130129.bash_completion.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fa0548f665d5bbbc88b252c37cb1c4c1
diff --git a/metadata/md5-cache/dev-lang/R-3.0.0 b/metadata/md5-cache/dev-lang/R-3.0.0
index fe56a6026e6e..1a3383d207de 100644
--- a/metadata/md5-cache/dev-lang/R-3.0.0
+++ b/metadata/md5-cache/dev-lang/R-3.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=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 ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=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 ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Language and environment for statistical computing and graphics
 EAPI=5
 HOMEPAGE=http://www.r-project.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo
 RESTRICT=minimal? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-3/R-3.0.0.tar.gz bash-completion? ( http://dev.gentoo.org/~bicatali/distfiles/R-20130129.bash_completion.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f73210ffd36185ef5db51cad899583de
diff --git a/metadata/md5-cache/dev-lang/bas-2.2 b/metadata/md5-cache/dev-lang/bas-2.2
index 2eb8ca9eaf02..68ca49c344f7 100644
--- a/metadata/md5-cache/dev-lang/bas-2.2
+++ b/metadata/md5-cache/dev-lang/bas-2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An interpreter for the classic dialect of the programming language BASIC
 EAPI=4
 HOMEPAGE=http://www.moria.de/~michael/bas/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses virtual/libintl
 SLOT=0
 SRC_URI=http://www.moria.de/~michael/bas/bas-2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aca62c233a4aeff01b45f9f154be9227
diff --git a/metadata/md5-cache/dev-lang/bas-2.3 b/metadata/md5-cache/dev-lang/bas-2.3
index 1e6ca667cbea..9606a6ce1d7d 100644
--- a/metadata/md5-cache/dev-lang/bas-2.3
+++ b/metadata/md5-cache/dev-lang/bas-2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An interpreter for the classic dialect of the programming language BASIC
 EAPI=4
 HOMEPAGE=http://www.moria.de/~michael/bas/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses virtual/libintl
 SLOT=0
 SRC_URI=http://www.moria.de/~michael/bas/bas-2.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0752a8859b8d8047302e543b66eff0cf
diff --git a/metadata/md5-cache/dev-lang/cilk-5.4.6-r1 b/metadata/md5-cache/dev-lang/cilk-5.4.6-r1
index fd7461835aa0..7b585e4c08fd 100644
--- a/metadata/md5-cache/dev-lang/cilk-5.4.6-r1
+++ b/metadata/md5-cache/dev-lang/cilk-5.4.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Language for multithreaded parallel programming based on ANSI C
 EAPI=5
 HOMEPAGE=http://supertech.csail.mit.edu/cilk
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://supertech.csail.mit.edu/cilk/cilk-5.4.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6da75ff979da5cf25ceaa4b0a7642056
diff --git a/metadata/md5-cache/dev-lang/ferite-1.1.17-r1 b/metadata/md5-cache/dev-lang/ferite-1.1.17-r1
index 6986c2a6b892..db5612dd7dde 100644
--- a/metadata/md5-cache/dev-lang/ferite-1.1.17-r1
+++ b/metadata/md5-cache/dev-lang/ferite-1.1.17-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libpcre-5 dev-libs/libxml2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libpcre-5 dev-libs/libxml2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A clean, lightweight, object oriented scripting language
 EAPI=4
 HOMEPAGE=http://www.ferite.org/
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libpcre-5 dev-libs/libxml2
 SLOT=1
 SRC_URI=mirror://sourceforge/ferite/ferite-1.1.17.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4a7937d1c04d5305e85cc38a82f59e17
diff --git a/metadata/md5-cache/dev-lang/ghc-6.12.3-r2 b/metadata/md5-cache/dev-lang/ghc-6.12.3-r2
index d130228e5f28..8e2ca7dabb0e 100644
--- a/metadata/md5-cache/dev-lang/ghc-6.12.3-r2
+++ b/metadata/md5-cache/dev-lang/ghc-6.12.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup unpack
-DEPEND=!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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=3
 HOMEPAGE=http://www.haskell.org/ghc/
@@ -10,5 +10,5 @@ PDEPEND=!ghcbootstrap? ( || ( =app-admin/haskell-updater-1.2* =app-admin/haskell
 RDEPEND=!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 )
 SLOT=0
 SRC_URI=!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 ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion	003731da0df19d26955927bd534f3058	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	ghc-package	f8674c44668a01a8b05d66a7c140008b	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion	003731da0df19d26955927bd534f3058	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	ghc-package	f8674c44668a01a8b05d66a7c140008b	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0b44f729815faff15d7a4270ba46db59
diff --git a/metadata/md5-cache/dev-lang/ghc-7.0.4 b/metadata/md5-cache/dev-lang/ghc-7.0.4
index 37959bd21355..60859086179d 100644
--- a/metadata/md5-cache/dev-lang/ghc-7.0.4
+++ b/metadata/md5-cache/dev-lang/ghc-7.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup unpack
-DEPEND=!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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=3
 HOMEPAGE=http://www.haskell.org/ghc/
@@ -10,5 +10,5 @@ PDEPEND=!ghcbootstrap? ( =app-admin/haskell-updater-1.2* ) dev-haskell/syb llvm?
 RDEPEND=!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 )
 SLOT=0
 SRC_URI=!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 ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion	003731da0df19d26955927bd534f3058	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	ghc-package	f8674c44668a01a8b05d66a7c140008b	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion	003731da0df19d26955927bd534f3058	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	ghc-package	f8674c44668a01a8b05d66a7c140008b	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4ffb0b483b359b57bef4791890f98eb8
diff --git a/metadata/md5-cache/dev-lang/ghc-7.4.1 b/metadata/md5-cache/dev-lang/ghc-7.4.1
index e37417f36f0a..c885b641d776 100644
--- a/metadata/md5-cache/dev-lang/ghc-7.4.1
+++ b/metadata/md5-cache/dev-lang/ghc-7.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup unpack
-DEPEND=!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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=4
 HOMEPAGE=http://www.haskell.org/ghc/
@@ -10,5 +10,5 @@ PDEPEND=!ghcbootstrap? ( =app-admin/haskell-updater-1.2* ) llvm? ( sys-devel/llv
 RDEPEND=!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]
 SLOT=0
 SRC_URI=!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 ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	ghc-package	f8674c44668a01a8b05d66a7c140008b	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	ghc-package	f8674c44668a01a8b05d66a7c140008b	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e7737e67394a8c44a29c6a8822433690
diff --git a/metadata/md5-cache/dev-lang/ghc-7.4.1-r1 b/metadata/md5-cache/dev-lang/ghc-7.4.1-r1
index 0b7231ed12d0..05fd39f1a7ce 100644
--- a/metadata/md5-cache/dev-lang/ghc-7.4.1-r1
+++ b/metadata/md5-cache/dev-lang/ghc-7.4.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup unpack
-DEPEND=!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 virtual/libffi !<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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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 virtual/libffi !<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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=4
 HOMEPAGE=http://www.haskell.org/ghc/
@@ -10,5 +10,5 @@ PDEPEND=!ghcbootstrap? ( =app-admin/haskell-updater-1.2* ) llvm? ( sys-devel/llv
 RDEPEND=!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 virtual/libffi !<dev-haskell/haddock-2.4.2 sys-libs/ncurses[unicode]
 SLOT=0
 SRC_URI=!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 ) x86-macos? ( http://www.haskell.org/ghc/dist/7.4.1/ghc-7.4.1-i386-apple-darwin.tar.bz2 ) x64-macos? ( http://www.haskell.org/ghc/dist/7.4.1/ghc-7.4.1-x86_64-apple-darwin.tar.bz2 ) x86-solaris? ( http://www.haskell.org/ghc/dist/7.0.3/maeder/ghc-7.0.3-i386-unknown-solaris2.tar.bz2 ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	ghc-package	f8674c44668a01a8b05d66a7c140008b	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	ghc-package	f8674c44668a01a8b05d66a7c140008b	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=473411025994a59c41f98dac20d4d659
diff --git a/metadata/md5-cache/dev-lang/ghc-7.4.2 b/metadata/md5-cache/dev-lang/ghc-7.4.2
index 96322bd0cfb7..57b5dfa54727 100644
--- a/metadata/md5-cache/dev-lang/ghc-7.4.2
+++ b/metadata/md5-cache/dev-lang/ghc-7.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup unpack
-DEPEND=!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 virtual/libffi !<dev-haskell/haddock-2.10.0 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 ) ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.14 ) ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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 virtual/libffi !<dev-haskell/haddock-2.10.0 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 ) ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.14 ) ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=5
 HOMEPAGE=http://www.haskell.org/ghc/
@@ -11,5 +11,5 @@ RDEPEND=!kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/b
 REQUIRED_USE=ia64? ( !gmp )
 SLOT=0/7.4.2
 SRC_URI=!binary? ( http://www.haskell.org/ghc/dist/7.4.2/ghc-7.4.2-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-7.4.2-alpha.tbz2 ) amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-7.4.2-amd64-stable-glibc.tbz2 ) ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-7.4.2-ia64.tbz2 ) ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-7.4.2-ppc.tbz2 ) ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-7.4.2-ppc64.tbz2 ) sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-7.4.2-sparc.tbz2 ) x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-7.4.2-x86-stable-glibc.tbz2 ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	ghc-package	f8674c44668a01a8b05d66a7c140008b	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	ghc-package	f8674c44668a01a8b05d66a7c140008b	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bd8397ec1b3a9e4a6235e698149c5d96
diff --git a/metadata/md5-cache/dev-lang/ghc-7.6.2 b/metadata/md5-cache/dev-lang/ghc-7.6.2
index f3b203f843b2..85770bc41ccc 100644
--- a/metadata/md5-cache/dev-lang/ghc-7.6.2
+++ b/metadata/md5-cache/dev-lang/ghc-7.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup unpack
-DEPEND=!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 virtual/libffi !<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 ) ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.15 ) ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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 virtual/libffi !<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 ) ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.15 ) ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=5
 HOMEPAGE=http://www.haskell.org/ghc/
@@ -11,5 +11,5 @@ RDEPEND=!kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/b
 REQUIRED_USE=ia64? ( !gmp )
 SLOT=0/7.6.2
 SRC_URI=!binary? ( http://www.haskell.org/ghc/dist/7.6.2/ghc-7.6.2-src.tar.bz2 ) !ghcbootstrap? ( amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-7.6.2-amd64.tbz2 ) ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-7.6.2-ia64.tbz2 ) x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-7.6.2-x86.tbz2 ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	ghc-package	f8674c44668a01a8b05d66a7c140008b	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	ghc-package	f8674c44668a01a8b05d66a7c140008b	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6365b750b50cfb620ff8ef6f08b716d9
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-3.4.6 b/metadata/md5-cache/dev-lang/gnat-gcc-3.4.6
index 0f5abe86ea76..d873bdc925b9 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-3.4.6
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-3.4.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=GNAT Ada Compiler - gcc version
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=app-admin/eselect-gnat
 SLOT=3.4
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.4.6/gcc-core-3.4.6.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.4.6/gcc-ada-3.4.6.tar.bz2 ppc? ( http://dev.gentoo.org/~george/src/gnatboot-3.4-ppc.tar.bz2 ) x86? ( http://dev.gentoo.org/~george/src/gnatboot-3.4-i386.tar.bz2 ) amd64? ( http://dev.gentoo.org/~george/src/gnatboot-3.4-amd64-r2.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eeb2c6d21655f7920d5a97153b959136
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.1.2 b/metadata/md5-cache/dev-lang/gnat-gcc-4.1.2
index 7eae7569d297..59848f4cc2d4 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.1.2
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=GNAT Ada Compiler - gcc version
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.1.2/gcc-core-4.1.2.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.1.2/gcc-ada-4.1.2.tar.bz2 ppc? ( mirror://gentoo/gnatboot-4.1-ppc.tar.bz2 ) x86? ( mirror://gentoo/gnatboot-4.1-i386.tar.bz2 ) amd64? ( mirror://gentoo/gnatboot-4.1-amd64.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ab3e832a7916ce58d06d2351ab1801d2
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.2.3 b/metadata/md5-cache/dev-lang/gnat-gcc-4.2.3
index f665ad9db12d..5dc02135a3a6 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.2.3
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=GNAT Ada Compiler - gcc version
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=app-admin/eselect-gnat
 SLOT=4.2
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.2.3/gcc-core-4.2.3.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.2.3/gcc-ada-4.2.3.tar.bz2 ppc? ( mirror://gentoo/gnatboot-4.1-ppc.tar.bz2 ) x86? ( mirror://gentoo/gnatboot-4.1-i386.tar.bz2 ) amd64? ( mirror://gentoo/gnatboot-4.1-amd64.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a259448f05c628e3c0dbaff18e98777c
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.3.2 b/metadata/md5-cache/dev-lang/gnat-gcc-4.3.2
index d5adb5e6d9be..21b7391984ae 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.3.2
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=GNAT Ada Compiler - gcc version
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 app-admin/eselect-gnat
 SLOT=4.3
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.2/gcc-core-4.3.2.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.2/gcc-ada-4.3.2.tar.bz2 ppc? ( mirror://gentoo/gnatboot-4.1-ppc.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b461113a7cba5452cd562a0e123c3e83
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.3.3 b/metadata/md5-cache/dev-lang/gnat-gcc-4.3.3
index 30d3bdc2f4ce..152c0ff1d1bb 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.3.3
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=GNAT Ada Compiler - gcc version
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 app-admin/eselect-gnat
 SLOT=4.3
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.3/gcc-core-4.3.3.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.3/gcc-ada-4.3.3.tar.bz2 ppc? ( mirror://gentoo/gnatboot-4.1-ppc.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=feeaad423a65bb02db9e628ad86c56cb
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.3.5 b/metadata/md5-cache/dev-lang/gnat-gcc-4.3.5
index aa3a6dab353e..4ac936ca0011 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.3.5
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=GNAT Ada Compiler - gcc version
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 app-admin/eselect-gnat
 SLOT=4.3
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.5/gcc-core-4.3.5.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.5/gcc-ada-4.3.5.tar.bz2 amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-amd64.tar.bz2 ) sparc? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-sparc.tar.bz2 ) x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-i686.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=76a71d17e6c6151874c70b5e8024fae5
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.3.6 b/metadata/md5-cache/dev-lang/gnat-gcc-4.3.6
index d994fd55d67b..9ae5569b93bd 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.3.6
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.3.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 >=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 >=sys-devel/bison-1.875 >=sys-libs/glibc-2.8 >=sys-devel/binutils-2.15.94 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 >=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 >=sys-devel/bison-1.875 >=sys-libs/glibc-2.8 >=sys-devel/binutils-2.15.94 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=GNAT Ada Compiler - gcc version
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 >=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 app-admin/eselect-gnat
 SLOT=4.3
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.6/gcc-core-4.3.6.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.6/gcc-ada-4.3.6.tar.bz2 amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-i686.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8056623dcf0d15ae01bc0d5e232a5a3b
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.4.3 b/metadata/md5-cache/dev-lang/gnat-gcc-4.4.3
index 1ac2d798a848..ef290442a420 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.4.3
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 >=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 >=sys-devel/bison-1.875 >=sys-libs/glibc-2.8 >=sys-devel/binutils-2.15.94 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 >=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 >=sys-devel/bison-1.875 >=sys-libs/glibc-2.8 >=sys-devel/binutils-2.15.94 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=GNAT Ada Compiler - gcc version
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 >=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 app-admin/eselect-gnat
 SLOT=4.4
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.4.3/gcc-core-4.4.3.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.4.3/gcc-ada-4.4.3.tar.bz2 amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-amd64.tar.bz2 ) sparc? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-sparc.tar.bz2 ) x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-i686.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e4654072e6cd012c2779063e02be289f
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.4.5 b/metadata/md5-cache/dev-lang/gnat-gcc-4.4.5
index d8a976f54af7..cc2289d24545 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.4.5
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.4.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=dev-libs/mpfr-3.0.1 >=dev-libs/gmp-5.0 >=sys-libs/zlib-1.2 >=sys-libs/ncurses-5.7 >=sys-devel/bison-1.875 >=sys-libs/glibc-2.8 >=sys-devel/binutils-2.20 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND=>=dev-libs/mpfr-3.0.1 >=dev-libs/gmp-5.0 >=sys-libs/zlib-1.2 >=sys-libs/ncurses-5.7 >=sys-devel/bison-1.875 >=sys-libs/glibc-2.8 >=sys-devel/binutils-2.20 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=GNAT Ada Compiler - gcc version
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-3.0.1 >=dev-libs/gmp-5.0 >=sys-libs/zlib-1.2 >=sys-libs/ncurses-5.7 app-admin/eselect-gnat
 SLOT=4.4
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.4.5/gcc-core-4.4.5.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.4.5/gcc-ada-4.4.5.tar.bz2 amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-amd64.tar.bz2 ) sparc? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-sparc.tar.bz2 ) x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-i686.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f4be9ae2cb9f084af14c892f57079eb4
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.4.7 b/metadata/md5-cache/dev-lang/gnat-gcc-4.4.7
index 7712cfe54e22..d7039d28a60c 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.4.7
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.4.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=dev-libs/mpfr-3.0.1 >=dev-libs/gmp-5.0 >=sys-libs/zlib-1.2 >=sys-libs/ncurses-5.7 >=sys-devel/bison-1.875 >=sys-libs/glibc-2.8 >=sys-devel/binutils-2.20 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND=>=dev-libs/mpfr-3.0.1 >=dev-libs/gmp-5.0 >=sys-libs/zlib-1.2 >=sys-libs/ncurses-5.7 >=sys-devel/bison-1.875 >=sys-libs/glibc-2.8 >=sys-devel/binutils-2.20 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=GNAT Ada Compiler - gcc version
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-3.0.1 >=dev-libs/gmp-5.0 >=sys-libs/zlib-1.2 >=sys-libs/ncurses-5.7 app-admin/eselect-gnat
 SLOT=4.4
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.4.7/gcc-core-4.4.7.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.4.7/gcc-ada-4.4.7.tar.bz2 amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-amd64.tar.bz2 ) sparc? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-sparc.tar.bz2 ) x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-i686.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0c9b42a27a2908451ef06bad60fa113c
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.5.4 b/metadata/md5-cache/dev-lang/gnat-gcc-4.5.4
index d61b09809561..0bf83abf5f3d 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.5.4
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=dev-libs/mpfr-3.0.1 >=dev-libs/gmp-5.0 >=sys-libs/zlib-1.2 >=sys-libs/ncurses-5.7 >=sys-devel/bison-1.875 >=sys-libs/glibc-2.8 >=sys-devel/binutils-2.20 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND=>=dev-libs/mpfr-3.0.1 >=dev-libs/gmp-5.0 >=sys-libs/zlib-1.2 >=sys-libs/ncurses-5.7 >=sys-devel/bison-1.875 >=sys-libs/glibc-2.8 >=sys-devel/binutils-2.20 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=GNAT Ada Compiler - gcc version
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-3.0.1 >=dev-libs/gmp-5.0 >=sys-libs/zlib-1.2 >=sys-libs/ncurses-5.7 app-admin/eselect-gnat
 SLOT=4.5
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.5.4/gcc-core-4.5.4.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.5.4/gcc-ada-4.5.4.tar.bz2 amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-amd64.tar.bz2 ) sparc? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-sparc.tar.bz2 ) x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-i686.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6094d703b4b52b349508748f0ea8504d
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-3.4.5.2005 b/metadata/md5-cache/dev-lang/gnat-gpl-3.4.5.2005
index 086c17c17832..688626130027 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-3.4.5.2005
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-3.4.5.2005
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=GNAT Ada Compiler - AdaCore GPL version
 HOMEPAGE=https://libre2.adacore.com/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect-gnat
 SLOT=3.4
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.4.5/gcc-core-3.4.5.tar.bz2 http://www.adaic.org/standards/05rm/RM-05-Html.zip mirror://gentoo/gnat-gpl-3.4.5.1-src.tar.bz2 mirror://gentoo/gnat-gpl-gcc-3.4.diff.bz2 x86? ( mirror://gentoo/gnatboot-3.4-i386.tar.bz2 ) amd64? ( mirror://gentoo/gnatboot-3.4-amd64-r2.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=07d2be1f7a611c199a2d10e48661480d
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-3.4.6.2006-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-3.4.6.2006-r1
index 18268de56d99..1a5495ba8242 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-3.4.6.2006-r1
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-3.4.6.2006-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=GNAT Ada Compiler - AdaCore GPL version
 HOMEPAGE=https://libre2.adacore.com/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect-gnat
 SLOT=3.4
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.4.6/gcc-core-3.4.6.tar.bz2 http://www.adaic.org/standards/05rm/RM-05-Html.zip mirror://gentoo/gnat-gpl-3.4.6.1-src.tar.bz2 mirror://gentoo/gnat-gpl-gcc-3.4.6.1.diff.bz2 x86? ( mirror://gentoo/gnatboot-3.4-i386.tar.bz2 ) ppc? ( mirror://gentoo/gnatboot-3.4-ppc.tar.bz2 ) amd64? ( mirror://gentoo/gnatboot-3.4-amd64-r2.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e57bf5568e12cf472f0206ff9055cbda
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2007 b/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2007
index 58595486e9e8..5ed098f6dccd 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2007
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2007
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=GNAT Ada Compiler - AdaCore GPL version
 HOMEPAGE=https://libre.adacore.com/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=http://dev.gentoo.org/~george/src/gcc-branch-4.1.3.tar.bz2 http://www.adaic.org/standards/05rm/RM-05-Html.zip http://dev.gentoo.org/~george/src/gnat-gpl-4.1.3.2007.tar.bz2 x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.1-i386.tar.bz2 ) ppc? ( http://dev.gentoo.org/~george/src/gnatboot-4.1-ppc.tar.bz2 ) amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.1-amd64.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cd2a3e1707c6253d06635defdfaecd81
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008-r2 b/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008-r2
index ad645f31f375..2f439e0c87ed 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008-r2
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
+DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 sys-devel/gnuconfig >=app-admin/eselect-gnat-1.3
 DESCRIPTION=GNAT Ada Compiler - AdaCore GPL version
 HOMEPAGE=https://libre.adacore.com/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=http://dev.gentoo.org/~george/src/gnat-gpl-4.1.3.2008.tar.bz2 http://www.adaic.org/standards/05rm/RM-05-Html.zip x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.1-i386.tar.bz2 ) ppc? ( http://dev.gentoo.org/~george/src/gnatboot-4.1-ppc.tar.bz2 ) amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.1-amd64.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnatbuild	5cceab5306bd58876ddd44ea5e4e5816	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5dedbc5ef3ddfd7c575f35a0699d6058
diff --git a/metadata/md5-cache/dev-lang/helium-1.6 b/metadata/md5-cache/dev-lang/helium-1.6
index 2cb641af4fb9..ab5eb99d6b14 100644
--- a/metadata/md5-cache/dev-lang/helium-1.6
+++ b/metadata/md5-cache/dev-lang/helium-1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/ghc-6.8 dev-haskell/mtl dev-haskell/parsec readline? ( dev-haskell/readline ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-lang/ghc-6.8 dev-haskell/mtl dev-haskell/parsec readline? ( dev-haskell/readline ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Helium (for learning Haskell)
 HOMEPAGE=http://www.cs.uu.nl/helium
 IUSE=readline
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=http://www.cs.uu.nl/helium/distr/helium-1.6-src.tar.gz mirror://gentoo/helium-1.6-ghc.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3d11d11ab6b5d19c693b589fa5e8704c
diff --git a/metadata/md5-cache/dev-lang/libcilkrts-2856 b/metadata/md5-cache/dev-lang/libcilkrts-2856
index 14e7d66f18a1..1d129497bfea 100644
--- a/metadata/md5-cache/dev-lang/libcilkrts-2856
+++ b/metadata/md5-cache/dev-lang/libcilkrts-2856
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://cilkplus.org/sites/default/files/runtime_source/cilkplus-rtl-002856.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aaeb6b002aeb006b2b898f62488b6ea8
diff --git a/metadata/md5-cache/dev-lang/lua-5.2.0 b/metadata/md5-cache/dev-lang/lua-5.2.0
index c531444ad088..3e64982361e1 100644
--- a/metadata/md5-cache/dev-lang/lua-5.2.0
+++ b/metadata/md5-cache/dev-lang/lua-5.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=readline? ( sys-libs/readline ) sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=readline? ( sys-libs/readline ) sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A powerful light-weight programming language designed for extending applications
 EAPI=4
 HOMEPAGE=http://www.lua.org/
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=http://www.lua.org/ftp/lua-5.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9e881441e642aeceee6df60332e2c8c6
diff --git a/metadata/md5-cache/dev-lang/lua-5.2.0-r1 b/metadata/md5-cache/dev-lang/lua-5.2.0-r1
index 169922f5801b..3df7b6f19700 100644
--- a/metadata/md5-cache/dev-lang/lua-5.2.0-r1
+++ b/metadata/md5-cache/dev-lang/lua-5.2.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=readline? ( sys-libs/readline ) sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=readline? ( sys-libs/readline ) sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A powerful light-weight programming language designed for extending applications
 EAPI=4
 HOMEPAGE=http://www.lua.org/
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=http://www.lua.org/ftp/lua-5.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f18cf6e67a52066a34e1f7c517a0c04a
diff --git a/metadata/md5-cache/dev-lang/lua-5.2.1 b/metadata/md5-cache/dev-lang/lua-5.2.1
index d2620c5b57cd..ada968881f40 100644
--- a/metadata/md5-cache/dev-lang/lua-5.2.1
+++ b/metadata/md5-cache/dev-lang/lua-5.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=readline? ( sys-libs/readline ) sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=readline? ( sys-libs/readline ) sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A powerful light-weight programming language designed for extending applications
 EAPI=4
 HOMEPAGE=http://www.lua.org/
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=http://www.lua.org/ftp/lua-5.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0467cfe49be46d3f8dc5c04a24ce1f24
diff --git a/metadata/md5-cache/dev-lang/maude-2.5.0 b/metadata/md5-cache/dev-lang/maude-2.5.0
index 174217c437bf..68713125558b 100644
--- a/metadata/md5-cache/dev-lang/maude-2.5.0
+++ b/metadata/md5-cache/dev-lang/maude-2.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Maude - A high-level specification language
 EAPI=3
 HOMEPAGE=http://maude.cs.uiuc.edu/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/gmp-4.1.3 dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy
 SLOT=0
 SRC_URI=http://maude.cs.uiuc.edu/download/current/Maude-2.5.tar.gz mirror://gentoo/maude-2.5.0-extras.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d000b77cca2fa27605e92e22a0683480
diff --git a/metadata/md5-cache/dev-lang/maude-2.6 b/metadata/md5-cache/dev-lang/maude-2.6
index cbaf56756a8e..d338ccad01c0 100644
--- a/metadata/md5-cache/dev-lang/maude-2.6
+++ b/metadata/md5-cache/dev-lang/maude-2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Maude - A high-level specification language
 EAPI=4
 HOMEPAGE=http://maude.cs.uiuc.edu/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/gmp-4.1.3 dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy
 SLOT=0
 SRC_URI=http://maude.cs.uiuc.edu/download/current/Maude-2.6.tar.gz http://dev.gentoo.org/~jlec/distfiles/maude-2.6-extras.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bcfea5f3039629e5702ea0f3abd6124f
diff --git a/metadata/md5-cache/dev-lang/mercury-11.01 b/metadata/md5-cache/dev-lang/mercury-11.01
index 5099a98a503c..1d3771245f8a 100644
--- a/metadata/md5-cache/dev-lang/mercury-11.01
+++ b/metadata/md5-cache/dev-lang/mercury-11.01
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=Mercury is a modern general-purpose logic/functional programming language
 EAPI=2
 HOMEPAGE=http://www.cs.mu.oz.au/research/mercury/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!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 )
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bfcc66e7f2265d6880c442eea0c6258c
diff --git a/metadata/md5-cache/dev-lang/mercury-11.07 b/metadata/md5-cache/dev-lang/mercury-11.07
index 65a8d7b078dc..816c785dcdbc 100644
--- a/metadata/md5-cache/dev-lang/mercury-11.07
+++ b/metadata/md5-cache/dev-lang/mercury-11.07
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=Mercury is a modern general-purpose logic/functional programming language
 EAPI=2
 HOMEPAGE=http://www.cs.mu.oz.au/research/mercury/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!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 )
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dd17983c27917ae3410740e6c95a6bf1
diff --git a/metadata/md5-cache/dev-lang/mercury-11.07.1 b/metadata/md5-cache/dev-lang/mercury-11.07.1
index 99c9e332f49e..646697105f44 100644
--- a/metadata/md5-cache/dev-lang/mercury-11.07.1
+++ b/metadata/md5-cache/dev-lang/mercury-11.07.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=Mercury is a modern general-purpose logic/functional programming language
 EAPI=2
 HOMEPAGE=http://www.cs.mu.oz.au/research/mercury/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!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 )
 SLOT=0
 SRC_URI=http://www.mercury.csse.unimelb.edu.au/download/files/mercury-compiler-11.07.1.tar.gz mirror://gentoo/mercury-11.07.1-gentoo-patchset-4.tar.gz test? ( http://www.mercury.csse.unimelb.edu.au/download/files/mercury-tests-11.07.1.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0b803e4c2f2f9f0f9f7cf8513ea7cdd4
diff --git a/metadata/md5-cache/dev-lang/mercury-11.07.2 b/metadata/md5-cache/dev-lang/mercury-11.07.2
index 50300e983cac..0efc8f500b18 100644
--- a/metadata/md5-cache/dev-lang/mercury-11.07.2
+++ b/metadata/md5-cache/dev-lang/mercury-11.07.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=Mercury is a modern general-purpose logic/functional programming language
 EAPI=2
 HOMEPAGE=http://www.mercurylang.org/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!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 )
 SLOT=0
 SRC_URI=http://dl.mercurylang.org/release/mercury-compiler-11.07.2.tar.gz mirror://gentoo/mercury-11.07.2-gentoo-patchset-0.tar.gz test? ( mirror://gentoo/mercury-tests-11.07.2.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0558d705e972e4c9171c9d737c81d18d
diff --git a/metadata/md5-cache/dev-lang/mercury-extras-11.07.2 b/metadata/md5-cache/dev-lang/mercury-extras-11.07.2
index 53a46f0c32cc..3380d7aa1a97 100644
--- a/metadata/md5-cache/dev-lang/mercury-extras-11.07.2
+++ b/metadata/md5-cache/dev-lang/mercury-extras-11.07.2
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=~dev-lang/mercury-11.07.2 cairo? ( >=x11-libs/cairo-1.10.0 ) glut? ( media-libs/freeglut ) odbc? ( dev-db/unixODBC ) iodbc? ( !odbc? ( dev-db/libiodbc ) ) ncurses? ( sys-libs/ncurses ) opengl? ( virtual/opengl ) tcl? ( tk? ( dev-lang/tcl dev-lang/tk x11-libs/libX11 x11-libs/libXmu ) )
 SLOT=0
-SRC_URI=http://dl.mercurylang.org/release/mercury-extras-11.07.2.tar.gz mirror://gentoo/mercury-extras-11.07.2-gentoo-patchset-1.tar.gz
+SRC_URI=http://dl.mercurylang.org/release/mercury-extras-11.07.2.tar.gz mirror://gentoo/mercury-extras-11.07.2-gentoo-patchset-2.tar.gz
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f1007f0e3cb4752062f5af209231e807
+_md5_=95d6d0d96b8305012a88e06f6cd81276
diff --git a/metadata/md5-cache/dev-lang/opendylan-2011.1-r1 b/metadata/md5-cache/dev-lang/opendylan-2011.1-r1
index ba9f105148b4..6981f22f1472 100644
--- a/metadata/md5-cache/dev-lang/opendylan-2011.1-r1
+++ b/metadata/md5-cache/dev-lang/opendylan-2011.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=app-arch/unzip dev-libs/boehm-gc dev-lang/perl dev-perl/XML-Parser || ( =dev-lang/opendylan-bin-2011.1 dev-lang/opendylan ) x86? ( <dev-libs/mps-1.108 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip dev-libs/boehm-gc dev-lang/perl dev-perl/XML-Parser || ( =dev-lang/opendylan-bin-2011.1 dev-lang/opendylan ) x86? ( <dev-libs/mps-1.108 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenDylan language runtime environment
 EAPI=4
 HOMEPAGE=http://opendylan.org
@@ -9,5 +9,5 @@ RDEPEND=app-arch/unzip dev-libs/boehm-gc dev-lang/perl dev-perl/XML-Parser || (
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dylan-lang/opendylan/zipball/v2011.1 -> opendylan-2011.1.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=d6433ee274d94a904dbac3e2598beaa9
diff --git a/metadata/md5-cache/dev-lang/opendylan-2012.1 b/metadata/md5-cache/dev-lang/opendylan-2012.1
index a41d8aa3b1ee..997dde1f20cc 100644
--- a/metadata/md5-cache/dev-lang/opendylan-2012.1
+++ b/metadata/md5-cache/dev-lang/opendylan-2012.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=app-arch/unzip dev-libs/boehm-gc[static-libs] dev-lang/perl dev-perl/XML-Parser || ( dev-lang/opendylan-bin dev-lang/opendylan ) x86? ( <dev-libs/mps-1.108 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip dev-libs/boehm-gc[static-libs] dev-lang/perl dev-perl/XML-Parser || ( dev-lang/opendylan-bin dev-lang/opendylan ) x86? ( <dev-libs/mps-1.108 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenDylan language runtime environment
 EAPI=4
 HOMEPAGE=http://opendylan.org
@@ -9,5 +9,5 @@ RDEPEND=app-arch/unzip dev-libs/boehm-gc[static-libs] dev-lang/perl dev-perl/XML
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~dreeevil/opendylan-2012.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=cfc57ce24c0dda684b5691ce2aa2066e
diff --git a/metadata/md5-cache/dev-lang/opendylan-9999 b/metadata/md5-cache/dev-lang/opendylan-9999
index fb4198369ad7..bf7ecf5f4192 100644
--- a/metadata/md5-cache/dev-lang/opendylan-9999
+++ b/metadata/md5-cache/dev-lang/opendylan-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/boehm-gc[threads] dev-lang/perl dev-perl/XML-Parser || ( dev-lang/opendylan-bin dev-lang/opendylan ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=dev-libs/boehm-gc[threads] dev-lang/perl dev-perl/XML-Parser || ( dev-lang/opendylan-bin dev-lang/opendylan ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=OpenDylan language runtime environment
 EAPI=4
 HOMEPAGE=http://opendylan.org
@@ -7,5 +7,5 @@ LICENSE=Opendylan
 RDEPEND=dev-libs/boehm-gc[threads] dev-lang/perl dev-perl/XML-Parser || ( dev-lang/opendylan-bin dev-lang/opendylan )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=815e1cce5fe63e5e539fb38d546dec84
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.10 b/metadata/md5-cache/dev-lang/orc-0.4.10
index c818dc00f1a2..ee8ceaa613dc 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.10
+++ b/metadata/md5-cache/dev-lang/orc-0.4.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Oil Runtime Compiler, a just-in-time compiler for array operations
 EAPI=3
 HOMEPAGE=http://code.entropywave.com/projects/orc/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solari
 LICENSE=BSD BSD-2
 SLOT=0
 SRC_URI=http://code.entropywave.com/download/orc/orc-0.4.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=21b3d79610730fb1d1aaf5993d267250
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.11 b/metadata/md5-cache/dev-lang/orc-0.4.11
index fb640967ba2a..c8e0cf3a021b 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.11
+++ b/metadata/md5-cache/dev-lang/orc-0.4.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Oil Runtime Compiler, a just-in-time compiler for array operations
 EAPI=3
 HOMEPAGE=http://code.entropywave.com/projects/orc/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-sol
 LICENSE=BSD BSD-2
 SLOT=0
 SRC_URI=http://code.entropywave.com/download/orc/orc-0.4.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=efeaeb205f5477598304d10ab75aee89
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.14 b/metadata/md5-cache/dev-lang/orc-0.4.14
index 3a6ba6d835f0..b76efd7b33fd 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.14
+++ b/metadata/md5-cache/dev-lang/orc-0.4.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Oil Runtime Compiler, a just-in-time compiler for array operations
 EAPI=3
 HOMEPAGE=http://code.entropywave.com/projects/orc/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64
 LICENSE=BSD BSD-2
 SLOT=0
 SRC_URI=http://code.entropywave.com/download/orc/orc-0.4.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5e6bcf054a4a1f5b88c9c50859984f24
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.16 b/metadata/md5-cache/dev-lang/orc-0.4.16
index 385afc8d843a..255e052def00 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.16
+++ b/metadata/md5-cache/dev-lang/orc-0.4.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Oil Runtime Compiler, a just-in-time compiler for array operations
 EAPI=4
 HOMEPAGE=http://code.entropywave.com/projects/orc/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~p
 LICENSE=BSD BSD-2
 SLOT=0
 SRC_URI=http://code.entropywave.com/download/orc/orc-0.4.16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b9bb9710f0d71b9942d85f2820c5c6d5
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.16-r1 b/metadata/md5-cache/dev-lang/orc-0.4.16-r1
index 743973b1aa78..3e836d4bc277 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.16-r1
+++ b/metadata/md5-cache/dev-lang/orc-0.4.16-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Oil Runtime Compiler, a just-in-time compiler for array operations
 EAPI=4
 HOMEPAGE=http://code.entropywave.com/projects/orc/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm hppa x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-m
 LICENSE=BSD BSD-2
 SLOT=0
 SRC_URI=http://code.entropywave.com/download/orc/orc-0.4.16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5a0e48a36c03226d78a83a6dec7cdbe1
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.9 b/metadata/md5-cache/dev-lang/orc-0.4.9
index cedc84a91058..27df6467a12a 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.9
+++ b/metadata/md5-cache/dev-lang/orc-0.4.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Oil Runtime Compiler, a just-in-time compiler for array operations
 EAPI=3
 HOMEPAGE=http://code.entropywave.com/projects/orc/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solari
 LICENSE=BSD BSD-2
 SLOT=0
 SRC_URI=http://code.entropywave.com/download/orc/orc-0.4.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2c020e9e7eb36572f118736f73f0fe8a
diff --git a/metadata/md5-cache/dev-lang/pcc-1.0.0 b/metadata/md5-cache/dev-lang/pcc-1.0.0
index b24d5efb7976..ff179d0d2719 100644
--- a/metadata/md5-cache/dev-lang/pcc-1.0.0
+++ b/metadata/md5-cache/dev-lang/pcc-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-libs/pcc-libs-1.0.0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/pcc-libs-1.0.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=pcc portable c compiler
 EAPI=2
 HOMEPAGE=http://pcc.ludd.ltu.se
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/pcc-libs-1.0.0
 SLOT=0
 SRC_URI=ftp://pcc.ludd.ltu.se/pub/pcc-releases/pcc-1.0.0.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aa4269c6c63dca9ff3f6b0c76e70139d
diff --git a/metadata/md5-cache/dev-lang/pcc-1.0.1_pre20121112 b/metadata/md5-cache/dev-lang/pcc-1.0.1_pre20121112
index 3551f43a9ed1..f3fd7b0648af 100644
--- a/metadata/md5-cache/dev-lang/pcc-1.0.1_pre20121112
+++ b/metadata/md5-cache/dev-lang/pcc-1.0.1_pre20121112
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-libs/pcc-libs-1.0.1_pre20121112 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/pcc-libs-1.0.1_pre20121112 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=pcc portable c compiler
 EAPI=2
 HOMEPAGE=http://pcc.ludd.ltu.se
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/pcc-libs-1.0.1_pre20121112
 SLOT=0
 SRC_URI=ftp://pcc.ludd.ltu.se/pub/pcc/pcc-20121112.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9bb784c6a0516ebef823709c05675c6d
diff --git a/metadata/md5-cache/dev-lang/php-5.3.18 b/metadata/md5-cache/dev-lang/php-5.3.18
index 036e2b1199fe..48f4deb20c68 100644
--- a/metadata/md5-cache/dev-lang/php-5.3.18
+++ b/metadata/md5-cache/dev-lang/php-5.3.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!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 ) sqlite2? ( =dev-db/sqlite-2* ) 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 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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 ) sqlite2? ( =dev-db/sqlite-2* ) 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 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
 EAPI=4
 HOMEPAGE=http://php.net/
@@ -11,5 +11,5 @@ RDEPEND=!dev-lang/php:5 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[un
 REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) kolab? ( imap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.3
 SRC_URI=http://www.php.net/distributions/php-5.3.18.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.3.18-r0.tar.bz2
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=36e25ae2aea0f4042779b9892a20372a
diff --git a/metadata/md5-cache/dev-lang/php-5.3.23 b/metadata/md5-cache/dev-lang/php-5.3.23
index ab19ddd75841..4a5acb5a36e6 100644
--- a/metadata/md5-cache/dev-lang/php-5.3.23
+++ b/metadata/md5-cache/dev-lang/php-5.3.23
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!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 ) 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 ) sqlite2? ( =dev-db/sqlite-2* ) sqlite? ( >=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 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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 ) 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 ) sqlite2? ( =dev-db/sqlite-2* ) sqlite? ( >=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 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
 EAPI=5
 HOMEPAGE=http://php.net/
@@ -11,5 +11,5 @@ RDEPEND=!dev-lang/php:5 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[un
 REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.3
 SRC_URI=http://www.php.net/distributions/php-5.3.23.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.3-r0.tar.bz2
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6ad29daa24b17171be0584fbc9c01507
diff --git a/metadata/md5-cache/dev-lang/php-5.3.24 b/metadata/md5-cache/dev-lang/php-5.3.24
index 0df047ef26ab..3308c091d0df 100644
--- a/metadata/md5-cache/dev-lang/php-5.3.24
+++ b/metadata/md5-cache/dev-lang/php-5.3.24
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=>=app-admin/eselect-php-0.7.0[apache2?,fpm?] >=dev-libs/libpcre-8.32[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:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite2? ( =dev-db/sqlite-2* ) sqlite? ( >=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:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng:0= 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-admin/eselect-php-0.7.0[apache2?,fpm?] >=dev-libs/libpcre-8.32[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:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite2? ( =dev-db/sqlite-2* ) sqlite? ( >=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:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng:0= 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
 EAPI=5
 HOMEPAGE=http://php.net/
@@ -10,5 +10,5 @@ RDEPEND=>=app-admin/eselect-php-0.7.0[apache2?,fpm?] >=dev-libs/libpcre-8.32[uni
 REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.3
 SRC_URI=http://www.php.net/distributions/php-5.3.24.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.3-r0.tar.bz2
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9109098891d90ea462e7fcf8e02e3f17
diff --git a/metadata/md5-cache/dev-lang/php-5.4.13 b/metadata/md5-cache/dev-lang/php-5.4.13
index 6e4dd0221acb..5c1c5ce7b8fb 100644
--- a/metadata/md5-cache/dev-lang/php-5.4.13
+++ b/metadata/md5-cache/dev-lang/php-5.4.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=>=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 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
 EAPI=5
 HOMEPAGE=http://php.net/
@@ -11,5 +11,5 @@ RDEPEND=>=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2?
 REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.4
 SRC_URI=http://www.php.net/distributions/php-5.4.13.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-r2.tar.bz2
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f6ce582f8a345cdb4f1884f03e6d7a51
diff --git a/metadata/md5-cache/dev-lang/php-5.4.14 b/metadata/md5-cache/dev-lang/php-5.4.14
index 127cbeada2e9..96e26b67702a 100644
--- a/metadata/md5-cache/dev-lang/php-5.4.14
+++ b/metadata/md5-cache/dev-lang/php-5.4.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=>=app-admin/eselect-php-0.7.0[apache2?,fpm?] >=dev-libs/libpcre-8.32[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:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng:0= 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-admin/eselect-php-0.7.0[apache2?,fpm?] >=dev-libs/libpcre-8.32[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:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng:0= 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
 EAPI=5
 HOMEPAGE=http://php.net/
@@ -10,5 +10,5 @@ RDEPEND=>=app-admin/eselect-php-0.7.0[apache2?,fpm?] >=dev-libs/libpcre-8.32[uni
 REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.4
 SRC_URI=http://www.php.net/distributions/php-5.4.14.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-r2.tar.bz2
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4d6b2f9ca1f6dc21f42f78ce72cf0b46
diff --git a/metadata/md5-cache/dev-lang/php-5.4.8 b/metadata/md5-cache/dev-lang/php-5.4.8
index 5194abbf6eb4..cb2e51203035 100644
--- a/metadata/md5-cache/dev-lang/php-5.4.8
+++ b/metadata/md5-cache/dev-lang/php-5.4.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
 EAPI=4
 HOMEPAGE=http://php.net/
@@ -11,5 +11,5 @@ RDEPEND=>=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2?
 REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) kolab? ( imap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.4
 SRC_URI=http://www.php.net/distributions/php-5.4.8.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-2.tar.bz2
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c4062be28c8a5c5035a6822f0044b7ba
diff --git a/metadata/md5-cache/dev-lang/php-5.5.0_beta3 b/metadata/md5-cache/dev-lang/php-5.5.0_beta3
index 5be9be5b18c3..dc3bf142c2a1 100644
--- a/metadata/md5-cache/dev-lang/php-5.5.0_beta3
+++ b/metadata/md5-cache/dev-lang/php-5.5.0_beta3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=>=app-admin/eselect-php-0.7.0[apache2?,fpm?] >=dev-libs/libpcre-8.32[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:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng:0= 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-admin/eselect-php-0.7.0[apache2?,fpm?] >=dev-libs/libpcre-8.32[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:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng:0= 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
 EAPI=5
 HOMEPAGE=http://php.net/
@@ -10,5 +10,5 @@ RDEPEND=>=app-admin/eselect-php-0.7.0[apache2?,fpm?] >=dev-libs/libpcre-8.32[uni
 REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.5
 SRC_URI=http://downloads.php.net/dsp/php-5.5.0beta3.tar.bz2
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=544a549d1b30d43908699a98fc78450b
diff --git a/metadata/md5-cache/dev-lang/polyml-5.4.1 b/metadata/md5-cache/dev-lang/polyml-5.4.1
index ff7db6f6243b..b5384d1825d9 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.4.1
+++ b/metadata/md5-cache/dev-lang/polyml-5.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=X? ( x11-libs/motif ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=X? ( x11-libs/motif ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Poly/ML is a full implementation of Standard ML
 EAPI=5
 HOMEPAGE=http://www.polyml.org
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/motif ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )
 SLOT=0/5.4.1
 SRC_URI=mirror://sourceforge/polyml/polyml.5.4.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f2a2294b00b5b94bafd079a19a24446a
diff --git a/metadata/md5-cache/dev-lang/polyml-5.5.0 b/metadata/md5-cache/dev-lang/polyml-5.5.0
index 98bb25245f62..0fbe3234e6f9 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.5.0
+++ b/metadata/md5-cache/dev-lang/polyml-5.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=X? ( x11-libs/motif ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=X? ( x11-libs/motif ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Poly/ML is a full implementation of Standard ML
 EAPI=5
 HOMEPAGE=http://www.polyml.org
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/motif ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
 SLOT=0/5.5.0
 SRC_URI=mirror://sourceforge/polyml/polyml.5.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=52899ec945a0312d8ee7ba51a8848284
diff --git a/metadata/md5-cache/dev-lang/python-2.5.4-r4 b/metadata/md5-cache/dev-lang/python-2.5.4-r4
index 033b14f3675e..5da25a67a1fb 100644
--- a/metadata/md5-cache/dev-lang/python-2.5.4-r4
+++ b/metadata/md5-cache/dev-lang/python-2.5.4-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230
+DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230
 DESCRIPTION=Python is an interpreted, interactive, object-oriented programming language.
 EAPI=1
 HOMEPAGE=http://www.python.org/
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater app-admin/python-updater
 RDEPEND=>=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
 SLOT=2.5
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8eb7c3756c906bc9013f0fc1fb652ea8
diff --git a/metadata/md5-cache/dev-lang/python-2.5.4-r5 b/metadata/md5-cache/dev-lang/python-2.5.4-r5
index 2cf424f5ea31..3b0dacfb9a38 100644
--- a/metadata/md5-cache/dev-lang/python-2.5.4-r5
+++ b/metadata/md5-cache/dev-lang/python-2.5.4-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=1
 HOMEPAGE=http://www.python.org/
@@ -10,5 +10,5 @@ PDEPEND=app-admin/eselect-python app-admin/python-updater
 RDEPEND=>=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 )
 SLOT=2.5
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cf33fbe576e185e359ce902afd19e473
diff --git a/metadata/md5-cache/dev-lang/python-2.6.8 b/metadata/md5-cache/dev-lang/python-2.6.8
index c54cdb7fd440..67fb72991a37 100644
--- a/metadata/md5-cache/dev-lang/python-2.6.8
+++ b/metadata/md5-cache/dev-lang/python-2.6.8
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( 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 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) 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.1 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.6 ) >=app-admin/eselect-python-20091230
 SLOT=2.6
 SRC_URI=http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2 mirror://gentoo/python-gentoo-patches-2.6.8-0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9359176f7c6e004a15357ff2b31f7590
diff --git a/metadata/md5-cache/dev-lang/python-2.6.8-r1 b/metadata/md5-cache/dev-lang/python-2.6.8-r1
index 0498cea86c1c..6c3287f6fb2d 100644
--- a/metadata/md5-cache/dev-lang/python-2.6.8-r1
+++ b/metadata/md5-cache/dev-lang/python-2.6.8-r1
@@ -10,5 +10,5 @@ PDEPEND=app-admin/eselect-python app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( 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 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) 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.1 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.6 )
 SLOT=2.6
 SRC_URI=http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2 mirror://gentoo/python-gentoo-patches-2.6.8-0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=23c1da67ec881fff40321b0c75e4216e
diff --git a/metadata/md5-cache/dev-lang/python-2.7.3-r2 b/metadata/md5-cache/dev-lang/python-2.7.3-r2
index 8db1f8ca057a..2c76c5cbe763 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.3-r2
+++ b/metadata/md5-cache/dev-lang/python-2.7.3-r2
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db: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 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) 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.1 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 ) >=app-admin/eselect-python-20091230
 SLOT=2.7
 SRC_URI=http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tar.bz2 mirror://gentoo/python-gentoo-patches-2.7.3-1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e744921e5c01361e12c8cae24a924176
diff --git a/metadata/md5-cache/dev-lang/python-2.7.3-r3 b/metadata/md5-cache/dev-lang/python-2.7.3-r3
index 4c5aac237dbe..e18b651b1746 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.3-r3
+++ b/metadata/md5-cache/dev-lang/python-2.7.3-r3
@@ -10,5 +10,5 @@ PDEPEND=app-admin/eselect-python app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db: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 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) 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.1 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
 SLOT=2.7
 SRC_URI=http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tar.bz2 mirror://gentoo/python-gentoo-patches-2.7.3-1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=152e0dfb6299ab8312005376a5ced566
diff --git a/metadata/md5-cache/dev-lang/python-2.7.4 b/metadata/md5-cache/dev-lang/python-2.7.4
index 59d8f73aa8e0..de9904b1f6f9 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.4
+++ b/metadata/md5-cache/dev-lang/python-2.7.4
@@ -10,5 +10,5 @@ PDEPEND=app-admin/eselect-python app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:5.3= sys-libs/db:5.2= sys-libs/db:5.1= sys-libs/db:5.0= sys-libs/db: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= ) ) gdbm? ( sys-libs/gdbm[berkdb] ) 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.1 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
 SLOT=2.7
 SRC_URI=http://www.python.org/ftp/python/2.7.4/Python-2.7.4.tar.xz mirror://bitbucket/gentoo/cpython/downloads/python-gentoo-patches-2.7.4-0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=404d1185a6260908749b9dfabb23a8f6
diff --git a/metadata/md5-cache/dev-lang/python-3.1.5 b/metadata/md5-cache/dev-lang/python-3.1.5
index 794de60cffa7..c44fad450d76 100644
--- a/metadata/md5-cache/dev-lang/python-3.1.5
+++ b/metadata/md5-cache/dev-lang/python-3.1.5
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) 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.1 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.1 ) >=app-admin/eselect-python-20091230
 SLOT=3.1
 SRC_URI=http://www.python.org/ftp/python/3.1.5/Python-3.1.5.tar.xz mirror://gentoo/python-gentoo-patches-3.1.5-0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=33fe30183adad3b4adaa72d6d9cd264f
diff --git a/metadata/md5-cache/dev-lang/python-3.1.5-r1 b/metadata/md5-cache/dev-lang/python-3.1.5-r1
index c830f591e0a3..ded89a7a6f17 100644
--- a/metadata/md5-cache/dev-lang/python-3.1.5-r1
+++ b/metadata/md5-cache/dev-lang/python-3.1.5-r1
@@ -10,5 +10,5 @@ PDEPEND=app-admin/eselect-python app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) 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.1 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.1 )
 SLOT=3.1
 SRC_URI=http://www.python.org/ftp/python/3.1.5/Python-3.1.5.tar.xz mirror://gentoo/python-gentoo-patches-3.1.5-0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1c7cef85a626d005febed264eb3b5f6c
diff --git a/metadata/md5-cache/dev-lang/python-3.2.3 b/metadata/md5-cache/dev-lang/python-3.2.3
index dd3664a00f90..2902c9566bfa 100644
--- a/metadata/md5-cache/dev-lang/python-3.2.3
+++ b/metadata/md5-cache/dev-lang/python-3.2.3
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) 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.1 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.2 ) >=app-admin/eselect-python-20091230
 SLOT=3.2
 SRC_URI=http://www.python.org/ftp/python/3.2.3/Python-3.2.3.tar.xz mirror://gentoo/python-gentoo-patches-3.2.3-0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fbf2b86a462de6d5be1aa6b95f52b142
diff --git a/metadata/md5-cache/dev-lang/python-3.2.3-r1 b/metadata/md5-cache/dev-lang/python-3.2.3-r1
index 5393d629ba25..90507efcf2ee 100644
--- a/metadata/md5-cache/dev-lang/python-3.2.3-r1
+++ b/metadata/md5-cache/dev-lang/python-3.2.3-r1
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) 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.1 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.2 ) >=app-admin/eselect-python-20091230
 SLOT=3.2
 SRC_URI=http://www.python.org/ftp/python/3.2.3/Python-3.2.3.tar.xz mirror://gentoo/python-gentoo-patches-3.2.3-0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e5171f6028b3eeb61520800c5c84bed9
diff --git a/metadata/md5-cache/dev-lang/python-3.2.3-r2 b/metadata/md5-cache/dev-lang/python-3.2.3-r2
index d7e2b3828ff8..aaac8f7edb09 100644
--- a/metadata/md5-cache/dev-lang/python-3.2.3-r2
+++ b/metadata/md5-cache/dev-lang/python-3.2.3-r2
@@ -10,5 +10,5 @@ PDEPEND=app-admin/eselect-python app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) 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.1 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.2 )
 SLOT=3.2
 SRC_URI=http://www.python.org/ftp/python/3.2.3/Python-3.2.3.tar.xz mirror://gentoo/python-gentoo-patches-3.2.3-0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ca9d7b64b6ef666ac19d2dc002456787
diff --git a/metadata/md5-cache/dev-lang/python-3.3.0 b/metadata/md5-cache/dev-lang/python-3.3.0
index ec9b3aeb543c..4955ee487b9a 100644
--- a/metadata/md5-cache/dev-lang/python-3.3.0
+++ b/metadata/md5-cache/dev-lang/python-3.3.0
@@ -9,5 +9,5 @@ PDEPEND=app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) 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.1 ) ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.3 ) >=app-admin/eselect-python-20091230
 SLOT=3.3
 SRC_URI=http://www.python.org/ftp/python/3.3.0/Python-3.3.0.tar.xz mirror://gentoo/python-gentoo-patches-3.3.0-1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1ac262a753ed8883563f9784e8cc9ae3
diff --git a/metadata/md5-cache/dev-lang/python-3.3.0-r1 b/metadata/md5-cache/dev-lang/python-3.3.0-r1
index afd1bcbc3f2d..3ad9c3d1c9cc 100644
--- a/metadata/md5-cache/dev-lang/python-3.3.0-r1
+++ b/metadata/md5-cache/dev-lang/python-3.3.0-r1
@@ -9,5 +9,5 @@ PDEPEND=app-admin/eselect-python app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) 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.1 ) ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.3 )
 SLOT=3.3
 SRC_URI=http://www.python.org/ftp/python/3.3.0/Python-3.3.0.tar.xz mirror://gentoo/python-gentoo-patches-3.3.0-1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ea8f64dd5f334f3a9e7d50a59a7b6dee
diff --git a/metadata/md5-cache/dev-lang/regina-rexx-3.3 b/metadata/md5-cache/dev-lang/regina-rexx-3.3
index bb6bbb2427d5..7af7aa296ccf 100644
--- a/metadata/md5-cache/dev-lang/regina-rexx-3.3
+++ b/metadata/md5-cache/dev-lang/regina-rexx-3.3
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Portable Rexx interpreter
 HOMEPAGE=http://regina-rexx.sourceforge.net
 KEYWORDS=~amd64 ppc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/regina-rexx/Regina-REXX-3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=05131a99987c1633dd69b84fa19038a8
diff --git a/metadata/md5-cache/dev-lang/regina-rexx-3.6-r2 b/metadata/md5-cache/dev-lang/regina-rexx-3.6-r2
index 6c0b2b8f2863..d2d427d9d383 100644
--- a/metadata/md5-cache/dev-lang/regina-rexx-3.6-r2
+++ b/metadata/md5-cache/dev-lang/regina-rexx-3.6-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Portable Rexx interpreter
 EAPI=4
 HOMEPAGE=http://regina-rexx.sourceforge.net
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ppc x86
 LICENSE=LGPL-2.1 MPL-1.0
 SLOT=0
 SRC_URI=mirror://sourceforge/regina-rexx/Regina-REXX-3.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a88eeb7a8e6bbd5ee3bd586a5c7671e9
diff --git a/metadata/md5-cache/dev-lang/ruby-1.8.7_p370 b/metadata/md5-cache/dev-lang/ruby-1.8.7_p370
index 80979c50502b..70ed2b487a6e 100644
--- a/metadata/md5-cache/dev-lang/ruby-1.8.7_p370
+++ b/metadata/md5-cache/dev-lang/ruby-1.8.7_p370
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An object-oriented scripting language
 EAPI=2
 HOMEPAGE=http://www.ruby-lang.org/
@@ -10,5 +10,5 @@ PDEPEND=xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=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
 SLOT=1.8
 SRC_URI=mirror://ruby/1.8/ruby-1.8.7-p370.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.8.7_p370.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3116a3583753737bc12ac54b3c604848
diff --git a/metadata/md5-cache/dev-lang/ruby-1.8.7_p371 b/metadata/md5-cache/dev-lang/ruby-1.8.7_p371
index c192b1bc9a3d..66f9a866332e 100644
--- a/metadata/md5-cache/dev-lang/ruby-1.8.7_p371
+++ b/metadata/md5-cache/dev-lang/ruby-1.8.7_p371
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An object-oriented scripting language
 EAPI=2
 HOMEPAGE=http://www.ruby-lang.org/
@@ -10,5 +10,5 @@ PDEPEND=xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=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
 SLOT=1.8
 SRC_URI=mirror://ruby/1.8/ruby-1.8.7-p371.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.8.7_p371.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d9d0bdbf1c09d522d890e187ce320261
diff --git a/metadata/md5-cache/dev-lang/ruby-1.9.3_p125 b/metadata/md5-cache/dev-lang/ruby-1.9.3_p125
index a57ca3dffb84..cb417912d624 100644
--- a/metadata/md5-cache/dev-lang/ruby-1.9.3_p125
+++ b/metadata/md5-cache/dev-lang/ruby-1.9.3_p125
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An object-oriented scripting language
 EAPI=2
 HOMEPAGE=http://www.ruby-lang.org/
@@ -10,5 +10,5 @@ PDEPEND=rdoc? ( >=dev-ruby/rdoc-3.9.4[ruby_targets_ruby19] ) xemacs? ( app-xemac
 RDEPEND=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
 SLOT=1.9
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=02785fae2db77b33df222f3f5dc0cb0d
diff --git a/metadata/md5-cache/dev-lang/ruby-1.9.3_p194-r1 b/metadata/md5-cache/dev-lang/ruby-1.9.3_p194-r1
index 097101e4b669..08944ae4706c 100644
--- a/metadata/md5-cache/dev-lang/ruby-1.9.3_p194-r1
+++ b/metadata/md5-cache/dev-lang/ruby-1.9.3_p194-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An object-oriented scripting language
 EAPI=4
 HOMEPAGE=http://www.ruby-lang.org/
@@ -10,5 +10,5 @@ PDEPEND=>=dev-ruby/rubygems-1.8.10-r1[ruby_targets_ruby19] rdoc? ( >=dev-ruby/rd
 RDEPEND=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
 SLOT=1.9
 SRC_URI=mirror://ruby/1.9/ruby-1.9.3-p194.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.9.3_p194-r1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d2cf77648a2c1a91439b5ddb785f78e4
diff --git a/metadata/md5-cache/dev-lang/ruby-1.9.3_p286 b/metadata/md5-cache/dev-lang/ruby-1.9.3_p286
index 6fe5c66525f1..5228b2eec58c 100644
--- a/metadata/md5-cache/dev-lang/ruby-1.9.3_p286
+++ b/metadata/md5-cache/dev-lang/ruby-1.9.3_p286
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An object-oriented scripting language
 EAPI=4
 HOMEPAGE=http://www.ruby-lang.org/
@@ -10,5 +10,5 @@ PDEPEND=>=dev-ruby/rubygems-1.8.10-r1[ruby_targets_ruby19] rdoc? ( >=dev-ruby/rd
 RDEPEND=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
 SLOT=1.9
 SRC_URI=mirror://ruby/1.9/ruby-1.9.3-p286.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.9.3_p286.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6d32055ce48a642caed5a45cce5f36a4
diff --git a/metadata/md5-cache/dev-lang/ruby-1.9.3_p385 b/metadata/md5-cache/dev-lang/ruby-1.9.3_p385
index 8ed605df5e0a..5ab4f04ce367 100644
--- a/metadata/md5-cache/dev-lang/ruby-1.9.3_p385
+++ b/metadata/md5-cache/dev-lang/ruby-1.9.3_p385
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An object-oriented scripting language
 EAPI=4
 HOMEPAGE=http://www.ruby-lang.org/
@@ -10,5 +10,5 @@ PDEPEND=>=dev-ruby/rubygems-1.8.10-r1[ruby_targets_ruby19] rdoc? ( >=dev-ruby/rd
 RDEPEND=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
 SLOT=1.9
 SRC_URI=mirror://ruby/1.9/ruby-1.9.3-p385.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.9.3_p385.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d0f770427c25d47c85fc0299223c2ea3
diff --git a/metadata/md5-cache/dev-lang/ruby-1.9.3_p392 b/metadata/md5-cache/dev-lang/ruby-1.9.3_p392
index fdfc110b0798..02c632f261ef 100644
--- a/metadata/md5-cache/dev-lang/ruby-1.9.3_p392
+++ b/metadata/md5-cache/dev-lang/ruby-1.9.3_p392
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An object-oriented scripting language
 EAPI=4
 HOMEPAGE=http://www.ruby-lang.org/
@@ -10,5 +10,5 @@ PDEPEND=>=dev-ruby/rubygems-1.8.10-r1[ruby_targets_ruby19] rdoc? ( >=dev-ruby/rd
 RDEPEND=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
 SLOT=1.9
 SRC_URI=mirror://ruby/1.9/ruby-1.9.3-p392.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.9.3_p392-r0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cf1db5f25313ed453bcc071301d5a0ae
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r1 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r1
index a40aa4186674..e14ec3ae793a 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r1
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/nspr-4.7.0 app-arch/zip =dev-lang/python-2*[threads] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=>=dev-libs/nspr-4.7.0 app-arch/zip =dev-lang/python-2*[threads] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Stand-alone JavaScript C library
 EAPI=3
 HOMEPAGE=http://www.mozilla.org/js/spidermonkey/
@@ -9,5 +9,5 @@ LICENSE=NPL-1.1
 RDEPEND=>=dev-libs/nspr-4.7.0
 SLOT=0
 SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=54904f9ca99e8aab5ecd14fd5c77c18a
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r2 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r2
index f96de98e639a..2d1ac661072f 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r2
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/nspr-4.7.0 app-arch/zip =dev-lang/python-2*[threads] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=>=dev-libs/nspr-4.7.0 app-arch/zip =dev-lang/python-2*[threads] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Stand-alone JavaScript C library
 EAPI=5
 HOMEPAGE=http://www.mozilla.org/js/spidermonkey/
@@ -9,5 +9,5 @@ LICENSE=NPL-1.1
 RDEPEND=>=dev-libs/nspr-4.7.0
 SLOT=0/mozjs185
 SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b30ac02b4c7b27caebe27fa5af149813
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r3 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r3
index 0f6c3db73306..8a5c53cb592d 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r3
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/nspr-4.7.0 app-arch/zip =dev-lang/python-2*[threads] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=>=dev-libs/nspr-4.7.0 app-arch/zip =dev-lang/python-2*[threads] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Stand-alone JavaScript C library
 EAPI=5
 HOMEPAGE=http://www.mozilla.org/js/spidermonkey/
@@ -9,5 +9,5 @@ LICENSE=NPL-1.1
 RDEPEND=>=dev-libs/nspr-4.7.0
 SLOT=0/mozjs185
 SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=387f14153cbd6c4e48d271693e5bb7cd
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r4 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r4
index eb349e9ea0f9..68b3dc1e4746 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r4
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/nspr-4.7.0 app-arch/zip =dev-lang/python-2*[threads] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=>=dev-libs/nspr-4.7.0 app-arch/zip =dev-lang/python-2*[threads] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Stand-alone JavaScript C library
 EAPI=5
 HOMEPAGE=http://www.mozilla.org/js/spidermonkey/
@@ -9,5 +9,5 @@ LICENSE=NPL-1.1
 RDEPEND=>=dev-libs/nspr-4.7.0
 SLOT=0/mozjs185
 SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=78a5ead8a6e622500fb8898163e8c6b9
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.7 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.7
index 78687e718190..1be032a89112 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.7
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/nspr-4.7.0 virtual/libffi app-arch/zip =dev-lang/python-2*[threads] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=>=dev-libs/nspr-4.7.0 virtual/libffi app-arch/zip =dev-lang/python-2*[threads] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Stand-alone JavaScript C library
 EAPI=3
 HOMEPAGE=http://www.mozilla.org/js/spidermonkey/
@@ -9,5 +9,5 @@ LICENSE=NPL-1.1
 RDEPEND=>=dev-libs/nspr-4.7.0 virtual/libffi
 SLOT=0
 SRC_URI=http://people.mozilla.com/~dmandelin/js187-1.0.0.tar.gz http://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-1.8.7-patches-0.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b599dbf62396e8b159ee4a0b178eb8ce
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.7-r2 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.7-r2
index 86b635e49036..43ef398cdfdc 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.7-r2
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.7-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/nspr-4.7.0 virtual/libffi app-arch/zip =dev-lang/python-2*[threads] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=>=dev-libs/nspr-4.7.0 virtual/libffi app-arch/zip =dev-lang/python-2*[threads] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Stand-alone JavaScript C library
 EAPI=5
 HOMEPAGE=http://www.mozilla.org/js/spidermonkey/
@@ -9,5 +9,5 @@ LICENSE=NPL-1.1
 RDEPEND=>=dev-libs/nspr-4.7.0 virtual/libffi
 SLOT=0/mozjs187
 SRC_URI=http://people.mozilla.com/~dmandelin/js187-1.0.0.tar.gz http://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-1.8.7-patches-0.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=af21a401f7e061f49f18f55b5d68b78d
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.7-r3 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.7-r3
index 3e12ec1fedcf..7bbe1ef93ddf 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.7-r3
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.7-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/nspr-4.7.0 virtual/libffi app-arch/zip =dev-lang/python-2*[threads] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=>=dev-libs/nspr-4.7.0 virtual/libffi app-arch/zip =dev-lang/python-2*[threads] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Stand-alone JavaScript C library
 EAPI=5
 HOMEPAGE=http://www.mozilla.org/js/spidermonkey/
@@ -9,5 +9,5 @@ LICENSE=NPL-1.1
 RDEPEND=>=dev-libs/nspr-4.7.0 virtual/libffi
 SLOT=0/mozjs187
 SRC_URI=http://people.mozilla.com/~dmandelin/js187-1.0.0.tar.gz http://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-1.8.7-patches-0.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dda8b33f56a58c627addc263636b5d71
diff --git a/metadata/md5-cache/dev-lang/squirrel-2.2.4-r1 b/metadata/md5-cache/dev-lang/squirrel-2.2.4-r1
index abd458eac9f3..50a1f601f1f2 100644
--- a/metadata/md5-cache/dev-lang/squirrel-2.2.4-r1
+++ b/metadata/md5-cache/dev-lang/squirrel-2.2.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A interpreted language mainly used for games
 EAPI=3
 HOMEPAGE=http://squirrel-lang.org/
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=!app-text/ispell
 SLOT=0
 SRC_URI=mirror://sourceforge/squirrel/squirrel2/squirrel_2.2.4_stable/squirrel_2.2.4_stable.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a04ac8ef38b3b3ed2d875e4c596d9aac
diff --git a/metadata/md5-cache/dev-lang/squirrel-2.2.4-r2 b/metadata/md5-cache/dev-lang/squirrel-2.2.4-r2
index 4688df85d430..eed2cebca539 100644
--- a/metadata/md5-cache/dev-lang/squirrel-2.2.4-r2
+++ b/metadata/md5-cache/dev-lang/squirrel-2.2.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A interpreted language mainly used for games
 EAPI=3
 HOMEPAGE=http://squirrel-lang.org/
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=!app-text/ispell
 SLOT=0
 SRC_URI=mirror://sourceforge/squirrel/squirrel2/squirrel_2.2.4_stable/squirrel_2.2.4_stable.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0a58abf04fb13ed1aef687ae17bc9d5c
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.10-r1 b/metadata/md5-cache/dev-lang/tcl-8.5.10-r1
index 47b4b6bbc4ac..b7296396dcac 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.5.10-r1
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.10-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tool Command Language
 EAPI=4
 HOMEPAGE=http://www.tcl.tk/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc
 LICENSE=tcltk
 SLOT=0
 SRC_URI=mirror://sourceforge/tcl/tcl8.5.10-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4108d61cbd95f0432e7810f4c008f72f
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.13-r1 b/metadata/md5-cache/dev-lang/tcl-8.5.13-r1
index 2a9c1e54101f..512b97edea95 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.5.13-r1
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.13-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tool Command Language
 EAPI=4
 HOMEPAGE=http://www.tcl.tk/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd6
 LICENSE=tcltk
 SLOT=0
 SRC_URI=mirror://sourceforge/tcl/tcl8.5.13-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6b875ea0671f91a44634e5dbfdebe49f
diff --git a/metadata/md5-cache/dev-lang/tcl-8.6.0-r1 b/metadata/md5-cache/dev-lang/tcl-8.6.0-r1
index fd0b3a5b37ae..ca30ac54db2d 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.6.0-r1
+++ b/metadata/md5-cache/dev-lang/tcl-8.6.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tool Command Language
 EAPI=5
 HOMEPAGE=http://www.tcl.tk/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=tcltk
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tcl-core8.6.0-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=29b5961e3be6576c7897c69ba2713208
diff --git a/metadata/md5-cache/dev-lang/tk-8.5.13-r1 b/metadata/md5-cache/dev-lang/tk-8.5.13-r1
index 40d34e2ec8f1..f2f967224350 100644
--- a/metadata/md5-cache/dev-lang/tk-8.5.13-r1
+++ b/metadata/md5-cache/dev-lang/tk-8.5.13-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=!aqua? ( media-libs/fontconfig x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.13 !aqua? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!aqua? ( media-libs/fontconfig x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.13 !aqua? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Tk Widget Set
 EAPI=4
 HOMEPAGE=http://www.tcl.tk/
@@ -9,5 +9,5 @@ LICENSE=tcltk
 RDEPEND=!aqua? ( media-libs/fontconfig x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.13
 SLOT=0
 SRC_URI=mirror://sourceforge/tcl/tk8.5.13-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=2e9af3cecbaf18d1bc58e0e030f9bfda
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.0 b/metadata/md5-cache/dev-lang/tk-8.6.0
index 03a1d3bbfe00..0fae7ac7c71b 100644
--- a/metadata/md5-cache/dev-lang/tk-8.6.0
+++ b/metadata/md5-cache/dev-lang/tk-8.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=!aqua? ( media-libs/fontconfig x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.6.0 !aqua? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!aqua? ( media-libs/fontconfig x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.6.0 !aqua? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Tk Widget Set
 EAPI=5
 HOMEPAGE=http://www.tcl.tk/
@@ -10,5 +10,5 @@ RDEPEND=!aqua? ( media-libs/fontconfig x11-libs/libX11 x11-libs/libXt truetype?
 RESTRICT=test
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tk8.6.0-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=41b87ae15da406224307b0de791becb4
diff --git a/metadata/md5-cache/dev-lang/v8-3.18.1 b/metadata/md5-cache/dev-lang/v8-3.18.1
new file mode 100644
index 000000000000..9277631ec541
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/v8-3.18.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst setup test
+DEPEND=|| ( dev-lang/python:2.7 dev-lang/python:2.6 ) readline? ( sys-libs/readline:0 ) >=sys-apps/sed-4
+DESCRIPTION=Google's open source JavaScript engine
+EAPI=5
+HOMEPAGE=http://code.google.com/p/v8
+IUSE=neon readline
+KEYWORDS=~amd64 ~arm ~x86 ~x86-fbsd ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=readline? ( sys-libs/readline:0 )
+SLOT=0/3.18.1
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/v8-3.18.1.tar.bz2
+_eclasses_=chromium	10deb47dfb7657ba0fc7814da0bad35e	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=708ce1d95320ac2716514c475ee792dc
diff --git a/metadata/md5-cache/dev-lang/v8-9999 b/metadata/md5-cache/dev-lang/v8-9999
index 35476dcf1a77..69bfa0673279 100644
--- a/metadata/md5-cache/dev-lang/v8-9999
+++ b/metadata/md5-cache/dev-lang/v8-9999
@@ -8,4 +8,4 @@ LICENSE=BSD
 RDEPEND=readline? ( sys-libs/readline:0 )
 SLOT=0
 _eclasses_=chromium	10deb47dfb7657ba0fc7814da0bad35e	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=8f4dd8bd63d212b554cb8119fd51e8f8
+_md5_=461eb32cfaf3f4682652c01e5fbf59fe
diff --git a/metadata/md5-cache/dev-lang/vala-0.14.2-r2 b/metadata/md5-cache/dev-lang/vala-0.14.2-r2
index 1c32c4d6f2c5..24ee626eeec7 100644
--- a/metadata/md5-cache/dev-lang/vala-0.14.2-r2
+++ b/metadata/md5-cache/dev-lang/vala-0.14.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.16:2 >=dev-libs/vala-common-0.14.2 !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.16:2 >=dev-libs/vala-common-0.14.2 !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Vala - Compiler for the GObject type system
 EAPI=4
 HOMEPAGE=http://live.gnome.org/Vala
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.16:2 >=dev-libs/vala-common-0.14.2
 SLOT=0.14
 SRC_URI=mirror://gnome/sources/vala/0.14/vala-0.14.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b3ec091737993d12a9c13cfd81334f0b
diff --git a/metadata/md5-cache/dev-lang/vala-0.20.0 b/metadata/md5-cache/dev-lang/vala-0.20.0
deleted file mode 100644
index f1144f16e3ae..000000000000
--- a/metadata/md5-cache/dev-lang/vala-0.20.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.18:2 >=dev-libs/vala-common-0.20.0 !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 ) app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=Vala - Compiler for the GObject type system
-EAPI=5
-HOMEPAGE=http://live.gnome.org/Vala
-IUSE=test +vapigen
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.18:2 >=dev-libs/vala-common-0.20.0
-SLOT=0.20
-SRC_URI=mirror://gnome/sources/vala/0.20/vala-0.20.0.tar.xz
-_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ce147c6a0fe45e3ff1edf11e0c393e57
diff --git a/metadata/md5-cache/dev-lang/xsb-3.3.5 b/metadata/md5-cache/dev-lang/xsb-3.3.5
index 2c107ede3c16..2cd162822865 100644
--- a/metadata/md5-cache/dev-lang/xsb-3.3.5
+++ b/metadata/md5-cache/dev-lang/xsb-3.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=XSB is a logic programming and deductive database system
 EAPI=2
 HOMEPAGE=http://xsb.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://xsb.sourceforge.net/downloads/XSB335.tar.gz mirror://gentoo/xsb-3.3.5-gentoo-patchset-0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8f4623c7d952637eea4edca107a06e09
diff --git a/metadata/md5-cache/dev-lang/xsb-3.3.6 b/metadata/md5-cache/dev-lang/xsb-3.3.6
index 18bc46869ea8..c54df845d83e 100644
--- a/metadata/md5-cache/dev-lang/xsb-3.3.6
+++ b/metadata/md5-cache/dev-lang/xsb-3.3.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=XSB is a logic programming and deductive database system
 EAPI=2
 HOMEPAGE=http://xsb.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://xsb.sourceforge.net/downloads/XSB336.tar.gz mirror://gentoo/xsb-3.3.6-gentoo-patchset-0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b0e8a08d74ba3a05bbff873da8d976be
diff --git a/metadata/md5-cache/dev-lang/yasm-1.2.0 b/metadata/md5-cache/dev-lang/yasm-1.2.0
index f1fdf1db2c33..4cbedcfaf610 100644
--- a/metadata/md5-cache/dev-lang/yasm-1.2.0
+++ b/metadata/md5-cache/dev-lang/yasm-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare setup
-DEPEND=nls? ( sys-devel/gettext ) python? ( >=dev-python/cython-0.14 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2.7* )
+DEPEND=nls? ( sys-devel/gettext ) python? ( >=dev-python/cython-0.14 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2.7* )
 DESCRIPTION=An assembler for x86 and x86_64 instruction sets
 EAPI=4
 HOMEPAGE=http://yasm.tortall.net/
@@ -9,5 +9,5 @@ LICENSE=BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )
 RDEPEND=nls? ( virtual/libintl ) python? ( =dev-lang/python-2.7* )
 SLOT=0
 SRC_URI=http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=efe57fc32ffff16c3ab5f47da2d426ba
diff --git a/metadata/md5-cache/dev-lang/yasm-1.2.0-r1 b/metadata/md5-cache/dev-lang/yasm-1.2.0-r1
index 778f3baa870d..d80e238d7939 100644
--- a/metadata/md5-cache/dev-lang/yasm-1.2.0-r1
+++ b/metadata/md5-cache/dev-lang/yasm-1.2.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare setup
-DEPEND=nls? ( sys-devel/gettext ) python? ( >=dev-python/cython-0.14 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2.7* )
+DEPEND=nls? ( sys-devel/gettext ) python? ( >=dev-python/cython-0.14 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2.7* )
 DESCRIPTION=An assembler for x86 and x86_64 instruction sets
 EAPI=4
 HOMEPAGE=http://yasm.tortall.net/
@@ -9,5 +9,5 @@ LICENSE=BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )
 RDEPEND=nls? ( virtual/libintl ) python? ( =dev-lang/python-2.7* )
 SLOT=0
 SRC_URI=http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz mirror://gentoo/yasm-1.2.0-x32.patch.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e51d21faa871256999d36d33505c8d2c
diff --git a/metadata/md5-cache/dev-lang/yasm-9999 b/metadata/md5-cache/dev-lang/yasm-9999
index 219b30511a0a..3289b80c76d8 100644
--- a/metadata/md5-cache/dev-lang/yasm-9999
+++ b/metadata/md5-cache/dev-lang/yasm-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare setup unpack
-DEPEND=nls? ( sys-devel/gettext ) python? ( >=dev-python/cython-0.14 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2.7* ) dev-vcs/git
+DEPEND=nls? ( sys-devel/gettext ) python? ( >=dev-python/cython-0.14 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2.7* ) dev-vcs/git
 DESCRIPTION=An assembler for x86 and x86_64 instruction sets
 EAPI=4
 HOMEPAGE=http://yasm.tortall.net/
@@ -7,5 +7,5 @@ IUSE=nls python
 LICENSE=BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )
 RDEPEND=nls? ( virtual/libintl ) python? ( =dev-lang/python-2.7* )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=20c5b0b41824d15daf5dbdc8e941155a
diff --git a/metadata/md5-cache/dev-libs/DirectFB-1.6.3-r1 b/metadata/md5-cache/dev-libs/DirectFB-1.6.3-r1
index 81122aa55c10..285b2f8a0a52 100644
--- a/metadata/md5-cache/dev-libs/DirectFB-1.6.3-r1
+++ b/metadata/md5-cache/dev-libs/DirectFB-1.6.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=gif? ( media-libs/giflib ) imlib2? ( media-libs/imlib2 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper[jpeg] ) mng? ( media-libs/libmng ) opengl? ( media-libs/mesa[gbm,egl,gles2?] x11-libs/libdrm ) png? ( media-libs/libpng:0 ) sdl? ( media-libs/libsdl ) svg? ( x11-libs/libsvg-cairo ) truetype? ( >=media-libs/freetype-2.0.1 ) vdpau? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXext x11-libs/libvdpau ) X? ( x11-libs/libXext x11-libs/libX11 ) zlib? ( sys-libs/zlib ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gif? ( media-libs/giflib ) imlib2? ( media-libs/imlib2 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper[jpeg] ) mng? ( media-libs/libmng ) opengl? ( media-libs/mesa[gbm,egl,gles2?] x11-libs/libdrm ) png? ( media-libs/libpng:0 ) sdl? ( media-libs/libsdl ) svg? ( x11-libs/libsvg-cairo ) truetype? ( >=media-libs/freetype-2.0.1 ) vdpau? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXext x11-libs/libvdpau ) X? ( x11-libs/libXext x11-libs/libX11 ) zlib? ( sys-libs/zlib ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Thin library on top of the Linux framebuffer devices
 EAPI=5
 HOMEPAGE=http://www.directfb.org/
@@ -10,5 +10,5 @@ RDEPEND=gif? ( media-libs/giflib ) imlib2? ( media-libs/imlib2 ) jpeg? ( virtual
 REQUIRED_USE=gles2? ( opengl )
 SLOT=0
 SRC_URI=http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-1.6.3.tar.gz http://directfb.org/downloads/Old/DirectFB-1.6.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2be36e90852b192f03858eec02f17b8a
diff --git a/metadata/md5-cache/dev-libs/OpenSRF-1.0.7 b/metadata/md5-cache/dev-libs/OpenSRF-1.0.7
index 44430394de19..f6cf448edb84 100644
--- a/metadata/md5-cache/dev-libs/OpenSRF-1.0.7
+++ b/metadata/md5-cache/dev-libs/OpenSRF-1.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 DESCRIPTION=Framework for the high-level development of the Evergreen ILS software
 EAPI=2
 HOMEPAGE=http://open-ils.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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]
 SLOT=0
 SRC_URI=http://open-ils.org/downloads/OpenSRF-1.0.7.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=edfce136dfa951a24c0da5a85ff68a77
diff --git a/metadata/md5-cache/dev-libs/OpenSRF-1.2.0 b/metadata/md5-cache/dev-libs/OpenSRF-1.2.0
index 809b7115428d..02f0defc44e7 100644
--- a/metadata/md5-cache/dev-libs/OpenSRF-1.2.0
+++ b/metadata/md5-cache/dev-libs/OpenSRF-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 DESCRIPTION=Framework for the high-level development of the Evergreen ILS software
 EAPI=5
 HOMEPAGE=http://open-ils.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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]
 SLOT=0
 SRC_URI=http://open-ils.org/downloads/OpenSRF-1.2.0.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=550e0218364115bc3eb153db8a2de8c9
diff --git a/metadata/md5-cache/dev-libs/OpenSRF-2.1.1 b/metadata/md5-cache/dev-libs/OpenSRF-2.1.1
index b4146043bf29..f5ee886a67b6 100644
--- a/metadata/md5-cache/dev-libs/OpenSRF-2.1.1
+++ b/metadata/md5-cache/dev-libs/OpenSRF-2.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 DESCRIPTION=Framework for the high-level development of the Evergreen ILS software
 EAPI=5
 HOMEPAGE=http://open-ils.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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]
 SLOT=0
 SRC_URI=http://open-ils.org/downloads/opensrf-2.1.1.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9668c880d64c0d0750b2842bd76e8fce
diff --git a/metadata/md5-cache/dev-libs/antlr-c-3.3_pre20110403 b/metadata/md5-cache/dev-libs/antlr-c-3.3_pre20110403
index 541c9f97ba80..48f4b9c80049 100644
--- a/metadata/md5-cache/dev-libs/antlr-c-3.3_pre20110403
+++ b/metadata/md5-cache/dev-libs/antlr-c-3.3_pre20110403
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The ANTLR3 C Runtime
 EAPI=4
 HOMEPAGE=http://fisheye2.atlassian.com/browse/antlr/runtime/C/dist/
@@ -8,5 +8,5 @@ KEYWORDS=~x86 ~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.antlr.org/download/C/libantlr3c-3.3-SNAPSHOT.tar.gz -> libantlr3c-3.3_pre20110403.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1e89a42f25044e6b15e0ab8102593710
diff --git a/metadata/md5-cache/dev-libs/antlr-c-3.4 b/metadata/md5-cache/dev-libs/antlr-c-3.4
index f9536a7d3c9e..be0754bdbf5a 100644
--- a/metadata/md5-cache/dev-libs/antlr-c-3.4
+++ b/metadata/md5-cache/dev-libs/antlr-c-3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The ANTLR3 C Runtime
 EAPI=5
 HOMEPAGE=https://github.com/antlr/antlr3/tree/master/runtime/C
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/antlr/antlr3/archive/antlr-3.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=49169fd7c363c34bc3264a193eb95092
diff --git a/metadata/md5-cache/dev-libs/antlr-c-3.5 b/metadata/md5-cache/dev-libs/antlr-c-3.5
index c41e258f8232..bb87ec9d9ae1 100644
--- a/metadata/md5-cache/dev-libs/antlr-c-3.5
+++ b/metadata/md5-cache/dev-libs/antlr-c-3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The ANTLR3 C Runtime
 EAPI=5
 HOMEPAGE=https://github.com/antlr/antlr3/tree/master/runtime/C
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/antlr/antlr3/archive/antlr-3.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bdbf26ac91a4522e2212018735a4d4da
diff --git a/metadata/md5-cache/dev-libs/apr-1.4.5 b/metadata/md5-cache/dev-libs/apr-1.4.5
index ad7f65ab593e..fa364ed95e4f 100644
--- a/metadata/md5-cache/dev-libs/apr-1.4.5
+++ b/metadata/md5-cache/dev-libs/apr-1.4.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=uuid? ( !elibc_FreeBSD? ( >=sys-apps/util-linux-2.16 ) ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=uuid? ( !elibc_FreeBSD? ( >=sys-apps/util-linux-2.16 ) ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Apache Portable Runtime Library
 EAPI=4
 HOMEPAGE=http://apr.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=uuid? ( !elibc_FreeBSD? ( >=sys-apps/util-linux-2.16 ) )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/apr/apr-1.4.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=33fc980fbec965e6b9b2ae769443dfe1
diff --git a/metadata/md5-cache/dev-libs/apr-1.4.6 b/metadata/md5-cache/dev-libs/apr-1.4.6
index 7b569ed0a439..270409e661e6 100644
--- a/metadata/md5-cache/dev-libs/apr-1.4.6
+++ b/metadata/md5-cache/dev-libs/apr-1.4.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=uuid? ( !elibc_FreeBSD? ( >=sys-apps/util-linux-2.16 ) ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=uuid? ( !elibc_FreeBSD? ( >=sys-apps/util-linux-2.16 ) ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Apache Portable Runtime Library
 EAPI=4
 HOMEPAGE=http://apr.apache.org/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=uuid? ( !elibc_FreeBSD? ( >=sys-apps/util-linux-2.16 ) )
 SLOT=1
 SRC_URI=mirror://apache/apr/apr-1.4.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dc9e13ac41c18f5a4c43e115c24b8411
diff --git a/metadata/md5-cache/dev-libs/apr-1.4.6-r1 b/metadata/md5-cache/dev-libs/apr-1.4.6-r1
index 22686c38d221..ca0d6896f30b 100644
--- a/metadata/md5-cache/dev-libs/apr-1.4.6-r1
+++ b/metadata/md5-cache/dev-libs/apr-1.4.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=uuid? ( elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=uuid? ( elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Apache Portable Runtime Library
 EAPI=4
 HOMEPAGE=http://apr.apache.org/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=uuid? ( elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) )
 SLOT=1
 SRC_URI=mirror://apache/apr/apr-1.4.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=211421892e1589a8f98dbc8788bd889d
diff --git a/metadata/md5-cache/dev-libs/apr-util-1.3.12 b/metadata/md5-cache/dev-libs/apr-util-1.3.12
index 7c05a1fcea7e..328999ac829c 100644
--- a/metadata/md5-cache/dev-libs/apr-util-1.3.12
+++ b/metadata/md5-cache/dev-libs/apr-util-1.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Apache Portable Runtime Utility Library
 EAPI=4
 HOMEPAGE=http://apr.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat >=dev-libs/apr-1.4.5:1 berkdb? ( >=sys-libs/db-4 ) freetd
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/apr/apr-util-1.3.12.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8ab247b7c851103e8b83fc07ed89cf64
diff --git a/metadata/md5-cache/dev-libs/apr-util-1.4.1 b/metadata/md5-cache/dev-libs/apr-util-1.4.1
index 23e3516515e4..c269ed24261f 100644
--- a/metadata/md5-cache/dev-libs/apr-util-1.4.1
+++ b/metadata/md5-cache/dev-libs/apr-util-1.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Apache Portable Runtime Utility Library
 EAPI=4
 HOMEPAGE=http://apr.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat >=dev-libs/apr-1.4.5:1 berkdb? ( >=sys-libs/db-4 ) freetd
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/apr/apr-util-1.4.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cbbe2aba806e602efeb47b1635a8b648
diff --git a/metadata/md5-cache/dev-libs/apr-util-1.5.1 b/metadata/md5-cache/dev-libs/apr-util-1.5.1
index 19d69cde1974..ec4ccb7c5171 100644
--- a/metadata/md5-cache/dev-libs/apr-util-1.5.1
+++ b/metadata/md5-cache/dev-libs/apr-util-1.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Apache Portable Runtime Utility Library
 EAPI=4
 HOMEPAGE=http://apr.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat >=dev-libs/apr-1.4.5:1 berkdb? ( >=sys-libs/db-4 ) freetd
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/apr/apr-util-1.5.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0afd0584f420e118a30e00a8796c4f02
diff --git a/metadata/md5-cache/dev-libs/beecrypt-4.2.1 b/metadata/md5-cache/dev-libs/beecrypt-4.2.1
index 68d57936f118..249d130b286e 100644
--- a/metadata/md5-cache/dev-libs/beecrypt-4.2.1
+++ b/metadata/md5-cache/dev-libs/beecrypt-4.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!<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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( =dev-lang/python-2* )
+DEPEND=!<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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( =dev-lang/python-2* )
 DESCRIPTION=general-purpose cryptography library
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/beecrypt/
@@ -10,5 +10,5 @@ RDEPEND=!<app-arch/rpm-4.2.1 cxx? ( >=dev-libs/icu-2.8 ) java? ( >=virtual/jre-1
 REQUIRED_USE=cxx? ( threads )
 SLOT=0
 SRC_URI=mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b435641996054497e16b5d6ccee57688
diff --git a/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r1 b/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r1
index c258371c5e7f..1be97aeb17bf 100644
--- a/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r1
+++ b/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!<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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( =dev-lang/python-2* )
+DEPEND=!<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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( =dev-lang/python-2* )
 DESCRIPTION=general-purpose cryptography library
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/beecrypt/
@@ -10,5 +10,5 @@ RDEPEND=!<app-arch/rpm-4.2.1 cxx? ( >=dev-libs/icu-2.8:= ) java? ( >=virtual/jre
 REQUIRED_USE=cxx? ( threads )
 SLOT=0
 SRC_URI=mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ebab171cf4d713484ccb04e2b6144fdc
diff --git a/metadata/md5-cache/dev-libs/bitset-2.8.3 b/metadata/md5-cache/dev-libs/bitset-2.8.3
index 05ab2c8be836..1f7dbe53905d 100644
--- a/metadata/md5-cache/dev-libs/bitset-2.8.3
+++ b/metadata/md5-cache/dev-libs/bitset-2.8.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A compressed bitset with supporting data structures and algorithms
 EAPI=5
 HOMEPAGE=http://github.com/chriso/bitset
@@ -10,5 +10,5 @@ RDEPEND=tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-
 REQUIRED_USE=?? ( jemalloc tcmalloc )
 SLOT=0
 SRC_URI=https://github.com/chriso/bitset/archive/2.8.3.tar.gz -> bitset-2.8.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4c4df1cfb985cc31b99fe65d7e071472
diff --git a/metadata/md5-cache/dev-libs/blitz-0.10 b/metadata/md5-cache/dev-libs/blitz-0.10
index 357dfdaff16d..7b914bba4720 100644
--- a/metadata/md5-cache/dev-libs/blitz-0.10
+++ b/metadata/md5-cache/dev-libs/blitz-0.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=boost? ( >=dev-libs/boost-1.40 ) doc? ( app-doc/doxygen[dot] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=boost? ( >=dev-libs/boost-1.40 ) doc? ( app-doc/doxygen[dot] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High-performance C++ numeric library
 EAPI=4
 HOMEPAGE=http://blitz.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-3 Artistic-2 BSD )
 RDEPEND=boost? ( >=dev-libs/boost-1.40 )
 SLOT=0
 SRC_URI=mirror://sourceforge/blitz/blitz-0.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bc18cceb96ef62b671aa736218782ba7
diff --git a/metadata/md5-cache/dev-libs/boehm-gc-7.2d b/metadata/md5-cache/dev-libs/boehm-gc-7.2d
index 1d81bf2af9d5..6c55a284cb7c 100644
--- a/metadata/md5-cache/dev-libs/boehm-gc-7.2d
+++ b/metadata/md5-cache/dev-libs/boehm-gc-7.2d
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libatomic_ops-7.2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libatomic_ops-7.2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Boehm-Demers-Weiser conservative garbage collector
 EAPI=4
 HOMEPAGE=http://www.hpl.hp.com/personal/Hans_Boehm/gc/
@@ -9,5 +9,5 @@ LICENSE=boehm-gc
 RDEPEND=>=dev-libs/libatomic_ops-7.2
 SLOT=0
 SRC_URI=http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.2d.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a0c74af87eefb11d75206141b80f57d9
diff --git a/metadata/md5-cache/dev-libs/cgilib-0.7 b/metadata/md5-cache/dev-libs/cgilib-0.7
index 62569cd62a86..24c464425cba 100644
--- a/metadata/md5-cache/dev-libs/cgilib-0.7
+++ b/metadata/md5-cache/dev-libs/cgilib-0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A programmers library for the CGI interface
 EAPI=4
 HOMEPAGE=http://www.infodrom.org/projects/cgilib/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.infodrom.org/projects/cgilib/download/cgilib-0.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8287c6bca93cb807cf7494f1e1cf3e1d
diff --git a/metadata/md5-cache/dev-libs/check-0.9.8-r1 b/metadata/md5-cache/dev-libs/check-0.9.8-r1
index 1b412e0ae7d1..fc9ca6a4ef87 100644
--- a/metadata/md5-cache/dev-libs/check-0.9.8-r1
+++ b/metadata/md5-cache/dev-libs/check-0.9.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=subunit? ( dev-python/subunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=subunit? ( dev-python/subunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A unit test framework for C
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/check/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=subunit? ( dev-python/subunit )
 SLOT=0
 SRC_URI=mirror://sourceforge/check/check-0.9.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=22cfc0f7a32c2d8b8ac093a55137e77b
diff --git a/metadata/md5-cache/dev-libs/check-0.9.9 b/metadata/md5-cache/dev-libs/check-0.9.9
index dfc2be17a87d..f5e8c2819f1f 100644
--- a/metadata/md5-cache/dev-libs/check-0.9.9
+++ b/metadata/md5-cache/dev-libs/check-0.9.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=subunit? ( dev-python/subunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=subunit? ( dev-python/subunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A unit test framework for C
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/check/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=subunit? ( dev-python/subunit )
 SLOT=0
 SRC_URI=mirror://sourceforge/check/check-0.9.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=88ce445bb6eea65e198ae1dbc990728d
diff --git a/metadata/md5-cache/dev-libs/chmlib-0.40-r1 b/metadata/md5-cache/dev-libs/chmlib-0.40-r1
index f201144deebf..784536259fad 100644
--- a/metadata/md5-cache/dev-libs/chmlib-0.40-r1
+++ b/metadata/md5-cache/dev-libs/chmlib-0.40-r1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 hppa ~ia64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.jedrea.com/chmlib/chmlib-0.40.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b1b53c0e7e917aede7dc2b63bed523fb
diff --git a/metadata/md5-cache/dev-libs/clearsilver-0.10.5-r1 b/metadata/md5-cache/dev-libs/clearsilver-0.10.5-r1
index 0bf46627b95a..588390a78ad3 100644
--- a/metadata/md5-cache/dev-libs/clearsilver-0.10.5-r1
+++ b/metadata/md5-cache/dev-libs/clearsilver-0.10.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=perl? ( dev-lang/perl ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=perl? ( dev-lang/perl ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Clearsilver is a fast, powerful, and language-neutral HTML template system.
 EAPI=4
 HOMEPAGE=http://www.clearsilver.net/
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=perl? ( dev-lang/perl ) zlib? ( sys-libs/zlib ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://www.clearsilver.net/downloads/clearsilver-0.10.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dbbf4ba2811ac52e914561b95211b4a8
diff --git a/metadata/md5-cache/dev-libs/cloog-0.17.0 b/metadata/md5-cache/dev-libs/cloog-0.17.0
index 42b6b6b6c5d1..aa4b1596e5ae 100644
--- a/metadata/md5-cache/dev-libs/cloog-0.17.0
+++ b/metadata/md5-cache/dev-libs/cloog-0.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/gmp <=dev-libs/isl-0.10 !<dev-libs/cloog-ppl-0.15.10
 SLOT=0
 SRC_URI=http://www.bastoul.net/cloog/pages/download/cloog-0.17.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f87fad1a9c076dcc2163bcaa4e195625
diff --git a/metadata/md5-cache/dev-libs/cloog-ppl-0.15.10 b/metadata/md5-cache/dev-libs/cloog-ppl-0.15.10
index e2d1b61bcc87..dcb3cc127d7b 100644
--- a/metadata/md5-cache/dev-libs/cloog-ppl-0.15.10
+++ b/metadata/md5-cache/dev-libs/cloog-ppl-0.15.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/ppl dev-libs/gmp || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/ppl dev-libs/gmp || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Port of CLooG (Chunky LOOp Generator) to PPL (Parma Polyhedra Library)
 EAPI=4
 HOMEPAGE=http://repo.or.cz/w/cloog-ppl.git
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/ppl dev-libs/gmp
 SLOT=0
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=76848275842aa9c1548e3e9f29914a19
diff --git a/metadata/md5-cache/dev-libs/cyrus-imap-dev-2.4.17 b/metadata/md5-cache/dev-libs/cyrus-imap-dev-2.4.17
index 6dc2a23028f4..f1e5f9d98f7e 100644
--- a/metadata/md5-cache/dev-libs/cyrus-imap-dev-2.4.17
+++ b/metadata/md5-cache/dev-libs/cyrus-imap-dev-2.4.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2 ) kerberos? ( virtual/krb5 ) snmp? ( net-analyzer/net-snmp ) ssl? ( >=dev-libs/openssl-0.9.6 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !net-mail/cyrus-imapd || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2 ) kerberos? ( virtual/krb5 ) snmp? ( net-analyzer/net-snmp ) ssl? ( >=dev-libs/openssl-0.9.6 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !net-mail/cyrus-imapd || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Developer support for the Cyrus IMAP Server.
 EAPI=4
 HOMEPAGE=http://www.cyrusimap.org/
@@ -9,5 +9,5 @@ LICENSE=BSD-with-attribution
 RDEPEND=>=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2 ) kerberos? ( virtual/krb5 ) snmp? ( net-analyzer/net-snmp ) ssl? ( >=dev-libs/openssl-0.9.6 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !net-mail/cyrus-imapd
 SLOT=0
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.4.17.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2139b046f2fc7546751ea97e4db2f28a
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.23-r6 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.23-r6
index 58caf348af9f..060b0094cd4d 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.23-r6
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.23-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer).
 EAPI=2
 HOMEPAGE=http://asg.web.cmu.edu/sasl/
@@ -9,5 +9,5 @@ LICENSE=BSD-with-attribution
 RDEPEND=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 )
 SLOT=2
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1479b854bd4e4747bc5347e0a9207ad4
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r4 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r4
index aafc03faabc6..f50a71327b4b 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r4
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=net-mail/mailbase 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=net-mail/mailbase 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer).
 EAPI=4
 HOMEPAGE=http://cyrusimap.web.cmu.edu/
@@ -9,5 +9,5 @@ LICENSE=BSD-with-attribution
 RDEPEND=net-mail/mailbase 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 )
 SLOT=2
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.25.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4c68fc79e5c1214dae002f2050ae89bc
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r1 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r1
index 392cc7a6b02a..711862eb4440 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r1
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=net-mail/mailbase 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=net-mail/mailbase 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer).
 EAPI=5
 HOMEPAGE=http://cyrusimap.web.cmu.edu/
@@ -9,5 +9,5 @@ LICENSE=BSD-with-attribution
 RDEPEND=net-mail/mailbase 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 )
 SLOT=2
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=24f0796f7761777c2293f8172fa38ca1
diff --git a/metadata/md5-cache/dev-libs/d0_blind_id-0.5 b/metadata/md5-cache/dev-libs/d0_blind_id-0.5
index 431d4d5059ea..845685ae9df8 100644
--- a/metadata/md5-cache/dev-libs/d0_blind_id-0.5
+++ b/metadata/md5-cache/dev-libs/d0_blind_id-0.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/gmp
 SLOT=0
 SRC_URI=mirror://github/divVerent/d0_blind_id/d0_blind_id-0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=56e585b68edbbdf614f0ca099855361f
diff --git a/metadata/md5-cache/dev-libs/dbus-c++-0.6.0_p20111126 b/metadata/md5-cache/dev-libs/dbus-c++-0.6.0_p20111126
index 097c11a60b72..c6eb343097bb 100644
--- a/metadata/md5-cache/dev-libs/dbus-c++-0.6.0_p20111126
+++ b/metadata/md5-cache/dev-libs/dbus-c++-0.6.0_p20111126
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-apps/dbus dev-util/cppunit virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/dbus dev-util/cppunit virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=dbus-c++ attempts to provide a C++ API for D-BUS.
 EAPI=3
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/dbus-c++
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/dbus
 SLOT=0
 SRC_URI=http://www.elvanor.net/files/gentoo/dbus-c++-0.6.0_p20111126.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=e0b9e9d6cadb4c8f0a0ebf16a62ea741
diff --git a/metadata/md5-cache/dev-libs/dbus-c++-0.9.0 b/metadata/md5-cache/dev-libs/dbus-c++-0.9.0
index e495a9e153e8..fae928ade422 100644
--- a/metadata/md5-cache/dev-libs/dbus-c++-0.9.0
+++ b/metadata/md5-cache/dev-libs/dbus-c++-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-apps/dbus ecore? ( dev-libs/ecore ) dev-util/cppunit virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/dbus ecore? ( dev-libs/ecore ) dev-util/cppunit virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=dbus-c++ attempts to provide a C++ API for D-BUS.
 EAPI=3
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/dbus-c++
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/dbus ecore? ( dev-libs/ecore )
 SLOT=0
 SRC_URI=http://sourceforge.net/projects/dbus-cplusplus/files/dbus-c++/0.9.0/libdbus-c++-0.9.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=6a8f81ad3fab2e888bda3143464cde2e
diff --git a/metadata/md5-cache/dev-libs/dbxml-2.5.16-r2 b/metadata/md5-cache/dev-libs/dbxml-2.5.16-r2
index 492c4e7d7db1..d92786d0b0c7 100644
--- a/metadata/md5-cache/dev-libs/dbxml-2.5.16-r2
+++ b/metadata/md5-cache/dev-libs/dbxml-2.5.16-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=|| ( sys-libs/db:4.8[cxx,java?] sys-libs/db:4.8[-nocxx,java?] ) >=dev-libs/xerces-c-3 =dev-libs/xqilla-2.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.12:1.12 ) >=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 )
+DEPEND=|| ( sys-libs/db:4.8[cxx,java?] sys-libs/db:4.8[-nocxx,java?] ) >=dev-libs/xerces-c-3 =dev-libs/xqilla-2.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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=BerkeleyDB XML, a native XML database from the BerkeleyDB team
 EAPI=3
 HOMEPAGE=http://www.oracle.com/technetwork/database/berkeleydb/index-083851.html http://download.oracle.com/otndocs/products/berkeleydb/html/2.5.html
@@ -9,5 +9,5 @@ LICENSE=Sleepycat Apache-1.1 BSD
 RDEPEND=|| ( sys-libs/db:4.8[cxx,java?] sys-libs/db:4.8[-nocxx,java?] ) >=dev-libs/xerces-c-3 =dev-libs/xqilla-2.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 )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d2553c4cb6eaec6b9c84c9c1b411c3c3
diff --git a/metadata/md5-cache/dev-libs/dee-1.0.14 b/metadata/md5-cache/dev-libs/dee-1.0.14
index a9e7b8c0be4b..c1af963a897f 100644
--- a/metadata/md5-cache/dev-libs/dee-1.0.14
+++ b/metadata/md5-cache/dev-libs/dee-1.0.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-libs/icu doc? ( dev-util/gtk-doc ) test? ( dev-libs/gtx dev-util/dbus-test-runner ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 dev-libs/icu doc? ( dev-util/gtk-doc ) test? ( dev-libs/gtx dev-util/dbus-test-runner ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Provide objects allowing to create Model-View-Controller type programs across DBus
 EAPI=4
 HOMEPAGE=https://launchpad.net/dee/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 dev-libs/icu
 SLOT=0
 SRC_URI=https://launchpad.net/dee/1.0/1.0.14/+download/dee-1.0.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a2f2dcaed80deebe4791cfda91411cb2
diff --git a/metadata/md5-cache/dev-libs/dee-1.0.14-r1 b/metadata/md5-cache/dev-libs/dee-1.0.14-r1
index c2cfa0916445..f365d9c513c4 100644
--- a/metadata/md5-cache/dev-libs/dee-1.0.14-r1
+++ b/metadata/md5-cache/dev-libs/dee-1.0.14-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-libs/icu:= doc? ( dev-util/gtk-doc ) test? ( dev-libs/gtx dev-util/dbus-test-runner ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 dev-libs/icu:= doc? ( dev-util/gtk-doc ) test? ( dev-libs/gtx dev-util/dbus-test-runner ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Provide objects allowing to create Model-View-Controller type programs across DBus
 EAPI=5
 HOMEPAGE=https://launchpad.net/dee/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 dev-libs/icu:=
 SLOT=0
 SRC_URI=https://launchpad.net/dee/1.0/1.0.14/+download/dee-1.0.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3fffa91e740aad6b64cdd2881b156d82
diff --git a/metadata/md5-cache/dev-libs/dee-1.0.14-r2 b/metadata/md5-cache/dev-libs/dee-1.0.14-r2
index c1f1491fd086..21a4bf560b93 100644
--- a/metadata/md5-cache/dev-libs/dee-1.0.14-r2
+++ b/metadata/md5-cache/dev-libs/dee-1.0.14-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-libs/icu:= introspection? ( python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) doc? ( dev-util/gtk-doc ) test? ( dev-libs/gtx dev-util/dbus-test-runner ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 dev-libs/icu:= introspection? ( python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) doc? ( dev-util/gtk-doc ) test? ( dev-libs/gtx dev-util/dbus-test-runner ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Provide objects allowing to create Model-View-Controller type programs across DBus
 EAPI=5
 HOMEPAGE=https://launchpad.net/dee/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 dev-libs/icu:= introspection? ( python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] )
 SLOT=0
 SRC_URI=https://launchpad.net/dee/1.0/1.0.14/+download/dee-1.0.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
 _md5_=d1d6822da165ae90d7a2ca833793513c
diff --git a/metadata/md5-cache/dev-libs/ding-libs-0.1.3 b/metadata/md5-cache/dev-libs/ding-libs-0.1.3
index ca220c2e74aa..c7ddee1d93d7 100644
--- a/metadata/md5-cache/dev-libs/ding-libs-0.1.3
+++ b/metadata/md5-cache/dev-libs/ding-libs-0.1.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=!!dev-libs/libcollection !!dev-libs/libdhash !!dev-libs/libini_config !!dev-libs/libpath_utils !!dev-libs/libref_array
 SLOT=0
 SRC_URI=https://fedorahosted.org/released/ding-libs/ding-libs-0.1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e6ff40d6a55906e253f79f873ccd0b7a
diff --git a/metadata/md5-cache/dev-libs/ding-libs-0.2.91 b/metadata/md5-cache/dev-libs/ding-libs-0.2.91
index 36231f557de3..881d8b063c06 100644
--- a/metadata/md5-cache/dev-libs/ding-libs-0.2.91
+++ b/metadata/md5-cache/dev-libs/ding-libs-0.2.91
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 GPL-3
 RDEPEND=!!dev-libs/libcollection !!dev-libs/libdhash !!dev-libs/libini_config !!dev-libs/libpath_utils !!dev-libs/libref_array
 SLOT=0
 SRC_URI=https://fedorahosted.org/released/ding-libs/ding-libs-0.2.91.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=78f36a1eecccfd455f77e27db15264d8
diff --git a/metadata/md5-cache/dev-libs/ding-libs-0.3.0.1 b/metadata/md5-cache/dev-libs/ding-libs-0.3.0.1
index 843f0a8acad6..48a307735be5 100644
--- a/metadata/md5-cache/dev-libs/ding-libs-0.3.0.1
+++ b/metadata/md5-cache/dev-libs/ding-libs-0.3.0.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux
 LICENSE=LGPL-3 GPL-3
 SLOT=0
 SRC_URI=https://fedorahosted.org/released/ding-libs/ding-libs-0.3.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=86377e9a33d22c369b84ea91c18c1fdd
diff --git a/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r4 b/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r4
index f3b7901df41c..f2fe95a27527 100644
--- a/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r4
+++ b/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-apps/texinfo || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/texinfo || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Debug Malloc Library
 EAPI=4
 HOMEPAGE=http://dmalloc.com
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-
 LICENSE=CC-BY-SA-3.0
 SLOT=0
 SRC_URI=http://dmalloc.com/releases/dmalloc-5.5.2.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9ac91d22cd74e979f30c39b6c06f0ccf
diff --git a/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r5 b/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r5
index bde440ad6f3a..f1511cd86c4b 100644
--- a/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r5
+++ b/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-apps/texinfo || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/texinfo || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Debug Malloc Library
 EAPI=5
 HOMEPAGE=http://dmalloc.com
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64
 LICENSE=CC-BY-SA-3.0
 SLOT=0
 SRC_URI=http://dmalloc.com/releases/dmalloc-5.5.2.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=927818e76f5c4965cb06e397d2d91f0f
diff --git a/metadata/md5-cache/dev-libs/dvutil-1.0.10-r2 b/metadata/md5-cache/dev-libs/dvutil-1.0.10-r2
index b6826342fcdd..efd0756d4d7b 100644
--- a/metadata/md5-cache/dev-libs/dvutil-1.0.10-r2
+++ b/metadata/md5-cache/dev-libs/dvutil-1.0.10-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C++ classes for files, dates, property lists, reference counted pointers, number conversion etc.
 EAPI=4
 HOMEPAGE=http://tinf2.vub.ac.be/~dvermeir/software/dv/dvutil/html/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:0 )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ca8c6c059d51461dcd4ac73271fa2bae
diff --git a/metadata/md5-cache/dev-libs/e_dbus-1.7.5 b/metadata/md5-cache/dev-libs/e_dbus-1.7.5
index aca0b651947f..a9ec6183bab9 100644
--- a/metadata/md5-cache/dev-libs/e_dbus-1.7.5
+++ b/metadata/md5-cache/dev-libs/e_dbus-1.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/eina-1.7.4 >=dev-libs/ecore-1.7.5 sys-apps/dbus connman? ( >=net-misc/connman-0.75 ) libnotify? ( >=media-libs/evas-1.7.5 ) udev? ( sys-power/upower sys-fs/udisks:0 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
+DEPEND=>=dev-libs/eina-1.7.4 >=dev-libs/ecore-1.7.5 sys-apps/dbus connman? ( >=net-misc/connman-0.75 ) libnotify? ( >=media-libs/evas-1.7.5 ) udev? ( sys-power/upower sys-fs/udisks:0 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
 DESCRIPTION=Enlightenment's (Ecore) integration to DBus
 EAPI=2
 HOMEPAGE=http://www.enlightenment.org/
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-libs/eina-1.7.4 >=dev-libs/ecore-1.7.5 sys-apps/dbus connman? ( >=net-misc/connman-0.75 ) libnotify? ( >=media-libs/evas-1.7.5 ) udev? ( sys-power/upower sys-fs/udisks:0 ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=http://download.enlightenment.org/releases/e_dbus-1.7.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	enlightenment	59018f068e8f700839d3c75f86495011	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	enlightenment	59018f068e8f700839d3c75f86495011	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ddd39d173d31665f7f4398612f9e0f70
diff --git a/metadata/md5-cache/dev-libs/ecore-1.7.5-r1 b/metadata/md5-cache/dev-libs/ecore-1.7.5-r1
index 08c33e6a47e3..f56688e76a6f 100644
--- a/metadata/md5-cache/dev-libs/ecore-1.7.5-r1
+++ b/metadata/md5-cache/dev-libs/ecore-1.7.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/eina-1.7.0 ares? ( net-dns/c-ares ) glib? ( dev-libs/glib ) curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) evas? ( >=media-libs/evas-1.7.5[directfb?,fbcon?,opengl?,X?,xcb?] opengl? ( virtual/opengl ) wayland? ( >=media-libs/evas-1.7.5[directfb?,fbcon?,gles?,opengl?,wayland?,X?,xcb?] ) ) directfb? ( >=dev-libs/DirectFB-0.9.16 ) tslib? ( x11-libs/tslib ) sdl? ( media-libs/libsdl ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXtst xinerama? ( x11-libs/libXinerama x11-libs/libXrandr ) xprint? ( x11-libs/libXp ) xscreensaver? ( x11-libs/libXScrnSaver ) ) !X? ( xcb? ( x11-libs/xcb-util ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
+DEPEND=>=dev-libs/eina-1.7.0 ares? ( net-dns/c-ares ) glib? ( dev-libs/glib ) curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) evas? ( >=media-libs/evas-1.7.5[directfb?,fbcon?,opengl?,X?,xcb?] opengl? ( virtual/opengl ) wayland? ( >=media-libs/evas-1.7.5[directfb?,fbcon?,gles?,opengl?,wayland?,X?,xcb?] ) ) directfb? ( >=dev-libs/DirectFB-0.9.16 ) tslib? ( x11-libs/tslib ) sdl? ( media-libs/libsdl ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXtst xinerama? ( x11-libs/libXinerama x11-libs/libXrandr ) xprint? ( x11-libs/libXp ) xscreensaver? ( x11-libs/libXScrnSaver ) ) !X? ( xcb? ( x11-libs/xcb-util ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
 DESCRIPTION=Enlightenment's core event abstraction layer and OS abstraction layer
 EAPI=2
 HOMEPAGE=http://www.enlightenment.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/eina-1.7.0 ares? ( net-dns/c-ares ) glib? ( dev-libs/glib ) c
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.enlightenment.org/releases/ecore-1.7.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	enlightenment	59018f068e8f700839d3c75f86495011	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	enlightenment	59018f068e8f700839d3c75f86495011	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4f2128565de0f629d29788731f981682
diff --git a/metadata/md5-cache/dev-libs/efreet-1.7.5 b/metadata/md5-cache/dev-libs/efreet-1.7.5
index 8f16b04e4cc4..43a08c350f76 100644
--- a/metadata/md5-cache/dev-libs/efreet-1.7.5
+++ b/metadata/md5-cache/dev-libs/efreet-1.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/ecore-1.7.4 >=dev-libs/eet-1.7.4 >=dev-libs/eina-1.7.4 x11-misc/xdg-utils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
+DEPEND=>=dev-libs/ecore-1.7.4 >=dev-libs/eet-1.7.4 >=dev-libs/eina-1.7.4 x11-misc/xdg-utils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
 DESCRIPTION=library for handling of freedesktop.org specs (desktop/icon/theme/etc...)
 EAPI=2
 HOMEPAGE=http://www.enlightenment.org/
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-libs/ecore-1.7.4 >=dev-libs/eet-1.7.4 >=dev-libs/eina-1.7.4 x11-misc/xdg-utils nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=http://download.enlightenment.org/releases/efreet-1.7.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	enlightenment	59018f068e8f700839d3c75f86495011	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	enlightenment	59018f068e8f700839d3c75f86495011	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5aa018d6e25fe6c4c2b12f3559190576
diff --git a/metadata/md5-cache/dev-libs/eio-1.7.5 b/metadata/md5-cache/dev-libs/eio-1.7.5
index fc1640d91432..fb936fc3687d 100644
--- a/metadata/md5-cache/dev-libs/eio-1.7.5
+++ b/metadata/md5-cache/dev-libs/eio-1.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/ecore-1.7.4 >=dev-libs/eet-1.7.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
+DEPEND=>=dev-libs/ecore-1.7.4 >=dev-libs/eet-1.7.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
 DESCRIPTION=Enlightenment's integration to IO
 EAPI=2
 HOMEPAGE=http://trac.enlightenment.org/e/wiki/EIO
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/ecore-1.7.4 >=dev-libs/eet-1.7.4 nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=http://download.enlightenment.org/releases/eio-1.7.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	enlightenment	59018f068e8f700839d3c75f86495011	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	enlightenment	59018f068e8f700839d3c75f86495011	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=babffb6dab31a2c6d033e260be6b0128
diff --git a/metadata/md5-cache/dev-libs/elfio-1.0.3 b/metadata/md5-cache/dev-libs/elfio-1.0.3
index b555b5a221ab..6ea6e02fd409 100644
--- a/metadata/md5-cache/dev-libs/elfio-1.0.3
+++ b/metadata/md5-cache/dev-libs/elfio-1.0.3
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ELF (Executable and Linkable Format) reader and producer implemented as a C++ library.
 HOMEPAGE=http://elfio.sourceforge.net/
 KEYWORDS=~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/elfio/ELFIO-1.0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1d3476d8d4c9c5d5ed278f46378e0b5e
diff --git a/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249 b/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249
index e43c58d9210f..e75612f6d9d1 100644
--- a/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249
+++ b/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=FastCGI Developer's Kit
 EAPI=2
 HOMEPAGE=http://www.fastcgi.com/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
 LICENSE=FastCGI
 SLOT=0
 SRC_URI=http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=82306df4300fbd113740d43bcda747e2
diff --git a/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r1 b/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r1
index fd996bd06c87..e22c740408bb 100644
--- a/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r1
+++ b/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=FastCGI Developer's Kit
 EAPI=4
 HOMEPAGE=http://www.fastcgi.com/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f
 LICENSE=FastCGI
 SLOT=0
 SRC_URI=http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3d4d96b17b367691eab238066f27e74c
diff --git a/metadata/md5-cache/dev-libs/fribidi-0.19.5-r1 b/metadata/md5-cache/dev-libs/fribidi-0.19.5-r1
index f1922907f0a6..b3834a5ebbc6 100644
--- a/metadata/md5-cache/dev-libs/fribidi-0.19.5-r1
+++ b/metadata/md5-cache/dev-libs/fribidi-0.19.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free implementation of the unicode bidirectional algorithm
 EAPI=5
 HOMEPAGE=http://fribidi.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://fribidi.org/download/fribidi-0.19.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f423226a08251f9de02597bf84de908c
diff --git a/metadata/md5-cache/dev-libs/g-wrap-1.9.14 b/metadata/md5-cache/dev-libs/g-wrap-1.9.14
index f22c14b4d89f..e1318d9b6105 100644
--- a/metadata/md5-cache/dev-libs/g-wrap-1.9.14
+++ b/metadata/md5-cache/dev-libs/g-wrap-1.9.14
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-scheme/guile-lib dev-scheme/guile[deprecated] virtual/libffi
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/g-wrap/g-wrap-1.9.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2363b1e6a4d36e1c3185883c66f23c4f
diff --git a/metadata/md5-cache/dev-libs/gdome2-0.8.1-r4 b/metadata/md5-cache/dev-libs/gdome2-0.8.1-r4
index 198ece9c834c..ec2bd65dcd5e 100644
--- a/metadata/md5-cache/dev-libs/gdome2-0.8.1-r4
+++ b/metadata/md5-cache/dev-libs/gdome2-0.8.1-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.2.0 >=dev-libs/libxml2-2.4.26 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.2.0 >=dev-libs/libxml2-2.4.26 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=The DOM C library for the GNOME project
 EAPI=4
 HOMEPAGE=http://gdome2.cs.unibo.it/
@@ -9,5 +9,5 @@ RDEPEND=>=dev-libs/glib-2.2.0 >=dev-libs/libxml2-2.4.26
 RESTRICT=test
 SLOT=0
 SRC_URI=http://gdome2.cs.unibo.it/tarball/gdome2-0.8.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=165c85d61671c0130037005827365b9d
diff --git a/metadata/md5-cache/dev-libs/geoip-1.4.8-r3 b/metadata/md5-cache/dev-libs/geoip-1.4.8-r3
index 9e18f52612ae..6c4b5b5be63c 100644
--- a/metadata/md5-cache/dev-libs/geoip-1.4.8-r3
+++ b/metadata/md5-cache/dev-libs/geoip-1.4.8-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=easily lookup countries by IP addresses, even when Reverse DNS entries don't exist
 EAPI=4
 HOMEPAGE=http://www.maxmind.com/app/ip-location
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2 MaxMind2
 RDEPEND=sys-libs/zlib perl-geoipupdate? ( dev-perl/PerlIO-gzip dev-perl/libwww-perl )
 SLOT=0
 SRC_URI=http://www.maxmind.com/download/geoip/api/c/GeoIP-1.4.8.tar.gz http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz city? ( http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz ) ipv6? ( http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz city? ( http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=266772b17edacc7a7f4e2e9d7231ed83
diff --git a/metadata/md5-cache/dev-libs/gf2x-1.0-r1 b/metadata/md5-cache/dev-libs/gf2x-1.0-r1
index 2f2dc33899f4..1c9dcd335052 100644
--- a/metadata/md5-cache/dev-libs/gf2x-1.0-r1
+++ b/metadata/md5-cache/dev-libs/gf2x-1.0-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://gforge.inria.fr/frs/download.php/27999/gf2x-1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3dde332c6da96450ac68da954d70ce29
diff --git a/metadata/md5-cache/dev-libs/gf2x-1.1 b/metadata/md5-cache/dev-libs/gf2x-1.1
index 0fd7bb5c7d50..4541f86430e9 100644
--- a/metadata/md5-cache/dev-libs/gf2x-1.1
+++ b/metadata/md5-cache/dev-libs/gf2x-1.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://gforge.inria.fr/frs/download.php/30873/gf2x-1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=36a1d49cd088fff99ed38226eaf23ec2
diff --git a/metadata/md5-cache/dev-libs/glib-1.2.10-r5 b/metadata/md5-cache/dev-libs/glib-1.2.10-r5
index 674579a90b93..7216d685198c 100644
--- a/metadata/md5-cache/dev-libs/glib-1.2.10-r5
+++ b/metadata/md5-cache/dev-libs/glib-1.2.10-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The GLib library of C routines
 HOMEPAGE=http://www.gtk.org/
 IUSE=hardened
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-f
 LICENSE=LGPL-2.1+
 SLOT=1
 SRC_URI=ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz ftp://ftp.gnome.org/pub/GNOME/stable/sources/glib/glib-1.2.10.tar.gz mirror://gentoo/glib-1.2.10-r1-as-needed.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e1d23c109fbaa8cfe3623a9f426c7cad
diff --git a/metadata/md5-cache/dev-libs/glib-2.30.3 b/metadata/md5-cache/dev-libs/glib-2.30.3
deleted file mode 100644
index 9d0c5f7b1cac..000000000000
--- a/metadata/md5-cache/dev-libs/glib-2.30.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=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 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 utils? ( =dev-lang/python-2* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=The GLib library of C routines
-EAPI=4
-HOMEPAGE=http://www.gtk.org/
-IUSE=debug fam selinux +static-libs systemtap test utils xattr test
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-linux
-LICENSE=LGPL-2+
-PDEPEND=x11-misc/shared-mime-info !<gnome-base/gvfs-1.6.4-r990
-RDEPEND=virtual/libiconv virtual/libffi sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.30.3 ) utils? ( =dev-lang/python-2* )
-SLOT=2
-SRC_URI=mirror://gnome/sources/glib/2.30/glib-2.30.3.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=dc6a93d8ea92fa991586fbe62fdf9d65
diff --git a/metadata/md5-cache/dev-libs/glib-2.32.4-r1 b/metadata/md5-cache/dev-libs/glib-2.32.4-r1
index dfb1d2dc3ad7..acc70d9a8bc1 100644
--- a/metadata/md5-cache/dev-libs/glib-2.32.4-r1
+++ b/metadata/md5-cache/dev-libs/glib-2.32.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.32.4 ) >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb =dev-lang/python-2* >=dev-util/gdbus-codegen-2.32.4 >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 utils? ( =dev-lang/python-2* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.32.4 ) >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb =dev-lang/python-2* >=dev-util/gdbus-codegen-2.32.4 >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 utils? ( =dev-lang/python-2* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=The GLib library of C routines
 EAPI=4
 HOMEPAGE=http://www.gtk.org/
@@ -10,5 +10,5 @@ PDEPEND=x11-misc/shared-mime-info !<gnome-base/gvfs-1.6.4-r990
 RDEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.32.4 ) utils? ( =dev-lang/python-2* )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.32/glib-2.32.4.tar.xz http://dev.gentoo.org/~tetromino/distfiles/glib/glib-2.32.4-AS_IF-patches.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=425bf1f40c9381d58760df69c81e36d3
diff --git a/metadata/md5-cache/dev-libs/glib-2.34.2 b/metadata/md5-cache/dev-libs/glib-2.34.2
deleted file mode 100644
index 5c361cb4a9b6..000000000000
--- a/metadata/md5-cache/dev-libs/glib-2.34.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.34.2 ) app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb =dev-lang/python-2* >=dev-util/gdbus-codegen-2.34.2 >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 utils? ( =dev-lang/python-2* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=The GLib library of C routines
-EAPI=4
-HOMEPAGE=http://www.gtk.org/
-IUSE=debug fam kernel_linux selinux static-libs systemtap test utils xattr test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2+
-PDEPEND=x11-misc/shared-mime-info !<gnome-base/gvfs-1.6.4-r990
-RDEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.34.2 ) utils? ( =dev-lang/python-2* )
-SLOT=2
-SRC_URI=mirror://gnome/sources/glib/2.34/glib-2.34.2.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=60a98d0d7b6e5d1a03eaa86423f6bf68
diff --git a/metadata/md5-cache/dev-libs/glib-2.34.3 b/metadata/md5-cache/dev-libs/glib-2.34.3
index 3c2c393cea54..b9d67f1462b9 100644
--- a/metadata/md5-cache/dev-libs/glib-2.34.3
+++ b/metadata/md5-cache/dev-libs/glib-2.34.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.34.3 ) app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb =dev-lang/python-2* >=dev-util/gdbus-codegen-2.34.3 >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 utils? ( =dev-lang/python-2* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.34.3 ) app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb =dev-lang/python-2* >=dev-util/gdbus-codegen-2.34.3 >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 utils? ( =dev-lang/python-2* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=The GLib library of C routines
 EAPI=5
 HOMEPAGE=http://www.gtk.org/
@@ -10,5 +10,5 @@ PDEPEND=x11-misc/shared-mime-info !<gnome-base/gvfs-1.6.4-r990
 RDEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.34.3 ) utils? ( =dev-lang/python-2* )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.34/glib-2.34.3.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=547e9b197a22c44ddbc179e49a8da246
diff --git a/metadata/md5-cache/dev-libs/glib-2.36.0 b/metadata/md5-cache/dev-libs/glib-2.36.0
index d74320bfb7d6..d515d940b8c6 100644
--- a/metadata/md5-cache/dev-libs/glib-2.36.0
+++ b/metadata/md5-cache/dev-libs/glib-2.36.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.36.0[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.36.0[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.36.0[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.36.0[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=The GLib library of C routines
 EAPI=5
 HOMEPAGE=http://www.gtk.org/
@@ -10,5 +10,5 @@ PDEPEND=x11-misc/shared-mime-info !<gnome-base/gvfs-1.6.4-r990
 RDEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.36.0[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.36/glib-2.36.0.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=9d7ba099f8119b30848179a1152b1e27
diff --git a/metadata/md5-cache/dev-libs/glib-2.36.1 b/metadata/md5-cache/dev-libs/glib-2.36.1
new file mode 100644
index 000000000000..2d64295c1070
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/glib-2.36.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare setup test
+DEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.36.1[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.36.1[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=The GLib library of C routines
+EAPI=5
+HOMEPAGE=http://www.gtk.org/
+IUSE=debug fam kernel_linux selinux static-libs systemtap test utils xattr python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=LGPL-2+
+PDEPEND=x11-misc/shared-mime-info !<gnome-base/gvfs-1.6.4-r990
+RDEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.36.1[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] )
+SLOT=2
+SRC_URI=mirror://gnome/sources/glib/2.36/glib-2.36.1.tar.xz
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=399cc137be535c005c9b215b1e909b9b
diff --git a/metadata/md5-cache/dev-libs/gmetadom-0.2.6 b/metadata/md5-cache/dev-libs/gmetadom-0.2.6
index b7998cea3c53..093321c0f614 100644
--- a/metadata/md5-cache/dev-libs/gmetadom-0.2.6
+++ b/metadata/md5-cache/dev-libs/gmetadom-0.2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-libs/glib >=dev-libs/gdome2-0.8.0 >=dev-libs/libxslt-1.0.0 virtual/pkgconfig ocaml? ( >=dev-lang/ocaml-3.05 >=dev-ml/findlib-0.8 ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib >=dev-libs/gdome2-0.8.0 >=dev-libs/libxslt-1.0.0 virtual/pkgconfig ocaml? ( >=dev-lang/ocaml-3.05 >=dev-ml/findlib-0.8 ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library providing bindings for multiple languages of multiple C DOM implementations
 HOMEPAGE=http://gmetadom.sourceforge.net/
 IUSE=ocaml
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib >=dev-libs/gdome2-0.8.0 >=dev-libs/libxslt-1.0.0
 SLOT=0
 SRC_URI=mirror://sourceforge/gmetadom/gmetadom-0.2.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a8ef3f26e987e7d9b228859b4c009ca4
diff --git a/metadata/md5-cache/dev-libs/gmetadom-0.2.6-r1 b/metadata/md5-cache/dev-libs/gmetadom-0.2.6-r1
index 06a992e63ce4..3d832fee2d0d 100644
--- a/metadata/md5-cache/dev-libs/gmetadom-0.2.6-r1
+++ b/metadata/md5-cache/dev-libs/gmetadom-0.2.6-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib dev-libs/gdome2 dev-libs/libxslt
 SLOT=0
 SRC_URI=mirror://sourceforge/gmetadom/gmetadom-0.2.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=846ef07242e2c503d900f15557622cf9
diff --git a/metadata/md5-cache/dev-libs/gnulib-2009.03.03.14.07.45-r1 b/metadata/md5-cache/dev-libs/gnulib-2009.03.03.14.07.45-r1
index ca9069392f13..28d63b98fc44 100644
--- a/metadata/md5-cache/dev-libs/gnulib-2009.03.03.14.07.45-r1
+++ b/metadata/md5-cache/dev-libs/gnulib-2009.03.03.14.07.45-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Gnulib is a library of common routines intended to be shared at the source level.
 EAPI=3
 HOMEPAGE=http://www.gnu.org/software/gnulib
@@ -8,5 +8,5 @@ KEYWORDS=~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~drizzt/distfiles/gnulib-8d2524ce78ca107074727cbd8780c26a203a107c.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a2f0b39ae26200660651aac4b966a417
diff --git a/metadata/md5-cache/dev-libs/gtx-0.2.2 b/metadata/md5-cache/dev-libs/gtx-0.2.2
index 9e0d818f3f04..ce4f9103a0e8 100644
--- a/metadata/md5-cache/dev-libs/gtx-0.2.2
+++ b/metadata/md5-cache/dev-libs/gtx-0.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Small collection of convenience functions intended to enhance the GLib testing framework
 EAPI=5
 HOMEPAGE=https://launchpad.net/gtx
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2
 SLOT=0
 SRC_URI=https://launchpad.net/gtx/trunk/0.2.2/+download/gtx-0.2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cf0c20d73ef082e529fae0743e60ff14
diff --git a/metadata/md5-cache/dev-libs/ibpp-2.5.3.1 b/metadata/md5-cache/dev-libs/ibpp-2.5.3.1
index c677cc2196f7..9e4657ff1a89 100644
--- a/metadata/md5-cache/dev-libs/ibpp-2.5.3.1
+++ b/metadata/md5-cache/dev-libs/ibpp-2.5.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=>=dev-db/firebird-1.5.1 app-arch/unzip || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-db/firebird-1.5.1 app-arch/unzip || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=IBPP, a C++ client API for firebird 1.0
 HOMEPAGE=http://www.ibpp.org/
 KEYWORDS=~amd64 x86
@@ -7,5 +7,5 @@ LICENSE=IBPP-1.1
 RDEPEND=>=dev-db/firebird-1.5.1
 SLOT=0
 SRC_URI=mirror://sourceforge/ibpp/ibpp-2-5-3-1-src.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c93668b359b098354a91b01c38897674
diff --git a/metadata/md5-cache/dev-libs/icu-50.1-r2 b/metadata/md5-cache/dev-libs/icu-50.1-r2
index 74d94dde1df3..558cb7f02108 100644
--- a/metadata/md5-cache/dev-libs/icu-50.1-r2
+++ b/metadata/md5-cache/dev-libs/icu-50.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=doc? ( app-doc/doxygen[dot] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen[dot] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=International Components for Unicode
 EAPI=5
 HOMEPAGE=http://www.icu-project.org/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 SLOT=0/50.1
 SRC_URI=http://download.icu-project.org/files/icu4c/50.1/icu4c-50_1-src.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=666ca641d1916bddde3550053ddc49fd
diff --git a/metadata/md5-cache/dev-libs/icu-50.1.2 b/metadata/md5-cache/dev-libs/icu-50.1.2
index dec4b3614916..39ccf0dfbcba 100644
--- a/metadata/md5-cache/dev-libs/icu-50.1.2
+++ b/metadata/md5-cache/dev-libs/icu-50.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=doc? ( app-doc/doxygen[dot] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen[dot] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=International Components for Unicode
 EAPI=5
 HOMEPAGE=http://www.icu-project.org/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 SLOT=0/50.1
 SRC_URI=http://download.icu-project.org/files/icu4c/50.1.2/icu4c-50_1_2-src.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=19db940e1421ccbda7fb810315e2b576
diff --git a/metadata/md5-cache/dev-libs/icu-51.1 b/metadata/md5-cache/dev-libs/icu-51.1
index aa90671d970b..9f3bd8b3255d 100644
--- a/metadata/md5-cache/dev-libs/icu-51.1
+++ b/metadata/md5-cache/dev-libs/icu-51.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=doc? ( app-doc/doxygen[dot] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen[dot] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=International Components for Unicode
 EAPI=5
 HOMEPAGE=http://www.icu-project.org/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 SLOT=0/51.1
 SRC_URI=http://download.icu-project.org/files/icu4c/51.1/icu4c-51_1-src.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=268ddd945bb8e9df13152441b13af7ff
diff --git a/metadata/md5-cache/dev-libs/igraph-0.6.4 b/metadata/md5-cache/dev-libs/igraph-0.6.4
index 477bf3912667..0cae626c5cc6 100644
--- a/metadata/md5-cache/dev-libs/igraph-0.6.4
+++ b/metadata/md5-cache/dev-libs/igraph-0.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libxml2 sci-libs/arpack virtual/blas virtual/lapack sci-libs/cxsparse sci-mathematics/glpk gmp? ( dev-libs/gmp ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 sci-libs/arpack virtual/blas virtual/lapack sci-libs/cxsparse sci-mathematics/glpk gmp? ( dev-libs/gmp ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Creating and manipulating undirected and directed graphs
 EAPI=5
 HOMEPAGE=http://igraph.sourceforge.net/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 sci-libs/arpack virtual/blas virtual/lapack sci-libs/cxsparse sci-mathematics/glpk gmp? ( dev-libs/gmp )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/igraph/C%20library/0.6.4/igraph-0.6.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=06f0fc1cc3f653e5d6560514a8ab2535
diff --git a/metadata/md5-cache/dev-libs/iksemel-1.3 b/metadata/md5-cache/dev-libs/iksemel-1.3
index 6a8c238189a0..aaf754370fd4 100644
--- a/metadata/md5-cache/dev-libs/iksemel-1.3
+++ b/metadata/md5-cache/dev-libs/iksemel-1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=gnutls? ( net-libs/gnutls ) gnutls? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gnutls? ( net-libs/gnutls ) gnutls? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=eXtensible Markup Language parser library designed for Jabber applications
 EAPI=2
 HOMEPAGE=http://code.google.com/p/iksemel
@@ -10,5 +10,5 @@ RDEPEND=gnutls? ( net-libs/gnutls )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://iksemel.googlecode.com/files/iksemel-1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e3042430b4feb75748fcff4e4f474042
diff --git a/metadata/md5-cache/dev-libs/iksemel-1.4 b/metadata/md5-cache/dev-libs/iksemel-1.4
index bbf7a9529bc7..ad95f832bcf4 100644
--- a/metadata/md5-cache/dev-libs/iksemel-1.4
+++ b/metadata/md5-cache/dev-libs/iksemel-1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=ssl? ( net-libs/gnutls ) ssl? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ssl? ( net-libs/gnutls ) ssl? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=eXtensible Markup Language parser library designed for Jabber applications
 EAPI=2
 HOMEPAGE=http://code.google.com/p/iksemel
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=ssl? ( net-libs/gnutls )
 SLOT=0
 SRC_URI=http://iksemel.googlecode.com/files/iksemel-1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0c22f4d243f150870fad32dcc35a2cd9
diff --git a/metadata/md5-cache/dev-libs/ilbc-rfc3951-0-r1 b/metadata/md5-cache/dev-libs/ilbc-rfc3951-0-r1
index 588776290483..d1973b5458a1 100644
--- a/metadata/md5-cache/dev-libs/ilbc-rfc3951-0-r1
+++ b/metadata/md5-cache/dev-libs/ilbc-rfc3951-0-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=iLBC (internet Low Bitrate Codec) is a speech codec suitable for robust voice communication over IP.
 HOMEPAGE=http://www.ilbcfreeware.org/
 KEYWORDS=alpha amd64 ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://simon.morlat.free.fr/download/1.1.x/source/ilbc-rfc3951.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9dbbc40316b56891c33e8688eb3cd08a
diff --git a/metadata/md5-cache/dev-libs/iniparser-3.1 b/metadata/md5-cache/dev-libs/iniparser-3.1
index 6d75ac832844..e6b9e58a3e32 100644
--- a/metadata/md5-cache/dev-libs/iniparser-3.1
+++ b/metadata/md5-cache/dev-libs/iniparser-3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free stand-alone ini file parsing library.
 EAPI=4
 HOMEPAGE=http://ndevilla.free.fr/iniparser/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ndevilla.free.fr/iniparser/iniparser-3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8146d256724aa2fde03db7aafa641fbd
diff --git a/metadata/md5-cache/dev-libs/jansson-2.3.1 b/metadata/md5-cache/dev-libs/jansson-2.3.1
index b24612c40c8c..8ee6e180a627 100644
--- a/metadata/md5-cache/dev-libs/jansson-2.3.1
+++ b/metadata/md5-cache/dev-libs/jansson-2.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( >=dev-python/sphinx-1.0.4 )
+DEPEND=doc? ( >=dev-python/sphinx-1.0.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C library for encoding, decoding and manipulating JSON data
 EAPI=3
 HOMEPAGE=http://www.digip.org/jansson/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://www.digip.org/jansson/releases/jansson-2.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=213b6a1579043ebfb2b9803fcfabb54d
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f4f14c7e38627b468f7eacc557fff2a8
diff --git a/metadata/md5-cache/dev-libs/jansson-2.4 b/metadata/md5-cache/dev-libs/jansson-2.4
index 830245cbf553..c5e1dcf5b4b1 100644
--- a/metadata/md5-cache/dev-libs/jansson-2.4
+++ b/metadata/md5-cache/dev-libs/jansson-2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( >=dev-python/sphinx-1.0.4 )
+DEPEND=doc? ( >=dev-python/sphinx-1.0.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C library for encoding, decoding and manipulating JSON data
 EAPI=4
 HOMEPAGE=http://www.digip.org/jansson/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://www.digip.org/jansson/releases/jansson-2.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=44c3ddb62d2a0106f64615fe58bb94dc
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c2528e72ba896339c347dbfaa1b55f33
diff --git a/metadata/md5-cache/dev-libs/jemalloc-2.2.5-r1 b/metadata/md5-cache/dev-libs/jemalloc-2.2.5-r1
index 5a355b4778a0..cbb732f185ab 100644
--- a/metadata/md5-cache/dev-libs/jemalloc-2.2.5-r1
+++ b/metadata/md5-cache/dev-libs/jemalloc-2.2.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Jemalloc is a general-purpose scalable concurrent allocator
 EAPI=4
 HOMEPAGE=http://www.canonware.com/jemalloc/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.canonware.com/download/jemalloc/jemalloc-2.2.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8d24437cdf7dabdf3211b5436f38f3f4
diff --git a/metadata/md5-cache/dev-libs/jemalloc-3.3.1 b/metadata/md5-cache/dev-libs/jemalloc-3.3.1
index 3d394442b55f..e303624ff070 100644
--- a/metadata/md5-cache/dev-libs/jemalloc-3.3.1
+++ b/metadata/md5-cache/dev-libs/jemalloc-3.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Jemalloc is a general-purpose scalable concurrent allocator
 EAPI=4
 HOMEPAGE=http://www.canonware.com/jemalloc/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.canonware.com/download/jemalloc/jemalloc-3.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ee27d1a57553ff3d9aa725e32088f43d
diff --git a/metadata/md5-cache/dev-libs/json-c-0.10-r1 b/metadata/md5-cache/dev-libs/json-c-0.10-r1
index 2e020bc1bd4a..f84266cce3c2 100644
--- a/metadata/md5-cache/dev-libs/json-c-0.10-r1
+++ b/metadata/md5-cache/dev-libs/json-c-0.10-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A JSON implementation in C
 EAPI=5
 HOMEPAGE=https://github.com/json-c/json-c/wiki
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux
 LICENSE=MIT
 SLOT=0/0
 SRC_URI=mirror://github/json-c/json-c/json-c-0.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ce814f4424920bcb519788ab9f35dbea
diff --git a/metadata/md5-cache/dev-libs/judy-1.0.4 b/metadata/md5-cache/dev-libs/judy-1.0.4
index 95b357c30b9b..649241ce09f9 100644
--- a/metadata/md5-cache/dev-libs/judy-1.0.4
+++ b/metadata/md5-cache/dev-libs/judy-1.0.4
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A C library that implements a dynamic array
 HOMEPAGE=http://judy.sourceforge.net/
 KEYWORDS=alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/judy/Judy-1.0.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=15d50cb1f952cf7a1599c79046a7466c
diff --git a/metadata/md5-cache/dev-libs/judy-1.0.5 b/metadata/md5-cache/dev-libs/judy-1.0.5
index 66693534b535..87371e6b84d8 100644
--- a/metadata/md5-cache/dev-libs/judy-1.0.5
+++ b/metadata/md5-cache/dev-libs/judy-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A C library that implements a dynamic array
 EAPI=2
 HOMEPAGE=http://judy.sourceforge.net/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/judy/Judy-1.0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7cc1dd41e80eea7d4a13ac6256b8805a
diff --git a/metadata/md5-cache/dev-libs/libatomic_ops-1.2-r1 b/metadata/md5-cache/dev-libs/libatomic_ops-1.2-r1
index a2ecee04ac17..c5d3f1b6ab95 100644
--- a/metadata/md5-cache/dev-libs/libatomic_ops-1.2-r1
+++ b/metadata/md5-cache/dev-libs/libatomic_ops-1.2-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Implementation for atomic memory update operations
 HOMEPAGE=http://www.hpl.hp.com/research/linux/atomic_ops/
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT boehm-gc GPL-2+
 SLOT=0
 SRC_URI=http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7362f99bfa7a09387d21c5674cf473fa
diff --git a/metadata/md5-cache/dev-libs/libbrahe-1.1.0 b/metadata/md5-cache/dev-libs/libbrahe-1.1.0
index e3b290ea809a..16cbdf83c8c1 100644
--- a/metadata/md5-cache/dev-libs/libbrahe-1.1.0
+++ b/metadata/md5-cache/dev-libs/libbrahe-1.1.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Heterogenous C Library of Numeric Functions
 HOMEPAGE=http://www.coyotegulch.com/products/brahe/
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.coyotegulch.com/distfiles/libbrahe-1.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5485eaf7829130f359f98180c0aeba66
diff --git a/metadata/md5-cache/dev-libs/libcdio-0.83 b/metadata/md5-cache/dev-libs/libcdio-0.83
index ca28c8a3b57e..b0c97c13f761 100644
--- a/metadata/md5-cache/dev-libs/libcdio-0.83
+++ b/metadata/md5-cache/dev-libs/libcdio-0.83
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=cddb? ( >=media-libs/libcddb-1.0.1 ) !minimal? ( >=sys-libs/ncurses-5.7-r7 ) virtual/libintl !dev-libs/libcdio-paranoia
 SLOT=0
 SRC_URI=mirror://gnu/libcdio/libcdio-0.83.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=23a7d1619872836658f0e476fcb3de5b
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1
index f1c813a84db4..900137318cd3 100644
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1
+++ b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=app-admin/eselect-cdparanoia >=dev-libs/libcdio-0.90 virtual/libintl sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-admin/eselect-cdparanoia >=dev-libs/libcdio-0.90 virtual/libintl sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=an advanced CDDA reader with error correction
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/libcdio/
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ GPL-2+ LGPL-2.1
 RDEPEND=app-admin/eselect-cdparanoia >=dev-libs/libcdio-0.90 virtual/libintl
 SLOT=0
 SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+0.90+1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f9daa0a7e34f237dbd0e787a8e808272
diff --git a/metadata/md5-cache/dev-libs/libcec-1.9.0 b/metadata/md5-cache/dev-libs/libcec-1.9.0
index 91b0eee35390..2c794efba0ed 100644
--- a/metadata/md5-cache/dev-libs/libcec-1.9.0
+++ b/metadata/md5-cache/dev-libs/libcec-1.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=virtual/udev dev-libs/lockdev virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/udev dev-libs/lockdev virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor
 EAPI=4
 HOMEPAGE=http://libcec.pulse-eight.com
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev
 SLOT=0
 SRC_URI=http://github.com/Pulse-Eight/libcec/tarball/libcec-1.9.0 -> libcec-1.9.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7a47031e2582259268816f0c022f445c
diff --git a/metadata/md5-cache/dev-libs/libcec-2.0.5 b/metadata/md5-cache/dev-libs/libcec-2.0.5
index afcd9c93d72b..f5fe19160881 100644
--- a/metadata/md5-cache/dev-libs/libcec-2.0.5
+++ b/metadata/md5-cache/dev-libs/libcec-2.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=virtual/udev dev-libs/lockdev virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/udev dev-libs/lockdev virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor
 EAPI=4
 HOMEPAGE=http://libcec.pulse-eight.com
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev
 SLOT=0
 SRC_URI=http://github.com/Pulse-Eight/libcec/tarball/libcec-2.0.5 -> libcec-2.0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=beabcb5338793953f2950cf0bcf33776
diff --git a/metadata/md5-cache/dev-libs/libcec-2.0.5-r1 b/metadata/md5-cache/dev-libs/libcec-2.0.5-r1
index e933e44a9209..a6018f052fb2 100644
--- a/metadata/md5-cache/dev-libs/libcec-2.0.5-r1
+++ b/metadata/md5-cache/dev-libs/libcec-2.0.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=virtual/udev dev-libs/lockdev virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/udev dev-libs/lockdev virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor
 EAPI=5
 HOMEPAGE=http://libcec.pulse-eight.com
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev
 SLOT=0
 SRC_URI=http://github.com/Pulse-Eight/libcec/tarball/libcec-2.0.5 -> libcec-2.0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=27edeab4a40ebd6e33eb472f3d525948
diff --git a/metadata/md5-cache/dev-libs/libcec-2.1.1 b/metadata/md5-cache/dev-libs/libcec-2.1.1
index d4c39e75d0d5..8d6680892408 100644
--- a/metadata/md5-cache/dev-libs/libcec-2.1.1
+++ b/metadata/md5-cache/dev-libs/libcec-2.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=virtual/udev dev-libs/lockdev virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/udev dev-libs/lockdev virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor
 EAPI=5
 HOMEPAGE=http://libcec.pulse-eight.com
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev
 SLOT=0
 SRC_URI=http://github.com/Pulse-Eight/libcec/tarball/libcec-2.1.1 -> libcec-2.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=02d0891548c1b79eba1d01f9ead9c640
diff --git a/metadata/md5-cache/dev-libs/libcgroup-0.38-r1 b/metadata/md5-cache/dev-libs/libcgroup-0.38-r1
index af3bc0dfedf0..e4d25c9915fc 100644
--- a/metadata/md5-cache/dev-libs/libcgroup-0.38-r1
+++ b/metadata/md5-cache/dev-libs/libcgroup-0.38-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=pam? ( virtual/pam ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pam? ( virtual/pam ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tools and libraries to configure and manage kernel control groups
 EAPI=4
 HOMEPAGE=http://libcg.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://sourceforge/libcg/libcgroup-0.38.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ec3f46d87840ecf092656fd498bd730a
diff --git a/metadata/md5-cache/dev-libs/libcgroup-0.39_rc1-r1 b/metadata/md5-cache/dev-libs/libcgroup-0.39_rc1-r1
index bc5b81e7f10d..9d53aa092693 100644
--- a/metadata/md5-cache/dev-libs/libcgroup-0.39_rc1-r1
+++ b/metadata/md5-cache/dev-libs/libcgroup-0.39_rc1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=pam? ( virtual/pam ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pam? ( virtual/pam ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tools and libraries to configure and manage kernel control groups
 EAPI=5
 HOMEPAGE=http://libcg.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=pam? ( virtual/pam )
 REQUIRED_USE=daemon? ( tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/libcg/libcgroup/v0.39.rc/libcgroup-0.39.rc1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9c9811bc77697ceca45de6fd57d6082a
diff --git a/metadata/md5-cache/dev-libs/libconfig-1.4.9-r1 b/metadata/md5-cache/dev-libs/libconfig-1.4.9-r1
index 06affe688a2f..a47e189b67fc 100644
--- a/metadata/md5-cache/dev-libs/libconfig-1.4.9-r1
+++ b/metadata/md5-cache/dev-libs/libconfig-1.4.9-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.hyperrealm.com/libconfig/libconfig-1.4.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=15219a2b6b308352b22aec6d1b91a8ee
diff --git a/metadata/md5-cache/dev-libs/libcoyotl-3.1.0 b/metadata/md5-cache/dev-libs/libcoyotl-3.1.0
index 66df85f722bd..551de6ef3f77 100644
--- a/metadata/md5-cache/dev-libs/libcoyotl-3.1.0
+++ b/metadata/md5-cache/dev-libs/libcoyotl-3.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=media-libs/libpng doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libpng doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A collection of portable C++ classes.
 HOMEPAGE=http://www.coyotegulch.com/products/libcoyotl/
 IUSE=doc
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng
 SLOT=0
 SRC_URI=http://www.coyotegulch.com/distfiles/libcoyotl-3.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=80929f7821aa2208125a1494d2c982b4
diff --git a/metadata/md5-cache/dev-libs/libcoyotl-3.1.0-r1 b/metadata/md5-cache/dev-libs/libcoyotl-3.1.0-r1
index 7dcefd445fc3..d9a342fbc4d5 100644
--- a/metadata/md5-cache/dev-libs/libcoyotl-3.1.0-r1
+++ b/metadata/md5-cache/dev-libs/libcoyotl-3.1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=media-libs/libpng doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libpng doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A collection of portable C++ classes.
 EAPI=5
 HOMEPAGE=http://www.coyotegulch.com/products/libcoyotl/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng
 SLOT=0
 SRC_URI=http://www.coyotegulch.com/distfiles/libcoyotl-3.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6477f4ae5cc2901d6409fc7f54c9736d
diff --git a/metadata/md5-cache/dev-libs/libdivecomputer-0.3.0 b/metadata/md5-cache/dev-libs/libdivecomputer-0.3.0
index abd731a72189..6945fa7f2984 100644
--- a/metadata/md5-cache/dev-libs/libdivecomputer-0.3.0
+++ b/metadata/md5-cache/dev-libs/libdivecomputer-0.3.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=usb? ( virtual/libusb )
 SLOT=0
 SRC_URI=http://www.divesoftware.org/libdc/releases/libdivecomputer-0.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=12335a209d708df275ef7c3e8446ba39
diff --git a/metadata/md5-cache/dev-libs/libdivecomputer-9999 b/metadata/md5-cache/dev-libs/libdivecomputer-9999
index 1b2c8d8a24c5..629782112dd6 100644
--- a/metadata/md5-cache/dev-libs/libdivecomputer-9999
+++ b/metadata/md5-cache/dev-libs/libdivecomputer-9999
@@ -7,5 +7,5 @@ IUSE=usb examples +static-libs
 LICENSE=LGPL-2.1
 RDEPEND=usb? ( virtual/libusb )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=71835ab1b17ce6be03ef31051ddec9da
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.11-r2 b/metadata/md5-cache/dev-libs/libdnet-1.11-r2
index 2c01a402b33b..f7033b1cae1b 100644
--- a/metadata/md5-cache/dev-libs/libdnet-1.11-r2
+++ b/metadata/md5-cache/dev-libs/libdnet-1.11-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=simplified, portable interface to several low-level networking routines
 EAPI=4
 HOMEPAGE=http://libdnet.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=python? ( =dev-lang/python-2* )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/libdnet/libdnet-1.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7083cbaf064ef3cbad33d51625296d8d
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.12 b/metadata/md5-cache/dev-libs/libdnet-1.12
index 93dba1b85557..2be0e23c1811 100644
--- a/metadata/md5-cache/dev-libs/libdnet-1.12
+++ b/metadata/md5-cache/dev-libs/libdnet-1.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=simplified, portable interface to several low-level networking routines
 EAPI=4
 HOMEPAGE=http://code.google.com/p/libdnet/
@@ -10,5 +10,5 @@ RDEPEND=python? ( =dev-lang/python-2* )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://libdnet.googlecode.com/files/libdnet-1.12.tgz ipv6? ( http://fragroute-ipv6.googlecode.com/files/libdnet-1.12.ipv6-1.patch.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8c8ebe0c06e9a7fc35bee80831551d02
diff --git a/metadata/md5-cache/dev-libs/libdnsres-0.1a-r1 b/metadata/md5-cache/dev-libs/libdnsres-0.1a-r1
index 31ca7949b35a..9feabdefe887 100644
--- a/metadata/md5-cache/dev-libs/libdnsres-0.1a-r1
+++ b/metadata/md5-cache/dev-libs/libdnsres-0.1a-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=dev-libs/libevent || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libevent || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A non-blocking DNS resolver library
 HOMEPAGE=http://www.monkey.org/~provos/libdnsres/
 KEYWORDS=amd64 ~ppc sparc x86
@@ -7,5 +7,5 @@ LICENSE=BSD-4
 RDEPEND=dev-libs/libevent
 SLOT=0
 SRC_URI=http://www.monkey.org/~provos/libdnsres-0.1a.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=40bde48c0170fb9b5b36c7331f91cb27
diff --git a/metadata/md5-cache/dev-libs/libdnsres-0.1a-r2 b/metadata/md5-cache/dev-libs/libdnsres-0.1a-r2
index 6a7d8f99d0aa..d6b7fb4e4a46 100644
--- a/metadata/md5-cache/dev-libs/libdnsres-0.1a-r2
+++ b/metadata/md5-cache/dev-libs/libdnsres-0.1a-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libevent || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libevent || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A non-blocking DNS resolver library
 EAPI=4
 HOMEPAGE=http://www.monkey.org/~provos/libdnsres/
@@ -8,5 +8,5 @@ LICENSE=BSD-4
 RDEPEND=dev-libs/libevent
 SLOT=0
 SRC_URI=http://www.monkey.org/~provos/libdnsres-0.1a.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6649e22306c64519d5aa298dfa0c97fd
diff --git a/metadata/md5-cache/dev-libs/libee-0.3.2-r1 b/metadata/md5-cache/dev-libs/libee-0.3.2-r1
index 8892f0a80af5..0aff26276c90 100644
--- a/metadata/md5-cache/dev-libs/libee-0.3.2-r1
+++ b/metadata/md5-cache/dev-libs/libee-0.3.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxml2 dev-libs/libestr
 SLOT=0
 SRC_URI=http://www.libee.org/files/download/libee-0.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b14254eafd0fb3adf5470004e2c89a7a
diff --git a/metadata/md5-cache/dev-libs/libee-0.3.2-r2 b/metadata/md5-cache/dev-libs/libee-0.3.2-r2
index 48226aded22e..6c0b42479e6e 100644
--- a/metadata/md5-cache/dev-libs/libee-0.3.2-r2
+++ b/metadata/md5-cache/dev-libs/libee-0.3.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libxml2 dev-libs/libestr || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 dev-libs/libestr || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An Event Expression Library inspired by CEE
 EAPI=4
 HOMEPAGE=http://www.libee.org
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxml2 dev-libs/libestr
 SLOT=0
 SRC_URI=http://www.libee.org/files/download/libee-0.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f13f8d7e51bb5c64056ab7b282b7942e
diff --git a/metadata/md5-cache/dev-libs/libee-0.4.1 b/metadata/md5-cache/dev-libs/libee-0.4.1
index 79810db6df75..26a732e9059f 100644
--- a/metadata/md5-cache/dev-libs/libee-0.4.1
+++ b/metadata/md5-cache/dev-libs/libee-0.4.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxml2 dev-libs/libestr
 SLOT=0
 SRC_URI=http://www.libee.org/files/download/libee-0.4.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=256ec1695bb5e721d1f87fbda469d4bd
diff --git a/metadata/md5-cache/dev-libs/libelf-0.8.13-r1 b/metadata/md5-cache/dev-libs/libelf-0.8.13-r1
index 17ce6fcc6025..d7367929e04b 100644
--- a/metadata/md5-cache/dev-libs/libelf-0.8.13-r1
+++ b/metadata/md5-cache/dev-libs/libelf-0.8.13-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A ELF object file access library
 EAPI=3
 HOMEPAGE=http://www.mr511.de/software/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=!dev-libs/elfutils
 SLOT=0
 SRC_URI=http://www.mr511.de/software/libelf-0.8.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=648a681cd32b068cc6f6b112e092722c
diff --git a/metadata/md5-cache/dev-libs/libev-4.04 b/metadata/md5-cache/dev-libs/libev-4.04
index bfe70759c358..a646222e146e 100644
--- a/metadata/md5-cache/dev-libs/libev-4.04
+++ b/metadata/md5-cache/dev-libs/libev-4.04
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A high-performance event loop/event model with lots of feature
 EAPI=3
 HOMEPAGE=http://software.schmorp.de/pkg/libev.html
@@ -9,5 +9,5 @@ LICENSE=|| ( BSD GPL-2 )
 RDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )
 SLOT=0
 SRC_URI=http://dist.schmorp.de/libev/libev-4.04.tar.gz http://dist.schmorp.de/libev/Attic/libev-4.04.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0afdb35a596b20c43dee235c274e90cb
diff --git a/metadata/md5-cache/dev-libs/libev-4.11 b/metadata/md5-cache/dev-libs/libev-4.11
index 7ca7a5d166ea..e57f8b521a5b 100644
--- a/metadata/md5-cache/dev-libs/libev-4.11
+++ b/metadata/md5-cache/dev-libs/libev-4.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A high-performance event loop/event model with lots of feature
 EAPI=3
 HOMEPAGE=http://software.schmorp.de/pkg/libev.html
@@ -9,5 +9,5 @@ LICENSE=|| ( BSD GPL-2 )
 RDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )
 SLOT=0
 SRC_URI=http://dist.schmorp.de/libev/libev-4.11.tar.gz http://dist.schmorp.de/libev/Attic/libev-4.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ff92b1c95e63c9623b329be2f614ff23
diff --git a/metadata/md5-cache/dev-libs/libev-4.11-r1 b/metadata/md5-cache/dev-libs/libev-4.11-r1
index 5b305babedcf..ce45d93b20af 100644
--- a/metadata/md5-cache/dev-libs/libev-4.11-r1
+++ b/metadata/md5-cache/dev-libs/libev-4.11-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A high-performance event loop/event model with lots of feature
 EAPI=5
 HOMEPAGE=http://software.schmorp.de/pkg/libev.html
@@ -9,5 +9,5 @@ LICENSE=|| ( BSD GPL-2 )
 RDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )
 SLOT=0
 SRC_URI=http://dist.schmorp.de/libev/libev-4.11.tar.gz http://dist.schmorp.de/libev/Attic/libev-4.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=25f14c98ca488f2b77612f506c6d61c4
diff --git a/metadata/md5-cache/dev-libs/libev-4.15 b/metadata/md5-cache/dev-libs/libev-4.15
index 12a9b9b871d0..4edfb04e6a97 100644
--- a/metadata/md5-cache/dev-libs/libev-4.15
+++ b/metadata/md5-cache/dev-libs/libev-4.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A high-performance event loop/event model with lots of feature
 EAPI=5
 HOMEPAGE=http://software.schmorp.de/pkg/libev.html
@@ -9,5 +9,5 @@ LICENSE=|| ( BSD GPL-2 )
 RDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )
 SLOT=0
 SRC_URI=http://dist.schmorp.de/libev/libev-4.15.tar.gz http://dist.schmorp.de/libev/Attic/libev-4.15.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a813bd64dc7e3692face6e00978cd267
diff --git a/metadata/md5-cache/dev-libs/libexplain-0.52 b/metadata/md5-cache/dev-libs/libexplain-0.52
index f4ae7c84c2e4..d6a23b1f4107 100644
--- a/metadata/md5-cache/dev-libs/libexplain-0.52
+++ b/metadata/md5-cache/dev-libs/libexplain-0.52
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/libcap >=sys-libs/glibc-2.11 sys-process/lsof >=sys-kernel/linux-headers-2.6.35 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/libcap >=sys-libs/glibc-2.11 sys-process/lsof >=sys-kernel/linux-headers-2.6.35 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library which may be used to explain Unix and Linux system call errors
 EAPI=4
 HOMEPAGE=http://libexplain.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=sys-libs/libcap >=sys-libs/glibc-2.11 sys-process/lsof
 SLOT=0
 SRC_URI=http://libexplain.sourceforge.net/libexplain-0.52.D001.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8ef748c8482f5cc867808331252e5fb3
diff --git a/metadata/md5-cache/dev-libs/libexplain-1.0 b/metadata/md5-cache/dev-libs/libexplain-1.0
index 554bbaf0d907..e688692e6cef 100644
--- a/metadata/md5-cache/dev-libs/libexplain-1.0
+++ b/metadata/md5-cache/dev-libs/libexplain-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/libcap >=sys-libs/glibc-2.11 sys-process/lsof >=sys-kernel/linux-headers-2.6.35 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/libcap >=sys-libs/glibc-2.11 sys-process/lsof >=sys-kernel/linux-headers-2.6.35 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library which may be used to explain Unix and Linux system call errors
 EAPI=4
 HOMEPAGE=http://libexplain.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=sys-libs/libcap >=sys-libs/glibc-2.11 sys-process/lsof
 SLOT=0
 SRC_URI=http://libexplain.sourceforge.net/libexplain-1.0.D001.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=77e1fd14860d2e2ed83f2651385c3b9a
diff --git a/metadata/md5-cache/dev-libs/libexplain-1.1 b/metadata/md5-cache/dev-libs/libexplain-1.1
index 76093c7443bd..9b98c421919c 100644
--- a/metadata/md5-cache/dev-libs/libexplain-1.1
+++ b/metadata/md5-cache/dev-libs/libexplain-1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/libcap >=sys-libs/glibc-2.11 sys-process/lsof >=sys-kernel/linux-headers-2.6.35 doc? ( app-text/ghostscript-gpl sys-apps/groff ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/libcap >=sys-libs/glibc-2.11 sys-process/lsof >=sys-kernel/linux-headers-2.6.35 doc? ( app-text/ghostscript-gpl sys-apps/groff ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library which may be used to explain Unix and Linux system call errors
 EAPI=5
 HOMEPAGE=http://libexplain.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=sys-libs/libcap >=sys-libs/glibc-2.11 sys-process/lsof
 SLOT=0
 SRC_URI=http://libexplain.sourceforge.net/libexplain-1.1.D001.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a0f79005b77ad2cead22187fa1eaae11
diff --git a/metadata/md5-cache/dev-libs/libg15-9999 b/metadata/md5-cache/dev-libs/libg15-9999
index ac5a0f8d34f6..4c5670abd1ac 100644
--- a/metadata/md5-cache/dev-libs/libg15-9999
+++ b/metadata/md5-cache/dev-libs/libg15-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install preinst prepare unpack
-DEPEND==virtual/libusb-0* || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==virtual/libusb-0* || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The libg15 library gives low-level access to the Logitech G15 keyboard
 EAPI=4
 HOMEPAGE=http://g15tools.sourceforge.net/
 LICENSE=GPL-2
 RDEPEND==virtual/libusb-0*
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=acdb7fba4e185ea0e8a801d6399f8c4a
diff --git a/metadata/md5-cache/dev-libs/libg15render-9999 b/metadata/md5-cache/dev-libs/libg15render-9999
index 873d3851e8e4..d040122aaf22 100644
--- a/metadata/md5-cache/dev-libs/libg15render-9999
+++ b/metadata/md5-cache/dev-libs/libg15render-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare unpack
-DEPEND=dev-libs/libg15 truetype? ( media-libs/freetype ) || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libg15 truetype? ( media-libs/freetype ) || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Small library for display text and graphics on a Logitech G15 keyboard
 EAPI=4
 HOMEPAGE=http://g15tools.sourceforge.net/
@@ -7,5 +7,5 @@ IUSE=truetype
 LICENSE=GPL-2
 RDEPEND=dev-libs/libg15 truetype? ( media-libs/freetype )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9d2f3b98b94d87ef60dc777f658143fc
diff --git a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r2 b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r2
index ae32c423d764..14cea778cdbb 100644
--- a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r2
+++ b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=!app-admin/fam !<app-admin/gamin-0.1.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=!app-admin/fam !<app-admin/gamin-0.1.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Library providing the FAM File Alteration Monitor API
 EAPI=3
 HOMEPAGE=http://www.gnome.org/~veillard/gamin/
@@ -10,5 +10,5 @@ RDEPEND=!app-admin/fam !<app-admin/gamin-0.1.10 python? ( =dev-lang/python-2* )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 http://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2 http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d34bcc770e06ba8e4022b1d78ff495ae
diff --git a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r3 b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r3
index f291e6510787..cc04e6d4df11 100644
--- a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r3
+++ b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=!app-admin/fam !<app-admin/gamin-0.1.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=!app-admin/fam !<app-admin/gamin-0.1.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Library providing the FAM File Alteration Monitor API
 EAPI=4
 HOMEPAGE=http://www.gnome.org/~veillard/gamin/
@@ -10,5 +10,5 @@ RDEPEND=!app-admin/fam !<app-admin/gamin-0.1.10 python? ( =dev-lang/python-2* )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 http://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2 http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2bd5748e594d5f8da59fec630ab2df99
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.4.6 b/metadata/md5-cache/dev-libs/libgcrypt-1.4.6
index fde77b93815f..14d91ff84650 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.4.6
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.4.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libgpg-error-1.5 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libgpg-error-1.5 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=3
 HOMEPAGE=http://www.gnupg.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libgpg-error-1.5
 SLOT=0
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.4.6.tar.bz2 ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.4.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=efa06c295384fa1e4e2c260b8a465727
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.4.6-r1 b/metadata/md5-cache/dev-libs/libgcrypt-1.4.6-r1
index 4d4cd6115102..5a0fcef59966 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.4.6-r1
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.4.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libgpg-error-1.5 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libgpg-error-1.5 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=3
 HOMEPAGE=http://www.gnupg.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libgpg-error-1.5
 SLOT=0
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.4.6.tar.bz2 ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.4.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=64703804ce6a38de4b79cdcf8fc5f25b
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.5.0 b/metadata/md5-cache/dev-libs/libgcrypt-1.5.0
index 44f3b047ad2a..b953fbac0118 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.5.0
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libgpg-error-1.8 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libgpg-error-1.8 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=3
 HOMEPAGE=http://www.gnupg.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.5.0.tar.bz2 ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=57c7f6e34b9a3db87880fc2b81904b9a
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.5.0-r1 b/metadata/md5-cache/dev-libs/libgcrypt-1.5.0-r1
index 389178f28b60..a3fca91409ab 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.5.0-r1
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.5.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libgpg-error-1.8 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libgpg-error-1.8 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=4
 HOMEPAGE=http://www.gnupg.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.5.0.tar.bz2 ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0965915602ed41015bf19488c5defaf3
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.5.0-r2 b/metadata/md5-cache/dev-libs/libgcrypt-1.5.0-r2
index d40af700cdca..8e3a99bd8f4b 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.5.0-r2
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.5.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libgpg-error-1.8 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libgpg-error-1.8 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=4
 HOMEPAGE=http://www.gnupg.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=45334472a232d59bad24d17a7bcc471a
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.5.0-r3 b/metadata/md5-cache/dev-libs/libgcrypt-1.5.0-r3
index cec8d11e149a..278767160819 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.5.0-r3
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.5.0-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libgpg-error-1.8 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libgpg-error-1.8 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=4
 HOMEPAGE=http://www.gnupg.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=386487a030a5e5f9133721ca7e195fe6
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.5.0-r4 b/metadata/md5-cache/dev-libs/libgcrypt-1.5.0-r4
index 754980f510a2..6ab2dd3da4d8 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.5.0-r4
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.5.0-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libgpg-error-1.8 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libgpg-error-1.8 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=4
 HOMEPAGE=http://www.gnupg.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed418e66481b26b989721aec925ff7b8
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.5.1 b/metadata/md5-cache/dev-libs/libgcrypt-1.5.1
index 73393efe3a47..febe30f437f9 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.5.1
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libgpg-error-1.8 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libgpg-error-1.8 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=5
 HOMEPAGE=http://www.gnupg.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0/11
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.5.1.tar.bz2 ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.1.tar.bz2 mirror://gentoo/libgcrypt-1.5.0-idea.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e4299f9c9306dd0e7df500ce8c82f40c
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.13.2-r2 b/metadata/md5-cache/dev-libs/libgdata-0.13.2-r2
index 03b14ae47ba6..b3955275f29c 100644
--- a/metadata/md5-cache/dev-libs/libgdata-0.13.2-r2
+++ b/metadata/md5-cache/dev-libs/libgdata-0.13.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.31:2 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.37.91:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 gnome? ( app-crypt/gcr:= >=net-libs/gnome-online-accounts-3.2 >=net-libs/libsoup-gnome-2.37.91:2.4[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40 >=gnome-base/gnome-common-3.6 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.31:2 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.37.91:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 gnome? ( app-crypt/gcr:= >=net-libs/gnome-online-accounts-3.2 >=net-libs/libsoup-gnome-2.37.91:2.4[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40 >=gnome-base/gnome-common-3.6 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GLib-based library for accessing online service APIs using the GData protocol
 EAPI=5
 HOMEPAGE=http://live.gnome.org/libgdata
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.31:2 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.37.91:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 gnome? ( app-crypt/gcr:= >=net-libs/gnome-online-accounts-3.2 >=net-libs/libsoup-gnome-2.37.91:2.4[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
 SLOT=0/13
 SRC_URI=mirror://gnome/sources/libgdata/0.13/libgdata-0.13.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4a59a56fdb783e54d1409c78afcef79f
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.8.1-r2 b/metadata/md5-cache/dev-libs/libgdata-0.8.1-r2
index bb9bbf7fae1a..53968e5e5f87 100644
--- a/metadata/md5-cache/dev-libs/libgdata-0.8.1-r2
+++ b/metadata/md5-cache/dev-libs/libgdata-0.8.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/gtk-doc-am-1.14 >=dev-util/intltool-0.40 gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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/gtk-doc-am-1.14 >=dev-util/intltool-0.40 gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=GLib-based library for accessing online service APIs using the GData protocol
 EAPI=3
 HOMEPAGE=http://live.gnome.org/libgdata
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgdata/0.8/libgdata-0.8.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=662831ea7ddd6edf4fb88d5ea811c531
diff --git a/metadata/md5-cache/dev-libs/libgweather-2.30.3 b/metadata/md5-cache/dev-libs/libgweather-2.30.3
index e129ef348a96..333ab316e624 100644
--- a/metadata/md5-cache/dev-libs/libgweather-2.30.3
+++ b/metadata/md5-cache/dev-libs/libgweather-2.30.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 virtual/pkgconfig >=dev-util/gtk-doc-am-1.9 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( =dev-lang/python-2* )
+DEPEND=>=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 virtual/pkgconfig >=dev-util/gtk-doc-am-1.9 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( =dev-lang/python-2* )
 DESCRIPTION=Library to access weather information from online services
 EAPI=4
 HOMEPAGE=https://live.gnome.org/LibGWeather
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=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* )
 SLOT=2
 SRC_URI=mirror://gnome/sources/libgweather/2.30/libgweather-2.30.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6c8db96b94fdceb25fe038acd0aaec5a
diff --git a/metadata/md5-cache/dev-libs/libhid-0.2.16-r3 b/metadata/md5-cache/dev-libs/libhid-0.2.16-r3
index 2e459a6f8550..ac28cfbca9a8 100644
--- a/metadata/md5-cache/dev-libs/libhid-0.2.16-r3
+++ b/metadata/md5-cache/dev-libs/libhid-0.2.16-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=virtual/libusb:0 doc? ( app-doc/doxygen ) python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=virtual/libusb:0 doc? ( app-doc/doxygen ) python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Provides a generic and flexible way to access and interact with USB HID devices
 EAPI=2
 HOMEPAGE=http://libhid.alioth.debian.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://beta.magicaltux.net/libhid-0.2.16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=b2551d98038ad07043d25984c18bde66
diff --git a/metadata/md5-cache/dev-libs/libhome-0.10.2 b/metadata/md5-cache/dev-libs/libhome-0.10.2
index f25337b8592c..771738ae4187 100644
--- a/metadata/md5-cache/dev-libs/libhome-0.10.2
+++ b/metadata/md5-cache/dev-libs/libhome-0.10.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=berkdb? ( >=sys-libs/db-4 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-server ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=berkdb? ( >=sys-libs/db-4 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-server ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=libhome is a library providing a getpwnam() emulation
 HOMEPAGE=http://pll.sourceforge.net
 IUSE=berkdb ldap mysql pam postgres
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=berkdb? ( >=sys-libs/db-4 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-server )
 SLOT=0
 SRC_URI=mirror://sourceforge/pll/libhome-0.10.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c1179127cf81e414cd6cb2c3966365b8
diff --git a/metadata/md5-cache/dev-libs/libindicate-12.10.0 b/metadata/md5-cache/dev-libs/libindicate-12.10.0
index 8b48ac73078a..940e00d7761d 100644
--- a/metadata/md5-cache/dev-libs/libindicate-12.10.0
+++ b/metadata/md5-cache/dev-libs/libindicate-12.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libdbusmenu-0.6.2:3[gtk?,introspection?] dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3 ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libindicate-0.6.1-r201 dev-util/gtk-doc-am gnome-base/gnome-common app-text/gnome-doc-utils dev-lang/vala:0.16[vapigen] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libdbusmenu-0.6.2:3[gtk?,introspection?] dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3 ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libindicate-0.6.1-r201 dev-util/gtk-doc-am gnome-base/gnome-common app-text/gnome-doc-utils dev-lang/vala:0.16[vapigen] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library to raise flags on DBus for other components of the desktop to pick up and visualize
 EAPI=4
 HOMEPAGE=http://launchpad.net/libindicate
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libdbusmenu-0
 RESTRICT=test
 SLOT=3
 SRC_URI=http://launchpad.net/libindicate/12.10/12.10.0/+download/libindicate-12.10.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f2115566db5d585a4508a1b192a5ec0a
diff --git a/metadata/md5-cache/dev-libs/libindicate-12.10.1 b/metadata/md5-cache/dev-libs/libindicate-12.10.1
index 1d13473bc257..03e39e43d7c9 100644
--- a/metadata/md5-cache/dev-libs/libindicate-12.10.1
+++ b/metadata/md5-cache/dev-libs/libindicate-12.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libdbusmenu-0.6.2:3[gtk?,introspection?] dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3 ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libindicate-0.6.1-r201 dev-util/gtk-doc-am gnome-base/gnome-common app-text/gnome-doc-utils dev-lang/vala:0.16[vapigen] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libdbusmenu-0.6.2:3[gtk?,introspection?] dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3 ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libindicate-0.6.1-r201 dev-util/gtk-doc-am gnome-base/gnome-common app-text/gnome-doc-utils dev-lang/vala:0.16[vapigen] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library to raise flags on DBus for other components of the desktop to pick up and visualize
 EAPI=5
 HOMEPAGE=http://launchpad.net/libindicate
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libdbusmenu-0
 RESTRICT=test
 SLOT=3
 SRC_URI=http://launchpad.net/libindicate/12.10/12.10.1/+download/libindicate-12.10.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fdc67b9cfc4ab498b267a1a18171f721
diff --git a/metadata/md5-cache/dev-libs/libixion-9999 b/metadata/md5-cache/dev-libs/libixion-9999
index 678c2fe1f05a..9c0dbf17247b 100644
--- a/metadata/md5-cache/dev-libs/libixion-9999
+++ b/metadata/md5-cache/dev-libs/libixion-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=dev-util/mdds-0.7.1 dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-util/mdds-0.7.1 dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=General purpose formula parser & interpreter
 EAPI=5
 HOMEPAGE=http://gitorious.org/ixion/pages/Home
 IUSE=static-libs
 LICENSE=MIT
 SLOT=0/0.5
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b14c179f6ea8ae375d9db01a226cad4a
diff --git a/metadata/md5-cache/dev-libs/libjwc_c-1.1-r2 b/metadata/md5-cache/dev-libs/libjwc_c-1.1-r2
index 7c5400c064d1..7917a996c7ec 100644
--- a/metadata/md5-cache/dev-libs/libjwc_c-1.1-r2
+++ b/metadata/md5-cache/dev-libs/libjwc_c-1.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/ccp4-libs || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ccp4-libs || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=additional c library for ccp4
 EAPI=4
 HOMEPAGE=http://www.ccp4.ac.uk/main.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-libs/ccp4-libs
 SLOT=0
 SRC_URI=ftp://ftp.ccp4.ac.uk/jwc/libjwc_c-1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=032f7c28f179280e5120fadf35d34b53
diff --git a/metadata/md5-cache/dev-libs/libjwc_f-1.1-r2 b/metadata/md5-cache/dev-libs/libjwc_f-1.1-r2
index 59ffd35b35ef..768fb67c2574 100644
--- a/metadata/md5-cache/dev-libs/libjwc_f-1.1-r2
+++ b/metadata/md5-cache/dev-libs/libjwc_f-1.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/libjwc_c sci-libs/ccp4-libs || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=dev-libs/libjwc_c sci-libs/ccp4-libs || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Additional fortran library for ccp4
 EAPI=4
 HOMEPAGE=http://www.ccp4.ac.uk/main.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libjwc_c sci-libs/ccp4-libs virtual/fortran
 SLOT=0
 SRC_URI=ftp://ftp.ccp4.ac.uk/jwc/libjwc_f-1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5df3187fc42060280fe5757b64f71826
diff --git a/metadata/md5-cache/dev-libs/libksba-1.3.0 b/metadata/md5-cache/dev-libs/libksba-1.3.0
index 288aa079ecec..f1a57352430e 100644
--- a/metadata/md5-cache/dev-libs/libksba-1.3.0
+++ b/metadata/md5-cache/dev-libs/libksba-1.3.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3+ GPL-2+ GPL-3
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libksba/libksba-1.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2c01eb09a3b3c49e991f2843e7b4ed2d
diff --git a/metadata/md5-cache/dev-libs/liblist-2.4 b/metadata/md5-cache/dev-libs/liblist-2.4
index a966bd464446..fc4d2f698140 100644
--- a/metadata/md5-cache/dev-libs/liblist-2.4
+++ b/metadata/md5-cache/dev-libs/liblist-2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=doc? ( media-gfx/transfig dev-texlive/texlive-metapost virtual/latex-base )
 SLOT=0
 SRC_URI=ftp://ohnopublishing.net/mirror/liblist-2.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1e8da077e84ff1872f2554989ea40126
diff --git a/metadata/md5-cache/dev-libs/liblognorm-0.3.2-r1 b/metadata/md5-cache/dev-libs/liblognorm-0.3.2-r1
index 41427dccf5a7..afccf84aff48 100644
--- a/metadata/md5-cache/dev-libs/liblognorm-0.3.2-r1
+++ b/metadata/md5-cache/dev-libs/liblognorm-0.3.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libestr dev-libs/libee || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libestr dev-libs/libee || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Fast samples-based log normalization library
 EAPI=4
 HOMEPAGE=http://www.liblognorm.com
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libestr dev-libs/libee
 SLOT=0
 SRC_URI=http://www.liblognorm.com/files/download/liblognorm-0.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=16f8a00ad651076c930df3f7da51d1bd
diff --git a/metadata/md5-cache/dev-libs/liblognorm-0.3.3 b/metadata/md5-cache/dev-libs/liblognorm-0.3.3
index daa039267f03..c31eecb51a79 100644
--- a/metadata/md5-cache/dev-libs/liblognorm-0.3.3
+++ b/metadata/md5-cache/dev-libs/liblognorm-0.3.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libestr dev-libs/libee
 SLOT=0
 SRC_URI=http://www.liblognorm.com/files/download/liblognorm-0.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6464e2661e3ab1339de770938b179b93
diff --git a/metadata/md5-cache/dev-libs/liblognorm-0.3.4 b/metadata/md5-cache/dev-libs/liblognorm-0.3.4
index 701a00be0a54..de84b063ee77 100644
--- a/metadata/md5-cache/dev-libs/liblognorm-0.3.4
+++ b/metadata/md5-cache/dev-libs/liblognorm-0.3.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libestr dev-libs/libee
 SLOT=0
 SRC_URI=http://www.liblognorm.com/files/download/liblognorm-0.3.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d0bead7efb98bfe7117909e827ad3df7
diff --git a/metadata/md5-cache/dev-libs/liblognorm-0.3.5 b/metadata/md5-cache/dev-libs/liblognorm-0.3.5
index faf2b4d1a767..94bd03e45197 100644
--- a/metadata/md5-cache/dev-libs/liblognorm-0.3.5
+++ b/metadata/md5-cache/dev-libs/liblognorm-0.3.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libestr dev-libs/libee
 SLOT=0
 SRC_URI=http://www.liblognorm.com/files/download/liblognorm-0.3.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2c9e7e9dce9cb7f89bff8b03df7561ed
diff --git a/metadata/md5-cache/dev-libs/liblognorm-0.3.6 b/metadata/md5-cache/dev-libs/liblognorm-0.3.6
index 5b334c37d09a..e3a403fbde5b 100644
--- a/metadata/md5-cache/dev-libs/liblognorm-0.3.6
+++ b/metadata/md5-cache/dev-libs/liblognorm-0.3.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libestr-0.1.3 >=dev-libs/libee-0.3.2
 SLOT=0
 SRC_URI=http://www.liblognorm.com/files/download/liblognorm-0.3.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=63d7ca8318b3e40170d48bc815790369
diff --git a/metadata/md5-cache/dev-libs/libmail-0.3-r3 b/metadata/md5-cache/dev-libs/libmail-0.3-r3
index 79833f6174d9..c1a8988db4a7 100644
--- a/metadata/md5-cache/dev-libs/libmail-0.3-r3
+++ b/metadata/md5-cache/dev-libs/libmail-0.3-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=gnutls? ( >=net-libs/gnutls-2 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gnutls? ( >=net-libs/gnutls-2 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A mail handling library
 EAPI=5
 HOMEPAGE=http://libmail.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=gnutls? ( >=net-libs/gnutls-2 ) sasl? ( >=dev-libs/cyrus-sasl-2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libmail/libmail-0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f4c7841675834abb9487bfc7b016cc50
diff --git a/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r2 b/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r2
index 9994f79feb04..f54d598e8922 100644
--- a/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r2
+++ b/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=libmcrypt is a library that provides uniform interface to access several encryption algorithms.
 EAPI=3
 HOMEPAGE=http://mcrypt.sourceforge.net/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/mcrypt/libmcrypt-2.5.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=588e2354084cb0e4ef7fe8b9e556d5cd
diff --git a/metadata/md5-cache/dev-libs/libmemcache-1.4.0_rc2-r1 b/metadata/md5-cache/dev-libs/libmemcache-1.4.0_rc2-r1
index 3c5d83f91438..1dfafac7b33f 100644
--- a/metadata/md5-cache/dev-libs/libmemcache-1.4.0_rc2-r1
+++ b/metadata/md5-cache/dev-libs/libmemcache-1.4.0_rc2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C API for memcached
 EAPI=3
 HOMEPAGE=http://people.freebsd.org/~seanc/libmemcache/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~sparc-fbsd ~amd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://people.freebsd.org/~seanc/libmemcache/libmemcache-1.4.0.rc2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8af6fddb692d1fb6cb7da752a9459e6e
diff --git a/metadata/md5-cache/dev-libs/libmemcached-0.50 b/metadata/md5-cache/dev-libs/libmemcached-0.50
index b877d3a09287..cfae18eb7425 100644
--- a/metadata/md5-cache/dev-libs/libmemcached-0.50
+++ b/metadata/md5-cache/dev-libs/libmemcached-0.50
@@ -4,10 +4,10 @@ DESCRIPTION=a C client library to the memcached server
 EAPI=3
 HOMEPAGE=http://tangent.org/552/libmemcached.html
 IUSE=debug doc hsieh +libevent sasl static-libs tcmalloc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=net-misc/memcached virtual/perl-PodParser doc? ( dev-python/sphinx ) libevent? ( dev-libs/libevent ) tcmalloc? ( dev-util/google-perftools ) sasl? ( virtual/gsasl )
 SLOT=0
 SRC_URI=http://launchpad.net/libmemcached/1.0/0.50/+download/libmemcached-0.50.tar.gz
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=082d13a8a6ff114a6216eb51efd2547c
+_md5_=6a52a22e0991ce20247bea038f631684
diff --git a/metadata/md5-cache/dev-libs/libmirage-1.5.0-r1 b/metadata/md5-cache/dev-libs/libmirage-1.5.0-r1
index 2878177766de..c6835997078f 100644
--- a/metadata/md5-cache/dev-libs/libmirage-1.5.0-r1
+++ b/metadata/md5-cache/dev-libs/libmirage-1.5.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.28:2 >=media-libs/libsndfile-1.0 sys-libs/zlib dev-util/gtk-doc-am virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.28:2 >=media-libs/libsndfile-1.0 sys-libs/zlib dev-util/gtk-doc-am virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=CD and DVD image access library
 EAPI=4
 HOMEPAGE=http://cdemu.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.28:2 >=media-libs/libsndfile-1.0 sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/cdemu/libmirage-1.5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=815599fd510270b45374ba74cb2fe16c
diff --git a/metadata/md5-cache/dev-libs/libmix-2.05-r6 b/metadata/md5-cache/dev-libs/libmix-2.05-r6
index 876af5f1457d..8a20b971b59b 100644
--- a/metadata/md5-cache/dev-libs/libmix-2.05-r6
+++ b/metadata/md5-cache/dev-libs/libmix-2.05-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Programs Crypto/Network/Multipurpose Library
 EAPI=2
 HOMEPAGE=http://mixter.void.ru/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-f
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://mixter.void.ru/libmix-205.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=663a54087bc7327d89b1aade9d07856a
diff --git a/metadata/md5-cache/dev-libs/libnatspec-0.2.6 b/metadata/md5-cache/dev-libs/libnatspec-0.2.6
index 5c870ca039b3..88b8a754a7d5 100644
--- a/metadata/md5-cache/dev-libs/libnatspec-0.2.6
+++ b/metadata/md5-cache/dev-libs/libnatspec-0.2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=python? ( >=dev-lang/python-2.3 ) dev-libs/popt doc? ( app-doc/doxygen ) python? ( dev-lang/tcl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=python? ( >=dev-lang/python-2.3 ) dev-libs/popt doc? ( app-doc/doxygen ) python? ( dev-lang/tcl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=library to smooth charset/localization issues
 EAPI=2
 HOMEPAGE=http://natspec.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=python? ( >=dev-lang/python-2.3 ) dev-libs/popt
 SLOT=0
 SRC_URI=mirror://sourceforge/natspec/libnatspec-0.2.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0fb9c0299ae93ac95d2a3ea0530ee353
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.3.0 b/metadata/md5-cache/dev-libs/liborcus-0.3.0
index 140796fffde9..c136f3f08685 100644
--- a/metadata/md5-cache/dev-libs/liborcus-0.3.0
+++ b/metadata/md5-cache/dev-libs/liborcus-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/boost-1.51.0 dev-libs/libzip >=dev-util/mdds-0.6.0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/boost-1.51.0 dev-libs/libzip >=dev-util/mdds-0.6.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Standalone file import filter library for spreadsheet documents
 EAPI=4
 HOMEPAGE=http://gitorious.org/orcus/pages/Home
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.51.0 dev-libs/libzip
 SLOT=0
 SRC_URI=http://kohei.us/files/orcus/src/liborcus_0.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=a1d48bdf17bb7a98c1ec71563a593a9a
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.5.1 b/metadata/md5-cache/dev-libs/liborcus-0.5.1
index 525c7ee8302d..d10681063a17 100644
--- a/metadata/md5-cache/dev-libs/liborcus-0.5.1
+++ b/metadata/md5-cache/dev-libs/liborcus-0.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/boost-1.51.0 >=dev-libs/libixion-0.5.0:= >=dev-util/mdds-0.7.1
+DEPEND=>=dev-libs/boost-1.51.0 >=dev-libs/libixion-0.5.0:= sys-libs/zlib >=dev-util/mdds-0.7.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Standalone file import filter library for spreadsheet documents
 EAPI=5
 HOMEPAGE=http://gitorious.org/orcus/pages/Home
 IUSE=static-libs
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=MIT
-RDEPEND=>=dev-libs/boost-1.51.0 >=dev-libs/libixion-0.5.0:=
+RDEPEND=>=dev-libs/boost-1.51.0 >=dev-libs/libixion-0.5.0:= sys-libs/zlib
 SLOT=0/0.5
 SRC_URI=http://kohei.us/files/orcus/src/liborcus-0.5.1.tar.bz2
-_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b844c294ba25c18964a5639e606cc9ba
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=12c624d636ec44bd25bf24efdc474351
diff --git a/metadata/md5-cache/dev-libs/liborcus-9999 b/metadata/md5-cache/dev-libs/liborcus-9999
index 3b25915ff51f..836128364800 100644
--- a/metadata/md5-cache/dev-libs/liborcus-9999
+++ b/metadata/md5-cache/dev-libs/liborcus-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=dev-libs/boost-1.51.0 >=dev-libs/libixion-0.5.0:= >=dev-util/mdds-0.7.1 dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/boost-1.51.0 >=dev-libs/libixion-0.5.0:= >=dev-util/mdds-0.7.1 dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Standalone file import filter library for spreadsheet documents
 EAPI=5
 HOMEPAGE=http://gitorious.org/orcus/pages/Home
@@ -7,5 +7,5 @@ IUSE=static-libs
 LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.51.0 >=dev-libs/libixion-0.5.0:=
 SLOT=0/0.5
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6698dcdd3200909e63d8e62b2e65ac78
diff --git a/metadata/md5-cache/dev-libs/libotf-0.9.13 b/metadata/md5-cache/dev-libs/libotf-0.9.13
index 0da5c2d1d562..20108fcbee30 100644
--- a/metadata/md5-cache/dev-libs/libotf-0.9.13
+++ b/metadata/md5-cache/dev-libs/libotf-0.9.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/freetype-2.4.9 X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXt ) X? ( x11-libs/libICE x11-libs/libXmu x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/freetype-2.4.9 X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXt ) X? ( x11-libs/libICE x11-libs/libXmu x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for handling OpenType fonts (OTF)
 EAPI=5
 HOMEPAGE=http://www.nongnu.org/m17n/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/freetype-2.4.9 X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXt )
 SLOT=0
 SRC_URI=mirror://nongnu/m17n/libotf-0.9.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=280ba58018cddfdf7a2d8a1ef64e3942
diff --git a/metadata/md5-cache/dev-libs/libotf-0.9.8 b/metadata/md5-cache/dev-libs/libotf-0.9.8
index 25a0968fa8b7..17fc8887ae75 100644
--- a/metadata/md5-cache/dev-libs/libotf-0.9.8
+++ b/metadata/md5-cache/dev-libs/libotf-0.9.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=>=media-libs/freetype-2.1 X? ( x11-libs/libXaw x11-libs/libICE ) >=sys-apps/sed-4 virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/freetype-2.1 X? ( x11-libs/libXaw x11-libs/libICE ) >=sys-apps/sed-4 virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for handling OpenType fonts (OTF)
 HOMEPAGE=http://www.m17n.org/libotf/
 IUSE=X
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/freetype-2.1 X? ( x11-libs/libXaw x11-libs/libICE )
 SLOT=0
 SRC_URI=http://www.m17n.org/libotf/libotf-0.9.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=d419d1f2e5406bc5fff22a7bf7730d0e
diff --git a/metadata/md5-cache/dev-libs/libp11-0.2.8-r1 b/metadata/md5-cache/dev-libs/libp11-0.2.8-r1
index 16bdea62e1ef..3d06179d1a14 100644
--- a/metadata/md5-cache/dev-libs/libp11-0.2.8-r1
+++ b/metadata/md5-cache/dev-libs/libp11-0.2.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/openssl virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library implementing a layer on top of PKCS#11 API to make using PKCS#11 implementations easier.
 EAPI=4
 HOMEPAGE=http://www.opensc-project.org/libp11/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/openssl
 SLOT=0
 SRC_URI=http://www.opensc-project.org/files/libp11/libp11-0.2.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=965f77b7e60d6245feceb5b6deaec247
diff --git a/metadata/md5-cache/dev-libs/libpcre-7.9-r1 b/metadata/md5-cache/dev-libs/libpcre-7.9-r1
index 66e7ef1e2da2..5f6a1a1e5770 100644
--- a/metadata/md5-cache/dev-libs/libpcre-7.9-r1
+++ b/metadata/md5-cache/dev-libs/libpcre-7.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Perl-compatible regular expression library
 EAPI=2
 HOMEPAGE=http://www.pcre.org/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib )
 SLOT=3
 SRC_URI=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d4b68d0820e6c128abf3be7b80ad34d7
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.21 b/metadata/md5-cache/dev-libs/libpcre-8.21
index 933eee08b060..fd8517d48862 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.21
+++ b/metadata/md5-cache/dev-libs/libpcre-8.21
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline ) virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline ) virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Perl-compatible regular expression library
 EAPI=4
 HOMEPAGE=http://www.pcre.org/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.21.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b399f6a843c993a6d60f3512d7a3b7f5
diff --git a/metadata/md5-cache/dev-libs/libpipeline-1.2.1 b/metadata/md5-cache/dev-libs/libpipeline-1.2.1
index 441a5d894b43..012b080c17f3 100644
--- a/metadata/md5-cache/dev-libs/libpipeline-1.2.1
+++ b/metadata/md5-cache/dev-libs/libpipeline-1.2.1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://nongnu/libpipeline/libpipeline-1.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dc57beb01fb671815e77b3ac5a40b53f
diff --git a/metadata/md5-cache/dev-libs/libpipeline-1.2.2 b/metadata/md5-cache/dev-libs/libpipeline-1.2.2
index a129ca032278..15940e3fafb7 100644
--- a/metadata/md5-cache/dev-libs/libpipeline-1.2.2
+++ b/metadata/md5-cache/dev-libs/libpipeline-1.2.2
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://nongnu/libpipeline/libpipeline-1.2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=03f734c0417acf7b84db0676694edf5c
diff --git a/metadata/md5-cache/dev-libs/libpthread-stubs-0.1 b/metadata/md5-cache/dev-libs/libpthread-stubs-0.1
index 7f693e71e57d..942fad1addaa 100644
--- a/metadata/md5-cache/dev-libs/libpthread-stubs-0.1
+++ b/metadata/md5-cache/dev-libs/libpthread-stubs-0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Pthread functions stubs for platforms missing them
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-f
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=b19a4eab231b47e74c9662d8c3485ef7
diff --git a/metadata/md5-cache/dev-libs/libpthread-stubs-0.3 b/metadata/md5-cache/dev-libs/libpthread-stubs-0.3
index 002414731444..a320555db168 100644
--- a/metadata/md5-cache/dev-libs/libpthread-stubs-0.3
+++ b/metadata/md5-cache/dev-libs/libpthread-stubs-0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Pthread functions stubs for platforms missing them
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=914dc2df8147c75355d3671e4a579b38
diff --git a/metadata/md5-cache/dev-libs/libpthread-stubs-0.3-r1 b/metadata/md5-cache/dev-libs/libpthread-stubs-0.3-r1
index 4b07ad73afa2..807de78a6441 100644
--- a/metadata/md5-cache/dev-libs/libpthread-stubs-0.3-r1
+++ b/metadata/md5-cache/dev-libs/libpthread-stubs-0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Pthread functions stubs for platforms missing them
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=231366f8f0ea6d8b0918bfb0df9c4dbf
diff --git a/metadata/md5-cache/dev-libs/libreport-2.0.10 b/metadata/md5-cache/dev-libs/libreport-2.0.10
index 7f3e3e6f5902..7b1f088d7135 100644
--- a/metadata/md5-cache/dev-libs/libreport-2.0.10
+++ b/metadata/md5-cache/dev-libs/libreport-2.0.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=>=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 virtual/pkgconfig >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=>=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 virtual/pkgconfig >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=Generic library for reporting software bugs
 EAPI=4
 HOMEPAGE=https://fedorahosted.org/abrt/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.21:2 dev-libs/newt dev-libs/nss dev-libs/libtar dev-li
 RESTRICT=test
 SLOT=0
 SRC_URI=https://fedorahosted.org/released/abrt/libreport-2.0.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dc8328cd921b2b79bae7fa9faafa1089
diff --git a/metadata/md5-cache/dev-libs/libreport-2.0.13 b/metadata/md5-cache/dev-libs/libreport-2.0.13
index ee81901feb79..1982b147e5fe 100644
--- a/metadata/md5-cache/dev-libs/libreport-2.0.13
+++ b/metadata/md5-cache/dev-libs/libreport-2.0.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=>=dev-libs/btparser-0.18 >=dev-libs/glib-2.21:2 dev-libs/json-c dev-libs/libtar dev-libs/libxml2:2 dev-libs/newt dev-libs/nss dev-libs/xmlrpc-c net-libs/libproxy net-misc/curl[ssl] sys-apps/dbus >=x11-libs/gtk+-3.3.12:3 x11-misc/xdg-utils app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.3.50 >=sys-devel/gettext-0.17 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=>=dev-libs/btparser-0.18 >=dev-libs/glib-2.21:2 dev-libs/json-c dev-libs/libtar dev-libs/libxml2:2 dev-libs/newt dev-libs/nss dev-libs/xmlrpc-c net-libs/libproxy net-misc/curl[ssl] sys-apps/dbus >=x11-libs/gtk+-3.3.12:3 x11-misc/xdg-utils app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.3.50 >=sys-devel/gettext-0.17 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=Generic library for reporting software bugs
 EAPI=4
 HOMEPAGE=https://fedorahosted.org/abrt/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/btparser-0.18 >=dev-libs/glib-2.21:2 dev-libs/json-c dev-libs
 RESTRICT=test
 SLOT=0
 SRC_URI=https://fedorahosted.org/released/abrt/libreport-2.0.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3332b76873b85cb8600b4bf7c927b5c4
diff --git a/metadata/md5-cache/dev-libs/libsigc++-1.2.7 b/metadata/md5-cache/dev-libs/libsigc++-1.2.7
index 3eedb9a747f1..37f924d9f5b2 100644
--- a/metadata/md5-cache/dev-libs/libsigc++-1.2.7
+++ b/metadata/md5-cache/dev-libs/libsigc++-1.2.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=sys-devel/m4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=sys-devel/m4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Typesafe callback system for standard C++
 EAPI=3
 HOMEPAGE=http://libsigc.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86
 LICENSE=GPL-2 LGPL-2.1
 SLOT=1.2
 SRC_URI=mirror://gnome/sources/libsigc++/1.2/libsigc++-1.2.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f97dc7f53f3013ff3c201dec25c8bfdb
diff --git a/metadata/md5-cache/dev-libs/libstrl-0.5.1 b/metadata/md5-cache/dev-libs/libstrl-0.5.1
index f9d630274e81..be392b747181 100644
--- a/metadata/md5-cache/dev-libs/libstrl-0.5.1
+++ b/metadata/md5-cache/dev-libs/libstrl-0.5.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=!=mail-filter/opendkim-2.7.0 !=mail-filter/opendkim-2.7.1 !=mail-filter/opendkim-2.7.2
 SLOT=0
 SRC_URI=ftp://mirror.ohnopub.net/mirror/libstrl-0.5.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e5dba65ac9ba49758d2994afbe96018d
diff --git a/metadata/md5-cache/dev-libs/libstroke-0.5.1 b/metadata/md5-cache/dev-libs/libstroke-0.5.1
index a938ddd795a3..1404682a78c2 100644
--- a/metadata/md5-cache/dev-libs/libstroke-0.5.1
+++ b/metadata/md5-cache/dev-libs/libstroke-0.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=x11-proto/xproto x11-libs/libX11 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-proto/xproto x11-libs/libX11 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Stroke and Gesture recognition Library
 HOMEPAGE=http://www.etla.net/libstroke/
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://www.etla.net/libstroke/libstroke-0.5.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=439496d690daf03f1c94530809a0fcc5
diff --git a/metadata/md5-cache/dev-libs/libtar-1.2.11-r4 b/metadata/md5-cache/dev-libs/libtar-1.2.11-r4
index 315e145105f8..5748b3d37c8e 100644
--- a/metadata/md5-cache/dev-libs/libtar-1.2.11-r4
+++ b/metadata/md5-cache/dev-libs/libtar-1.2.11-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=zlib? ( sys-libs/zlib ) !zlib? ( app-arch/gzip ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=zlib? ( sys-libs/zlib ) !zlib? ( app-arch/gzip ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C library for manipulating tar archives
 EAPI=3
 HOMEPAGE=http://www.feep.net/libtar/ http://packages.qa.debian.org/libt/libtar.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=zlib? ( sys-libs/zlib ) !zlib? ( app-arch/gzip )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e0a2fce6414d63f7e2b621271de342fb
diff --git a/metadata/md5-cache/dev-libs/libtar-1.2.11-r5 b/metadata/md5-cache/dev-libs/libtar-1.2.11-r5
index 25616c14d29c..fd4228e313b3 100644
--- a/metadata/md5-cache/dev-libs/libtar-1.2.11-r5
+++ b/metadata/md5-cache/dev-libs/libtar-1.2.11-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=zlib? ( sys-libs/zlib ) !zlib? ( app-arch/gzip ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=zlib? ( sys-libs/zlib ) !zlib? ( app-arch/gzip ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C library for manipulating tar archives
 EAPI=4
 HOMEPAGE=http://www.feep.net/libtar/ http://packages.qa.debian.org/libt/libtar.html
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-mac
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.feep.net/pub/software/libtar/libtar-1.2.11.tar.gz mirror://debian/pool/main/libt/libtar/libtar_1.2.11-8.debian.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=79832d1fb2e81355ea7da3ddefe04eed
diff --git a/metadata/md5-cache/dev-libs/libtasn1-2.12 b/metadata/md5-cache/dev-libs/libtasn1-2.12
index 63f0931be139..3d2315aac7df 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-2.12
+++ b/metadata/md5-cache/dev-libs/libtasn1-2.12
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64
 LICENSE=GPL-3 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gnu/libtasn1/libtasn1-2.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=373784ee6ba899c5848c80999af28c8f
diff --git a/metadata/md5-cache/dev-libs/libtasn1-2.13 b/metadata/md5-cache/dev-libs/libtasn1-2.13
index 4c318125b94d..068867c28d86 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-2.13
+++ b/metadata/md5-cache/dev-libs/libtasn1-2.13
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64
 LICENSE=GPL-3 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gnu/libtasn1/libtasn1-2.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8ec9b41f733f0ae3ab6c46a5bf21eeca
diff --git a/metadata/md5-cache/dev-libs/libtasn1-2.14 b/metadata/md5-cache/dev-libs/libtasn1-2.14
index b4c9160b47e1..a391375d666b 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-2.14
+++ b/metadata/md5-cache/dev-libs/libtasn1-2.14
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-3 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gnu/libtasn1/libtasn1-2.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=98f73edf06939ade4089fd8091faa22d
diff --git a/metadata/md5-cache/dev-libs/libtasn1-3.0 b/metadata/md5-cache/dev-libs/libtasn1-3.0
index 8988e42d0883..d89603132431 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-3.0
+++ b/metadata/md5-cache/dev-libs/libtasn1-3.0
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-3 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gnu/libtasn1/libtasn1-3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a819d0d24b1d7f91522d944513b336f6
diff --git a/metadata/md5-cache/dev-libs/libtasn1-3.2 b/metadata/md5-cache/dev-libs/libtasn1-3.2
index 4f9f142db4ca..dea42b79de8c 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-3.2
+++ b/metadata/md5-cache/dev-libs/libtasn1-3.2
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-3 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gnu/libtasn1/libtasn1-3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1383e03ff029698160021e40d0daaad7
diff --git a/metadata/md5-cache/dev-libs/libtasn1-3.3 b/metadata/md5-cache/dev-libs/libtasn1-3.3
index 63ef816b7fc7..ac8815095f3b 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-3.3
+++ b/metadata/md5-cache/dev-libs/libtasn1-3.3
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-3 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gnu/libtasn1/libtasn1-3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7f9bed5967c208e7e2dcedbe3156902d
diff --git a/metadata/md5-cache/dev-libs/libtecla-1.6.1-r2 b/metadata/md5-cache/dev-libs/libtecla-1.6.1-r2
index 10ca8afee026..7d891e961127 100644
--- a/metadata/md5-cache/dev-libs/libtecla-1.6.1-r2
+++ b/metadata/md5-cache/dev-libs/libtecla-1.6.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tecla command-line editing library
 EAPI=4
 HOMEPAGE=http://www.astro.caltech.edu/~mcs/tecla/
@@ -9,5 +9,5 @@ LICENSE=icu
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.astro.caltech.edu/~mcs/tecla/libtecla-1.6.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ba3c4b9c03c2391b5f905ef27ca04069
diff --git a/metadata/md5-cache/dev-libs/libtecla-1.6.2 b/metadata/md5-cache/dev-libs/libtecla-1.6.2
index e3d768d56e78..6011fbb6344f 100644
--- a/metadata/md5-cache/dev-libs/libtecla-1.6.2
+++ b/metadata/md5-cache/dev-libs/libtecla-1.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tecla command-line editing library
 EAPI=4
 HOMEPAGE=http://www.astro.caltech.edu/~mcs/tecla/
@@ -9,5 +9,5 @@ LICENSE=icu
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.astro.caltech.edu/~mcs/tecla/libtecla-1.6.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0f2e898f20df27b16f29247083e29147
diff --git a/metadata/md5-cache/dev-libs/libtommath-0.42.0-r1 b/metadata/md5-cache/dev-libs/libtommath-0.42.0-r1
index 0755a909fb1f..531d5ff49f20 100644
--- a/metadata/md5-cache/dev-libs/libtommath-0.42.0-r1
+++ b/metadata/md5-cache/dev-libs/libtommath-0.42.0-r1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-devel/libtool
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=highly optimized and portable routines for integer based number theoretic applications
 EAPI=4
 HOMEPAGE=http://www.libtom.org/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=WTFPL-2
 SLOT=0
 SRC_URI=http://www.libtom.org/files/ltm-0.42.0.tar.bz2
-_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4979c62cda0db1a416686ef23faea107
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7f539a1fe0cf490774d11e93227a1b83
diff --git a/metadata/md5-cache/dev-libs/libtrain-0.9b b/metadata/md5-cache/dev-libs/libtrain-0.9b
index ebc470a1abcf..3377f13790ea 100644
--- a/metadata/md5-cache/dev-libs/libtrain-0.9b
+++ b/metadata/md5-cache/dev-libs/libtrain-0.9b
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for calculating fastest train routes
 EAPI=4
 HOMEPAGE=http://www.on.rim.or.jp/~katamuki/software/train/
@@ -8,5 +8,5 @@ KEYWORDS=~ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.on.rim.or.jp/~katamuki/software/train/libtrain-0.9b.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0b293a950d72519ca3a6030421c371ae
diff --git a/metadata/md5-cache/dev-libs/libunicode-0.4-r1 b/metadata/md5-cache/dev-libs/libunicode-0.4-r1
index 1148db6a1a2c..85cc94218d06 100644
--- a/metadata/md5-cache/dev-libs/libunicode-0.4-r1
+++ b/metadata/md5-cache/dev-libs/libunicode-0.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Unicode library
 EAPI=3
 HOMEPAGE=http://www.gnome.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc sparc x86
 LICENSE=GPL-2 LGPL-2
 SLOT=0
 SRC_URI=ftp://ftp.gnome.org/pub/GNOME/sources/libunicode/0.4/libunicode-0.4.gnome.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=21b735491d50de7748ab89d707c6d6ec
diff --git a/metadata/md5-cache/dev-libs/libusb-0.1.12-r7 b/metadata/md5-cache/dev-libs/libusb-0.1.12-r7
index 57bd8ce21b99..3ef087212c29 100644
--- a/metadata/md5-cache/dev-libs/libusb-0.1.12-r7
+++ b/metadata/md5-cache/dev-libs/libusb-0.1.12-r7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=!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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Userspace access to USB devices
 EAPI=3
 HOMEPAGE=http://libusb.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=!dev-libs/libusb-compat
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/libusb/libusb-0.1.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ede73358d8182e07a140bb07b080918b
diff --git a/metadata/md5-cache/dev-libs/libverto-0.2.4 b/metadata/md5-cache/dev-libs/libverto-0.2.4
index d166f4e19ab0..043868d0fbcf 100644
--- a/metadata/md5-cache/dev-libs/libverto-0.2.4
+++ b/metadata/md5-cache/dev-libs/libverto-0.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=!=app-crypt/mit-krb5-1.10.1-r0 !=app-crypt/mit-krb5-1.10.1-r1 !=app-crypt/mit-krb5-1.10.1-r2 glib? ( >=dev-libs/glib-2.29 ) libev? ( >=dev-libs/libev-4.11 ) libevent? ( >=dev-libs/libevent-2.0 ) tevent? ( sys-libs/tevent ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!=app-crypt/mit-krb5-1.10.1-r0 !=app-crypt/mit-krb5-1.10.1-r1 !=app-crypt/mit-krb5-1.10.1-r2 glib? ( >=dev-libs/glib-2.29 ) libev? ( >=dev-libs/libev-4.11 ) libevent? ( >=dev-libs/libevent-2.0 ) tevent? ( sys-libs/tevent ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Main event loop abstraction library
 EAPI=4
 HOMEPAGE=https://fedorahosted.org/libverto/
@@ -10,5 +10,5 @@ RDEPEND=!=app-crypt/mit-krb5-1.10.1-r0 !=app-crypt/mit-krb5-1.10.1-r1 !=app-cryp
 REQUIRED_USE=|| ( glib libev libevent tevent )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/l/i/libverto/libverto-0.2.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=99549a22a0586982b50c0223b76c1d3b
diff --git a/metadata/md5-cache/dev-libs/libvformat-1.13-r1 b/metadata/md5-cache/dev-libs/libvformat-1.13-r1
index e12144bb2f6d..f2faf4974bdd 100644
--- a/metadata/md5-cache/dev-libs/libvformat-1.13-r1
+++ b/metadata/md5-cache/dev-libs/libvformat-1.13-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library to read and write vcard files
 HOMEPAGE=http://sourceforge.net/projects/vformat/
 KEYWORDS=alpha amd64 ppc sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libv/libvformat/libvformat_1.13.orig.tar.gz mirror://debian/pool/main/libv/libvformat/libvformat_1.13-4.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2e622e068051de8e0e9acd7adee33681
diff --git a/metadata/md5-cache/dev-libs/libvformat-1.13-r2 b/metadata/md5-cache/dev-libs/libvformat-1.13-r2
index fb4239ce2988..431f3f968f90 100644
--- a/metadata/md5-cache/dev-libs/libvformat-1.13-r2
+++ b/metadata/md5-cache/dev-libs/libvformat-1.13-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library to read and write vcard files
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/vformat/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libv/libvformat/libvformat_1.13.orig.tar.gz mirror://debian/pool/main/libv/libvformat/libvformat_1.13-10.debian.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=51b0b6365bd6d080095ff3cb81929743
diff --git a/metadata/md5-cache/dev-libs/libxdiff-0.23-r1 b/metadata/md5-cache/dev-libs/libxdiff-0.23-r1
index dd4a7f0eb9d8..5fdd41d74050 100644
--- a/metadata/md5-cache/dev-libs/libxdiff-0.23-r1
+++ b/metadata/md5-cache/dev-libs/libxdiff-0.23-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for creating diff files
 EAPI=5
 HOMEPAGE=http://www.xmailserver.org/xdiff-lib.html
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.xmailserver.org/libxdiff-0.23.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=f3dfd8e793013e44b724ad2f733263b2
diff --git a/metadata/md5-cache/dev-libs/libxls-0.3.0_pre107 b/metadata/md5-cache/dev-libs/libxls-0.3.0_pre107
index 7f7382b42f12..4960c8358c64 100644
--- a/metadata/md5-cache/dev-libs/libxls-0.3.0_pre107
+++ b/metadata/md5-cache/dev-libs/libxls-0.3.0_pre107
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=virtual/libintl !<app-text/catdoc-0.94.2-r2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/libintl !<app-text/catdoc-0.94.2-r2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library which can read Excel (xls) files
 EAPI=3
 HOMEPAGE=http://libxls.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-3
 RDEPEND=virtual/libintl !<app-text/catdoc-0.94.2-r2
 SLOT=0
 SRC_URI=mirror://gentoo/libxls-0.3.0_pre107.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=7ceab2bf8dcbcb361988a0eafaac06b4
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.8.0-r3 b/metadata/md5-cache/dev-libs/libxml2-2.8.0-r3
index 4481cb0bdb2c..e9efc565c90b 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.8.0-r3
+++ b/metadata/md5-cache/dev-libs/libxml2-2.8.0-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=sys-libs/zlib icu? ( dev-libs/icu ) lzma? ( app-arch/xz-utils ) 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib icu? ( dev-libs/icu ) lzma? ( app-arch/xz-utils ) 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Version 2 of the library to manipulate XML files
 EAPI=4
 HOMEPAGE=http://www.xmlsoft.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib icu? ( dev-libs/icu ) lzma? ( app-arch/xz-utils ) readline? ( sys-libs/readline ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[xml] )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.8.0.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 ) http://dev.gentoo.org/~tetromino/distfiles/libxml2/libxml2-2.8.0-namespace-node-patches.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8f71725465f978591e0db7886f709460
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.8.0-r4 b/metadata/md5-cache/dev-libs/libxml2-2.8.0-r4
index 83702e72b525..9e24b795d5c2 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.8.0-r4
+++ b/metadata/md5-cache/dev-libs/libxml2-2.8.0-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=sys-libs/zlib:= icu? ( dev-libs/icu:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[xml] ) python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) readline? ( sys-libs/readline:= ) dev-util/gtk-doc-am hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib:= icu? ( dev-libs/icu:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[xml] ) python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) readline? ( sys-libs/readline:= ) dev-util/gtk-doc-am hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Version 2 of the library to manipulate XML files
 EAPI=5
 HOMEPAGE=http://www.xmlsoft.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib:= icu? ( dev-libs/icu:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[xml] ) python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) readline? ( sys-libs/readline:= )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.8.0.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 http://www.w3.org/XML/Test/xmlts20080827.tar.gz ) http://dev.gentoo.org/~tetromino/distfiles/libxml2/libxml2-2.8.0-namespace-node-patches.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=86d1b85835ca72985ba8e807697d1531
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.0-r1 b/metadata/md5-cache/dev-libs/libxml2-2.9.0-r1
index 7f83960e22fb..def0c0332d20 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.0-r1
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=sys-libs/zlib:= icu? ( dev-libs/icu:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[xml] ) python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) readline? ( sys-libs/readline:= ) dev-util/gtk-doc-am hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib:= icu? ( dev-libs/icu:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[xml] ) python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) readline? ( sys-libs/readline:= ) dev-util/gtk-doc-am hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Version 2 of the library to manipulate XML files
 EAPI=5
 HOMEPAGE=http://www.xmlsoft.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib:= icu? ( dev-libs/icu:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[xml] ) python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) readline? ( sys-libs/readline:= )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.0.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 http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a8948bf290a27336d8ce13da65b14d52
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.0-r2 b/metadata/md5-cache/dev-libs/libxml2-2.9.0-r2
index ac24fb87142c..25acf6d21645 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.0-r2
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=sys-libs/zlib:= icu? ( dev-libs/icu:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[xml] ) python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) readline? ( sys-libs/readline:= ) dev-util/gtk-doc-am hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib:= icu? ( dev-libs/icu:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[xml] ) python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) readline? ( sys-libs/readline:= ) dev-util/gtk-doc-am hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Version 2 of the library to manipulate XML files
 EAPI=5
 HOMEPAGE=http://www.xmlsoft.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib:= icu? ( dev-libs/icu:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[xml] ) python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) readline? ( sys-libs/readline:= )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.0.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 http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=897daf6577229a8a135d60d775942a0e
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.28 b/metadata/md5-cache/dev-libs/libxslt-1.1.28
index 8f13f6de43b4..58de8aefbf3c 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.28
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.28
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/libxml2-2.8.0 crypt? ( >=dev-libs/libgcrypt-1.1.42:= ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+DEPEND=>=dev-libs/libxml2-2.8.0 crypt? ( >=dev-libs/libgcrypt-1.1.42:= ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 DESCRIPTION=XSLT libraries and tools
 EAPI=5
 HOMEPAGE=http://www.xmlsoft.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.8.0 crypt? ( >=dev-libs/libgcrypt-1.1.42:= ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=0
 SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.28.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=63dd20c4c889c601b3d0349d923698d8
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.28-r1 b/metadata/md5-cache/dev-libs/libxslt-1.1.28-r1
index 68b9a59a71c4..7e7779e08600 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.28-r1
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.28-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libxml2-2.8.0:2 crypt? ( >=dev-libs/libgcrypt-1.1.42:= ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[xml] ) python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/libxml2:2[python,python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libxml2-2.8.0:2 crypt? ( >=dev-libs/libgcrypt-1.1.42:= ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[xml] ) python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/libxml2:2[python,python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=XSLT libraries and tools
 EAPI=5
 HOMEPAGE=http://www.xmlsoft.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.8.0:2 crypt? ( >=dev-libs/libgcrypt-1.1.42:= ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[xml] ) python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/libxml2:2[python,python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] )
 SLOT=0
 SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.28.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7d1647257ed3820b71b98c8a710ff4fb
diff --git a/metadata/md5-cache/dev-libs/libyaml-0.1.4 b/metadata/md5-cache/dev-libs/libyaml-0.1.4
index a47044362d0f..4d07489aff5e 100644
--- a/metadata/md5-cache/dev-libs/libyaml-0.1.4
+++ b/metadata/md5-cache/dev-libs/libyaml-0.1.4
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f74e67363944f834ef4f531ff855617a
diff --git a/metadata/md5-cache/dev-libs/libzeitgeist-0.3.12 b/metadata/md5-cache/dev-libs/libzeitgeist-0.3.12
index bc16ff72f3e6..1bfd9637e672 100644
--- a/metadata/md5-cache/dev-libs/libzeitgeist-0.3.12
+++ b/metadata/md5-cache/dev-libs/libzeitgeist-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-util/gtk-doc virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 dev-util/gtk-doc virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Client library to interact with zeitgeist
 EAPI=4
 HOMEPAGE=http://launchpad.net/libzeitgeist/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 gnome-extra/zeitgeist
 SLOT=0
 SRC_URI=http://launchpad.net/libzeitgeist/0.3/0.3.12/+download/libzeitgeist-0.3.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5bd382c510d37e45edcc57f1dd2a36ab
diff --git a/metadata/md5-cache/dev-libs/libzeitgeist-0.3.14 b/metadata/md5-cache/dev-libs/libzeitgeist-0.3.14
index cb99aba4b43d..7b7311341bc0 100644
--- a/metadata/md5-cache/dev-libs/libzeitgeist-0.3.14
+++ b/metadata/md5-cache/dev-libs/libzeitgeist-0.3.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-util/gtk-doc virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 dev-util/gtk-doc virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Client library to interact with zeitgeist
 EAPI=4
 HOMEPAGE=http://launchpad.net/libzeitgeist/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 gnome-extra/zeitgeist
 SLOT=0
 SRC_URI=http://launchpad.net/libzeitgeist/0.3/0.3.14/+download/libzeitgeist-0.3.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4318ef6c9f7a68dfa447dcbac69e2236
diff --git a/metadata/md5-cache/dev-libs/libzeitgeist-0.3.16 b/metadata/md5-cache/dev-libs/libzeitgeist-0.3.16
index a5000644c2ea..ee49534550a6 100644
--- a/metadata/md5-cache/dev-libs/libzeitgeist-0.3.16
+++ b/metadata/md5-cache/dev-libs/libzeitgeist-0.3.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-util/gtk-doc virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 dev-util/gtk-doc virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Client library to interact with zeitgeist
 EAPI=4
 HOMEPAGE=http://launchpad.net/libzeitgeist/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 gnome-extra/zeitgeist
 SLOT=0
 SRC_URI=http://launchpad.net/libzeitgeist/0.3/0.3.16/+download/libzeitgeist-0.3.16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c9638b35d61880e57a041ded97699f08
diff --git a/metadata/md5-cache/dev-libs/libzeitgeist-0.3.18 b/metadata/md5-cache/dev-libs/libzeitgeist-0.3.18
index c21614253533..95d20b359f33 100644
--- a/metadata/md5-cache/dev-libs/libzeitgeist-0.3.18
+++ b/metadata/md5-cache/dev-libs/libzeitgeist-0.3.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-util/gtk-doc virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 dev-util/gtk-doc virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Client library to interact with zeitgeist
 EAPI=4
 HOMEPAGE=http://launchpad.net/libzeitgeist/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 gnome-extra/zeitgeist
 SLOT=0
 SRC_URI=http://launchpad.net/libzeitgeist/0.3/0.3.18/+download/libzeitgeist-0.3.18.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b011a01f1ad6f6e87e202e5b055f264e
diff --git a/metadata/md5-cache/dev-libs/libzip-0.10.1-r1 b/metadata/md5-cache/dev-libs/libzip-0.10.1-r1
index 3ce6c35309c2..9a57e3b3f49b 100644
--- a/metadata/md5-cache/dev-libs/libzip-0.10.1-r1
+++ b/metadata/md5-cache/dev-libs/libzip-0.10.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for manipulating zip archives
 EAPI=4
 HOMEPAGE=http://www.nih.at/libzip/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.nih.at/libzip/libzip-0.10.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b601b125a506c5f22c741dd90ec130b3
diff --git a/metadata/md5-cache/dev-libs/libzip-0.11 b/metadata/md5-cache/dev-libs/libzip-0.11
index e02e178f8909..f1e7a7dc1d4b 100644
--- a/metadata/md5-cache/dev-libs/libzip-0.11
+++ b/metadata/md5-cache/dev-libs/libzip-0.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for manipulating zip archives
 EAPI=5
 HOMEPAGE=http://www.nih.at/libzip/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.nih.at/libzip/libzip-0.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b2b26b302d11aa2008c51645ef3eae3c
diff --git a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r1 b/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r1
index ceec2e5ae81f..d3e0af85a69f 100644
--- a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r1
+++ b/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=perl? ( dev-lang/perl[-build] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=perl? ( dev-lang/perl[-build] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for locking devices
 EAPI=2
 HOMEPAGE=http://packages.debian.org/source/sid/lockdev
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=perl? ( dev-lang/perl[-build] )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8d433cb5f5b5d529e7102dc979539fb1
diff --git a/metadata/md5-cache/dev-libs/log4cpp-1.0 b/metadata/md5-cache/dev-libs/log4cpp-1.0
index 7b243cab3e94..8ffef5ce8c3b 100644
--- a/metadata/md5-cache/dev-libs/log4cpp-1.0
+++ b/metadata/md5-cache/dev-libs/log4cpp-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library of C++ classes for flexible logging to files, syslog and other destinations.
 EAPI=2
 HOMEPAGE=http://log4cpp.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc s390 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/log4cpp/log4cpp-1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6475f0f71ca97661c9ac3166b8342bde
diff --git a/metadata/md5-cache/dev-libs/log4shib-1.0.1 b/metadata/md5-cache/dev-libs/log4shib-1.0.1
index bd171784c494..7b85905d0da1 100644
--- a/metadata/md5-cache/dev-libs/log4shib-1.0.1
+++ b/metadata/md5-cache/dev-libs/log4shib-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Internet2 version for OpenSAML of log4cpp logging framework
 HOMEPAGE=https://wiki.shibboleth.net/confluence/display/OpenSAML/log4shib
 IUSE=doc
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://shibboleth.internet2.edu/downloads/log4shib/1.0.1/log4shib-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=578789674e9019844d4b6fe96c98068e
diff --git a/metadata/md5-cache/dev-libs/m17n-lib-1.6.2 b/metadata/md5-cache/dev-libs/m17n-lib-1.6.2
index b2ad7529537c..736771cbe93f 100644
--- a/metadata/md5-cache/dev-libs/m17n-lib-1.6.2
+++ b/metadata/md5-cache/dev-libs/m17n-lib-1.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Multilingual Library for Unix/Linux
 EAPI=4
 HOMEPAGE=https://savannah.nongnu.org/projects/m17n
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=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
 SLOT=0
 SRC_URI=http://www.m17n.org/m17n-lib-download/m17n-lib-1.6.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d41df929b8afba60fea4df243ae1134a
diff --git a/metadata/md5-cache/dev-libs/m17n-lib-1.6.3 b/metadata/md5-cache/dev-libs/m17n-lib-1.6.3
index 0f599ca29936..c66e5b0a76ba 100644
--- a/metadata/md5-cache/dev-libs/m17n-lib-1.6.3
+++ b/metadata/md5-cache/dev-libs/m17n-lib-1.6.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Multilingual Library for Unix/Linux
 EAPI=4
 HOMEPAGE=https://savannah.nongnu.org/projects/m17n
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=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
 SLOT=0
 SRC_URI=http://www.m17n.org/m17n-lib-download/m17n-lib-1.6.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4b52bfd4009a6a5624220be421499374
diff --git a/metadata/md5-cache/dev-libs/m17n-lib-1.6.3-r1 b/metadata/md5-cache/dev-libs/m17n-lib-1.6.3-r1
index 2376b60da666..bee6bdbadd55 100644
--- a/metadata/md5-cache/dev-libs/m17n-lib-1.6.3-r1
+++ b/metadata/md5-cache/dev-libs/m17n-lib-1.6.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=anthy? ( app-i18n/anthy ) spell? ( app-text/aspell ) libxml2? ( dev-libs/libxml2 ) X? ( athena? ( x11-libs/libXaw ) bidi? ( dev-libs/fribidi ) fontconfig? ( media-libs/fontconfig ) gd? ( media-libs/gd[png] ) libotf? ( >=dev-libs/libotf-0.9.4 ) xft? ( >=media-libs/freetype-2.1 x11-libs/libXft ) x11-libs/libX11 ) ~dev-db/m17n-db-1.6.3 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=anthy? ( app-i18n/anthy ) spell? ( app-text/aspell ) libxml2? ( dev-libs/libxml2 ) X? ( athena? ( x11-libs/libXaw ) bidi? ( dev-libs/fribidi ) fontconfig? ( media-libs/fontconfig ) gd? ( media-libs/gd[png] ) libotf? ( >=dev-libs/libotf-0.9.4 ) xft? ( >=media-libs/freetype-2.1 x11-libs/libXft ) x11-libs/libX11 ) ~dev-db/m17n-db-1.6.3 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Multilingual Library for Unix/Linux
 EAPI=4
 HOMEPAGE=https://savannah.nongnu.org/projects/m17n
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=anthy? ( app-i18n/anthy ) spell? ( app-text/aspell ) libxml2? ( dev-libs/libxml2 ) X? ( athena? ( x11-libs/libXaw ) bidi? ( dev-libs/fribidi ) fontconfig? ( media-libs/fontconfig ) gd? ( media-libs/gd[png] ) libotf? ( >=dev-libs/libotf-0.9.4 ) xft? ( >=media-libs/freetype-2.1 x11-libs/libXft ) x11-libs/libX11 ) ~dev-db/m17n-db-1.6.3
 SLOT=0
 SRC_URI=http://www.m17n.org/m17n-lib-download/m17n-lib-1.6.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=00543f19e8c7860b1b4824d66de9322c
diff --git a/metadata/md5-cache/dev-libs/m17n-lib-1.6.4 b/metadata/md5-cache/dev-libs/m17n-lib-1.6.4
index d9bbcfbf04d3..b8d58462e097 100644
--- a/metadata/md5-cache/dev-libs/m17n-lib-1.6.4
+++ b/metadata/md5-cache/dev-libs/m17n-lib-1.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=anthy? ( app-i18n/anthy ) spell? ( app-text/aspell ) libxml2? ( dev-libs/libxml2 ) X? ( athena? ( x11-libs/libXaw ) bidi? ( dev-libs/fribidi ) fontconfig? ( media-libs/fontconfig ) gd? ( media-libs/gd[png] ) libotf? ( >=dev-libs/libotf-0.9.4 ) xft? ( >=media-libs/freetype-2.1 x11-libs/libXft ) x11-libs/libX11 ) ~dev-db/m17n-db-1.6.4 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=anthy? ( app-i18n/anthy ) spell? ( app-text/aspell ) libxml2? ( dev-libs/libxml2 ) X? ( athena? ( x11-libs/libXaw ) bidi? ( dev-libs/fribidi ) fontconfig? ( media-libs/fontconfig ) gd? ( media-libs/gd[png] ) libotf? ( >=dev-libs/libotf-0.9.4 ) xft? ( >=media-libs/freetype-2.1 x11-libs/libXft ) x11-libs/libX11 ) ~dev-db/m17n-db-1.6.4 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Multilingual Library for Unix/Linux
 EAPI=4
 HOMEPAGE=https://savannah.nongnu.org/projects/m17n
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=anthy? ( app-i18n/anthy ) spell? ( app-text/aspell ) libxml2? ( dev-libs/libxml2 ) X? ( athena? ( x11-libs/libXaw ) bidi? ( dev-libs/fribidi ) fontconfig? ( media-libs/fontconfig ) gd? ( media-libs/gd[png] ) libotf? ( >=dev-libs/libotf-0.9.4 ) xft? ( >=media-libs/freetype-2.1 x11-libs/libXft ) x11-libs/libX11 ) ~dev-db/m17n-db-1.6.4
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/m17n/m17n-lib-1.6.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=caa91c8b3fa94e593b9ae27e0598d6d0
diff --git a/metadata/md5-cache/dev-libs/maloc-0.2.1-r3 b/metadata/md5-cache/dev-libs/maloc-0.2.1-r3
index 80b4606e9326..f8208b23af4b 100644
--- a/metadata/md5-cache/dev-libs/maloc-0.2.1-r3
+++ b/metadata/md5-cache/dev-libs/maloc-0.2.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/readline mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/readline mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Minimal Abstraction Layer for Object-oriented C/C++ programs
 EAPI=3
 HOMEPAGE=http://www.fetk.org/codes/maloc/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/readline mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://cam.ucsd.edu/~mholst/codes/maloc/maloc-0.2-1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cbf4e37fb1b74dfb2094fea91d94f531
diff --git a/metadata/md5-cache/dev-libs/maloc-1.4 b/metadata/md5-cache/dev-libs/maloc-1.4
index 8f019dc06db3..dba33c9a7d4f 100644
--- a/metadata/md5-cache/dev-libs/maloc-1.4
+++ b/metadata/md5-cache/dev-libs/maloc-1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/readline mpi? ( virtual/mpi ) doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/readline mpi? ( virtual/mpi ) doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Minimal Abstraction Layer for Object-oriented C/C++ programs
 EAPI=3
 HOMEPAGE=http://www.fetk.org/codes/maloc/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/readline mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/maloc-1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1d0f4f81093251b5333acd94d0096748
diff --git a/metadata/md5-cache/dev-libs/maloc-1.5 b/metadata/md5-cache/dev-libs/maloc-1.5
index 89b7920d81fd..009c8a8bb1c6 100644
--- a/metadata/md5-cache/dev-libs/maloc-1.5
+++ b/metadata/md5-cache/dev-libs/maloc-1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/readline mpi? ( virtual/mpi ) doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/readline mpi? ( virtual/mpi ) doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Minimal Abstraction Layer for Object-oriented C/C++ programs
 EAPI=4
 HOMEPAGE=http://www.fetk.org/codes/maloc/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/readline mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/maloc-1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7b02793ecc66116882a893b8927af3da
diff --git a/metadata/md5-cache/dev-libs/mini-xml-2.6 b/metadata/md5-cache/dev-libs/mini-xml-2.6
index e776e9c6c4f9..77b82d129809 100644
--- a/metadata/md5-cache/dev-libs/mini-xml-2.6
+++ b/metadata/md5-cache/dev-libs/mini-xml-2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Small XML parsing library to read XML and XML-like data files
 EAPI=4
 HOMEPAGE=http://www.easysw.com/~mike/mxml
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Mini-XML
 SLOT=0
 SRC_URI=mirror://easysw/mxml/2.6/mxml-2.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=1239dcf743877d1c5fd6ae0703774ad6
diff --git a/metadata/md5-cache/dev-libs/mini-xml-2.7 b/metadata/md5-cache/dev-libs/mini-xml-2.7
index 0fe0234078f5..aebe88c43cf4 100644
--- a/metadata/md5-cache/dev-libs/mini-xml-2.7
+++ b/metadata/md5-cache/dev-libs/mini-xml-2.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Small XML parsing library to read XML and XML-like data files
 EAPI=4
 HOMEPAGE=http://www.easysw.com/~mike/mxml
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=Mini-XML
 SLOT=0
 SRC_URI=mirror://easysw/mxml/2.7/mxml-2.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=f95297ef5fd34bf7412da28e7c214357
diff --git a/metadata/md5-cache/dev-libs/mini-xml-2.7-r1 b/metadata/md5-cache/dev-libs/mini-xml-2.7-r1
index a269dc5164b0..676cc682be10 100644
--- a/metadata/md5-cache/dev-libs/mini-xml-2.7-r1
+++ b/metadata/md5-cache/dev-libs/mini-xml-2.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Small XML parsing library to read XML and XML-like data files
 EAPI=4
 HOMEPAGE=http://www.minixml.org/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=Mini-XML
 SLOT=0
 SRC_URI=mirror://easysw/mxml/2.7/mxml-2.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=f626809403e4b136c61fe6769bfb8307
diff --git a/metadata/md5-cache/dev-libs/mozldap-6.0.6-r2 b/metadata/md5-cache/dev-libs/mozldap-6.0.6-r2
index f2f67136dacb..b9b5819add6d 100644
--- a/metadata/md5-cache/dev-libs/mozldap-6.0.6-r2
+++ b/metadata/md5-cache/dev-libs/mozldap-6.0.6-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.0.1 >=dev-libs/svrcore-4.0.0 sasl? ( dev-libs/cyrus-sasl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.0.1 >=dev-libs/svrcore-4.0.0 sasl? ( dev-libs/cyrus-sasl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Mozilla LDAP C SDK
 EAPI=2
 HOMEPAGE=http://wiki.mozilla.org/LDAP_C_SDK
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.0.1 >=dev-libs/svrcore-4.0.0 sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v6.0.6/src/mozldap-6.0.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0e69f84fe3b30c506aa148751142e434
diff --git a/metadata/md5-cache/dev-libs/mozldap-6.0.7 b/metadata/md5-cache/dev-libs/mozldap-6.0.7
index 99953e1b785f..65cdfe43cec6 100644
--- a/metadata/md5-cache/dev-libs/mozldap-6.0.7
+++ b/metadata/md5-cache/dev-libs/mozldap-6.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.0.1 >=dev-libs/svrcore-4.0.0 sasl? ( dev-libs/cyrus-sasl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.0.1 >=dev-libs/svrcore-4.0.0 sasl? ( dev-libs/cyrus-sasl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Mozilla LDAP C SDK
 EAPI=5
 HOMEPAGE=http://wiki.mozilla.org/LDAP_C_SDK
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.0.1 >=dev-libs/svrcore-4.0.0 sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v6.0.7/src/mozldap-6.0.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=949cf66208b0754713364cabc2f72f5e
diff --git a/metadata/md5-cache/dev-libs/nettle-1.15 b/metadata/md5-cache/dev-libs/nettle-1.15
index a26f2fb46bd1..b19541329aed 100644
--- a/metadata/md5-cache/dev-libs/nettle-1.15
+++ b/metadata/md5-cache/dev-libs/nettle-1.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=cryptographic library that is designed to fit easily in any context
 HOMEPAGE=http://www.lysator.liu.se/~nisse/nettle/
 IUSE=gmp ssl
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=http://www.lysator.liu.se/~nisse/archive/nettle-1.15.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e8fa39c6291d07d728bff316fa1f0f00
diff --git a/metadata/md5-cache/dev-libs/nettle-2.4 b/metadata/md5-cache/dev-libs/nettle-2.4
index a879b4501a46..4baf7059836a 100644
--- a/metadata/md5-cache/dev-libs/nettle-2.4
+++ b/metadata/md5-cache/dev-libs/nettle-2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=gmp? ( dev-libs/gmp ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gmp? ( dev-libs/gmp ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Low-level cryptographic library
 EAPI=4
 HOMEPAGE=http://www.lysator.liu.se/~nisse/nettle/
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-3 LGPL-2.1 )
 RDEPEND=gmp? ( dev-libs/gmp )
 SLOT=0
 SRC_URI=http://www.lysator.liu.se/~nisse/archive/nettle-2.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=96ce61789468381e183c5bc240fa4892
diff --git a/metadata/md5-cache/dev-libs/nettle-2.5 b/metadata/md5-cache/dev-libs/nettle-2.5
index f19640a9117d..53d5f4cd7d01 100644
--- a/metadata/md5-cache/dev-libs/nettle-2.5
+++ b/metadata/md5-cache/dev-libs/nettle-2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=gmp? ( dev-libs/gmp ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gmp? ( dev-libs/gmp ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Low-level cryptographic library
 EAPI=4
 HOMEPAGE=http://www.lysator.liu.se/~nisse/nettle/
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-3 LGPL-2.1 )
 RDEPEND=gmp? ( dev-libs/gmp )
 SLOT=0
 SRC_URI=http://www.lysator.liu.se/~nisse/archive/nettle-2.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=23683ca605c83623842a859d9cabe42f
diff --git a/metadata/md5-cache/dev-libs/nettle-2.5-r1 b/metadata/md5-cache/dev-libs/nettle-2.5-r1
index b8a0bb1449cf..9d9f13855465 100644
--- a/metadata/md5-cache/dev-libs/nettle-2.5-r1
+++ b/metadata/md5-cache/dev-libs/nettle-2.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=gmp? ( dev-libs/gmp ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gmp? ( dev-libs/gmp ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Low-level cryptographic library
 EAPI=4
 HOMEPAGE=http://www.lysator.liu.se/~nisse/nettle/
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-3 LGPL-2.1 )
 RDEPEND=gmp? ( dev-libs/gmp )
 SLOT=0
 SRC_URI=http://www.lysator.liu.se/~nisse/archive/nettle-2.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c0c95e597200692a0ccbcd424fb690ee
diff --git a/metadata/md5-cache/dev-libs/nettle-2.6 b/metadata/md5-cache/dev-libs/nettle-2.6
index a801fc2657e9..a8c05f4069a7 100644
--- a/metadata/md5-cache/dev-libs/nettle-2.6
+++ b/metadata/md5-cache/dev-libs/nettle-2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=gmp? ( dev-libs/gmp ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gmp? ( dev-libs/gmp ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Low-level cryptographic library
 EAPI=5
 HOMEPAGE=http://www.lysator.liu.se/~nisse/nettle/
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-3 LGPL-2.1 )
 RDEPEND=gmp? ( dev-libs/gmp )
 SLOT=0/4
 SRC_URI=http://www.lysator.liu.se/~nisse/archive/nettle-2.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e7db9049ccdeaedbb47b86563c946f28
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.13 b/metadata/md5-cache/dev-libs/newt-0.52.13
index a1878f7464ec..6e776502da86 100644
--- a/metadata/md5-cache/dev-libs/newt-0.52.13
+++ b/metadata/md5-cache/dev-libs/newt-0.52.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND==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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Redhat's Newt windowing toolkit development files
 EAPI=3
 HOMEPAGE=https://fedorahosted.org/newt/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND==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*
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/n/e/newt/newt-0.52.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4690162a7162125e9e6bbe5c19d6fb6e
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.14-r1 b/metadata/md5-cache/dev-libs/newt-0.52.14-r1
index c9042818a73e..f41a98c3b093 100644
--- a/metadata/md5-cache/dev-libs/newt-0.52.14-r1
+++ b/metadata/md5-cache/dev-libs/newt-0.52.14-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND==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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Redhat's Newt windowing toolkit development files
 EAPI=3
 HOMEPAGE=https://fedorahosted.org/newt/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND==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*
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/n/e/newt/newt-0.52.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4a5d15b788b6c832ffb677586bc7ba68
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.14-r2 b/metadata/md5-cache/dev-libs/newt-0.52.14-r2
index 3c9d21ae62cc..31ab77583672 100644
--- a/metadata/md5-cache/dev-libs/newt-0.52.14-r2
+++ b/metadata/md5-cache/dev-libs/newt-0.52.14-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND==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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Redhat's Newt windowing toolkit development files
 EAPI=3
 HOMEPAGE=https://fedorahosted.org/newt/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND==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*
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/n/e/newt/newt-0.52.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e650ca369be4d9e7ae9badab168c252c
diff --git a/metadata/md5-cache/dev-libs/nspr-4.9 b/metadata/md5-cache/dev-libs/nspr-4.9
index f36ad44a3da9..3bd05927fded 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.9
+++ b/metadata/md5-cache/dev-libs/nspr-4.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Netscape Portable Runtime
 EAPI=3
 HOMEPAGE=http://www.mozilla.org/projects/nspr/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~ppc-aix ~amd
 LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9/src/nspr-4.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=632679d00a7e8fad608c31bbc0ac5892
diff --git a/metadata/md5-cache/dev-libs/nspr-4.9.1 b/metadata/md5-cache/dev-libs/nspr-4.9.1
index 745ed8d5ccf9..36f7c718f5c8 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.9.1
+++ b/metadata/md5-cache/dev-libs/nspr-4.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Netscape Portable Runtime
 EAPI=3
 HOMEPAGE=http://www.mozilla.org/projects/nspr/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~ppc-aix ~amd
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9.1/src/nspr-4.9.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f1e0d23767ae545662a78d3825312d0f
diff --git a/metadata/md5-cache/dev-libs/nspr-4.9.2 b/metadata/md5-cache/dev-libs/nspr-4.9.2
index a807fb9f20e0..58408a077887 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.9.2
+++ b/metadata/md5-cache/dev-libs/nspr-4.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Netscape Portable Runtime
 EAPI=3
 HOMEPAGE=http://www.mozilla.org/projects/nspr/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9.2/src/nspr-4.9.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=141acfed98e00faf680efdd83d312288
diff --git a/metadata/md5-cache/dev-libs/nspr-4.9.2-r1 b/metadata/md5-cache/dev-libs/nspr-4.9.2-r1
index ea39812cda96..b2f93c135e51 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.9.2-r1
+++ b/metadata/md5-cache/dev-libs/nspr-4.9.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Netscape Portable Runtime
 EAPI=3
 HOMEPAGE=http://www.mozilla.org/projects/nspr/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-a
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9.2/src/nspr-4.9.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f09859a48a830f67dc7d31103c940a27
diff --git a/metadata/md5-cache/dev-libs/nspr-4.9.4 b/metadata/md5-cache/dev-libs/nspr-4.9.4
index 59ad9e4cd4f9..502e8d0b814f 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.9.4
+++ b/metadata/md5-cache/dev-libs/nspr-4.9.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Netscape Portable Runtime
 EAPI=3
 HOMEPAGE=http://www.mozilla.org/projects/nspr/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9.4/src/nspr-4.9.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=033412d9d5db554a4125655561875d6d
diff --git a/metadata/md5-cache/dev-libs/nspr-4.9.5 b/metadata/md5-cache/dev-libs/nspr-4.9.5
index 1ca0686b4d16..85ee2bea5d22 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.9.5
+++ b/metadata/md5-cache/dev-libs/nspr-4.9.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Netscape Portable Runtime
 EAPI=3
 HOMEPAGE=http://www.mozilla.org/projects/nspr/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9.5/src/nspr-4.9.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=64f5e20af123372cfc848e90b70c3116
diff --git a/metadata/md5-cache/dev-libs/nspr-4.9.5-r1 b/metadata/md5-cache/dev-libs/nspr-4.9.5-r1
index 5f1c1fcc32b8..4490cb2ea50f 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.9.5-r1
+++ b/metadata/md5-cache/dev-libs/nspr-4.9.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Netscape Portable Runtime
 EAPI=3
 HOMEPAGE=http://www.mozilla.org/projects/nspr/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9.5/src/nspr-4.9.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fff98fb1c4bc0a9e3f1f54f53efa76cd
diff --git a/metadata/md5-cache/dev-libs/nspr-4.9.5-r2 b/metadata/md5-cache/dev-libs/nspr-4.9.5-r2
index 5e70fc2c7f31..388daba69a75 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.9.5-r2
+++ b/metadata/md5-cache/dev-libs/nspr-4.9.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Netscape Portable Runtime
 EAPI=3
 HOMEPAGE=http://www.mozilla.org/projects/nspr/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9.5/src/nspr-4.9.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7bf9535bb640537745df3890f4fc99f3
diff --git a/metadata/md5-cache/dev-libs/nspr-4.9.6 b/metadata/md5-cache/dev-libs/nspr-4.9.6
index 25afc8b9e024..52b3437bf47d 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.9.6
+++ b/metadata/md5-cache/dev-libs/nspr-4.9.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Netscape Portable Runtime
 EAPI=3
 HOMEPAGE=http://www.mozilla.org/projects/nspr/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9.6/src/nspr-4.9.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6e30b6d3592055e2fde102a962d2dbf6
diff --git a/metadata/md5-cache/dev-libs/oniguruma-5.9.2-r1 b/metadata/md5-cache/dev-libs/oniguruma-5.9.2-r1
index f95e44453f00..a740ad52a453 100644
--- a/metadata/md5-cache/dev-libs/oniguruma-5.9.2-r1
+++ b/metadata/md5-cache/dev-libs/oniguruma-5.9.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a regular expression library for different character encodings
 EAPI=4
 HOMEPAGE=http://www.geocities.jp/kosako3/oniguruma
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6909856b7f0232e03e1d89087d5dd494
diff --git a/metadata/md5-cache/dev-libs/oniguruma-5.9.3 b/metadata/md5-cache/dev-libs/oniguruma-5.9.3
index 4896be19361e..161d15dae0f7 100644
--- a/metadata/md5-cache/dev-libs/oniguruma-5.9.3
+++ b/metadata/md5-cache/dev-libs/oniguruma-5.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a regular expression library for different character encodings
 EAPI=4
 HOMEPAGE=http://www.geocities.jp/kosako3/oniguruma
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=46bed19ddd212afe6554b1ac5b9390d9
diff --git a/metadata/md5-cache/dev-libs/oniguruma-5.9.4 b/metadata/md5-cache/dev-libs/oniguruma-5.9.4
index fa3af5d7358a..3b9a00fb7332 100644
--- a/metadata/md5-cache/dev-libs/oniguruma-5.9.4
+++ b/metadata/md5-cache/dev-libs/oniguruma-5.9.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a regular expression library for different character encodings
 EAPI=4
 HOMEPAGE=http://www.geocities.jp/kosako3/oniguruma
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3e5ef5d6786884505de9c6057c367d00
diff --git a/metadata/md5-cache/dev-libs/opencryptoki-2.3.3-r5 b/metadata/md5-cache/dev-libs/opencryptoki-2.3.3-r5
index fbc179fc812c..b749346d5d2e 100644
--- a/metadata/md5-cache/dev-libs/opencryptoki-2.3.3-r5
+++ b/metadata/md5-cache/dev-libs/opencryptoki-2.3.3-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=tpm? ( app-crypt/trousers ) dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=tpm? ( app-crypt/trousers ) dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=PKCS#11 provider cryptographic hardware
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/opencryptoki
@@ -10,5 +10,5 @@ RDEPEND=tpm? ( app-crypt/trousers ) dev-libs/openssl
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/opencryptoki/opencryptoki-2.3.3.tar.bz2 http://dev.gentoo.org/~flameeyes/opencryptoki/opencryptoki-2.3.3-backports-3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=31df884580d6cceebc6ee77cc4ad8d3e
diff --git a/metadata/md5-cache/dev-libs/opencryptoki-2.4.2 b/metadata/md5-cache/dev-libs/opencryptoki-2.4.2
index 386d88aaa068..bf2734269841 100644
--- a/metadata/md5-cache/dev-libs/opencryptoki-2.4.2
+++ b/metadata/md5-cache/dev-libs/opencryptoki-2.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=tpm? ( app-crypt/trousers ) dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=tpm? ( app-crypt/trousers ) dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=PKCS#11 provider cryptographic hardware
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/opencryptoki
@@ -10,5 +10,5 @@ RDEPEND=tpm? ( app-crypt/trousers ) dev-libs/openssl
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/opencryptoki/opencryptoki-2.4.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aa69182b25f69a856692a63ec36ffad8
diff --git a/metadata/md5-cache/dev-libs/openobex-1.3 b/metadata/md5-cache/dev-libs/openobex-1.3
index b57216b39746..862c9ad0cd0d 100644
--- a/metadata/md5-cache/dev-libs/openobex-1.3
+++ b/metadata/md5-cache/dev-libs/openobex-1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=usb? ( =virtual/libusb-0* ) virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=usb? ( =virtual/libusb-0* ) virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An implementation of the OBEX protocol used for transferring data to mobile devices
 HOMEPAGE=http://sourceforge.net/projects/openobex/
 IUSE=bluetooth debug irda syslog usb
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=usb? ( =virtual/libusb-0* )
 SLOT=0
 SRC_URI=mirror://sourceforge/openobex/openobex-1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=123083d60a8dc1f5724e472368830f95
diff --git a/metadata/md5-cache/dev-libs/openobex-1.5 b/metadata/md5-cache/dev-libs/openobex-1.5
index b73a7475afc9..ade23279aa14 100644
--- a/metadata/md5-cache/dev-libs/openobex-1.5
+++ b/metadata/md5-cache/dev-libs/openobex-1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=bluetooth? ( net-wireless/bluez ) usb? ( virtual/libusb:0 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=bluetooth? ( net-wireless/bluez ) usb? ( virtual/libusb:0 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An implementation of the OBEX protocol used for transferring data to mobile devices
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/openobex/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bluetooth? ( net-wireless/bluez ) usb? ( virtual/libusb:0 )
 SLOT=0
 SRC_URI=mirror://kernel/linux/bluetooth/openobex-1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cb2bcf89514bb9fb7ce72fad2636ad5a
diff --git a/metadata/md5-cache/dev-libs/opensc-0.11.13-r2 b/metadata/md5-cache/dev-libs/opensc-0.11.13-r2
index 864725ea0525..55ec36fdd864 100644
--- a/metadata/md5-cache/dev-libs/opensc-0.11.13-r2
+++ b/metadata/md5-cache/dev-libs/opensc-0.11.13-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=SmartCard library and applications
 EAPI=2
 HOMEPAGE=http://www.opensc-project.org/opensc/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://www.opensc-project.org/files/opensc/opensc-0.11.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=29a95aceeec525c6da28cece44f54ab0
diff --git a/metadata/md5-cache/dev-libs/opensc-0.12.2-r2 b/metadata/md5-cache/dev-libs/opensc-0.12.2-r2
index 4e1d80054555..d55243ac5012 100644
--- a/metadata/md5-cache/dev-libs/opensc-0.12.2-r2
+++ b/metadata/md5-cache/dev-libs/opensc-0.12.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) virtual/pkgconfig app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Libraries and applications to access smartcards
 EAPI=4
 HOMEPAGE=http://www.opensc-project.org/opensc/
@@ -10,5 +10,5 @@ RDEPEND=libtool? ( sys-devel/libtool ) zlib? ( sys-libs/zlib ) readline? ( sys-l
 REQUIRED_USE=pcsc-lite? ( !openct ) openct? ( !pcsc-lite )
 SLOT=0
 SRC_URI=http://www.opensc-project.org/files/opensc/opensc-0.12.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4b944bd43e982ab74ffa8f8b2e7a6b6e
diff --git a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r2 b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r2
index b53b684e481c..9dfe38e285bb 100644
--- a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r2
+++ b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=perl? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) )
+DEPEND=perl? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) )
 DESCRIPTION=An ISO-C:1999 API and corresponding CLI for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant UUID.
 EAPI=4
 HOMEPAGE=http://www.ossp.org/pkg/lib/uuid/
@@ -10,5 +10,5 @@ RDEPEND=perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3 )
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6c2e2124c4c27526d7bdce21896825cb
diff --git a/metadata/md5-cache/dev-libs/pcre++-0.9.5-r1 b/metadata/md5-cache/dev-libs/pcre++-0.9.5-r1
index b5a569cdf585..31cb90a301ce 100644
--- a/metadata/md5-cache/dev-libs/pcre++-0.9.5-r1
+++ b/metadata/md5-cache/dev-libs/pcre++-0.9.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=dev-libs/libpcre || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libpcre || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A C++ support library for libpcre
 HOMEPAGE=http://www.daemon.de/PCRE
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sh sparc x86
@@ -7,5 +7,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libpcre
 SLOT=0
 SRC_URI=http://www.daemon.de/files/mirror/ftp.daemon.de/scip/Apps/pcre++/pcre++-0.9.5.tar.gz mirror://gentoo/pcre++-0.9.5-patches.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=36159100d723a5654a9abbc4fefac382
diff --git a/metadata/md5-cache/dev-libs/polylib-9999 b/metadata/md5-cache/dev-libs/polylib-9999
index 3f4e08202409..d6aa8797b27b 100644
--- a/metadata/md5-cache/dev-libs/polylib-9999
+++ b/metadata/md5-cache/dev-libs/polylib-9999
@@ -1,8 +1,8 @@
 DEFINED_PHASES=install unpack
-DEPEND=dev-vcs/git || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-vcs/git || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ppl port of cloog
 HOMEPAGE=http://icps.u-strasbg.fr/polylib/
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=179a1278bda82737d29eb084142b3c81
diff --git a/metadata/md5-cache/dev-libs/ppl-0.10.2-r1 b/metadata/md5-cache/dev-libs/ppl-0.10.2-r1
index a81c4e6fa1ad..8ffb9c6b4779 100644
--- a/metadata/md5-cache/dev-libs/ppl-0.10.2-r1
+++ b/metadata/md5-cache/dev-libs/ppl-0.10.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=>=dev-libs/gmp-4.1.3[cxx] lpsol? ( sci-mathematics/glpk ) sys-devel/m4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/gmp-4.1.3[cxx] lpsol? ( sci-mathematics/glpk ) sys-devel/m4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Parma Polyhedra Library provides numerical abstractions for analysis of complex systems
 EAPI=2
 HOMEPAGE=http://www.cs.unipr.it/ppl/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/gmp-4.1.3[cxx] lpsol? ( sci-mathematics/glpk )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=828be3901e6b29dec4295f76687cc9f1
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.4.0a b/metadata/md5-cache/dev-libs/protobuf-2.4.0a
index eb6525311e29..9423c561fc90 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.4.0a
+++ b/metadata/md5-cache/dev-libs/protobuf-2.4.0a
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=java? ( >=virtual/jdk-1.5 ) python? ( dev-python/setuptools ) emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.12:1.12 ) >=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 ) )
+DEPEND=java? ( >=virtual/jdk-1.5 ) python? ( dev-python/setuptools ) emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 ) )
 DESCRIPTION=Google's Protocol Buffers -- an efficient method of encoding structured data
 EAPI=3
 HOMEPAGE=http://code.google.com/p/protobuf/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=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 ) )
 SLOT=0
 SRC_URI=http://protobuf.googlecode.com/files/protobuf-2.4.0a.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6d3003a2eff49ae53ac92540d9728d19
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.4.1 b/metadata/md5-cache/dev-libs/protobuf-2.4.1
index 8f6b4426f318..f80e90f50ebd 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.4.1
+++ b/metadata/md5-cache/dev-libs/protobuf-2.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=java? ( >=virtual/jdk-1.5 ) python? ( dev-python/setuptools ) emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.12:1.12 ) >=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 ) )
+DEPEND=java? ( >=virtual/jdk-1.5 ) python? ( dev-python/setuptools ) emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 ) )
 DESCRIPTION=Google's Protocol Buffers -- an efficient method of encoding structured data
 EAPI=3
 HOMEPAGE=http://code.google.com/p/protobuf/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=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 ) )
 SLOT=0
 SRC_URI=http://protobuf.googlecode.com/files/protobuf-2.4.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=05f75b279552c3f34c320005bc1946c1
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.5.0 b/metadata/md5-cache/dev-libs/protobuf-2.5.0
index 63a6d9ff3c8a..daf1537f0bdd 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.5.0
+++ b/metadata/md5-cache/dev-libs/protobuf-2.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
+DEPEND=java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 DESCRIPTION=Google's Protocol Buffers -- an efficient method of encoding structured data
 EAPI=5
 HOMEPAGE=http://code.google.com/p/protobuf/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=java? ( >=virtual/jre-1.5 ) emacs? ( virtual/emacs ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 SLOT=0/8
 SRC_URI=http://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	distutils-r1	28f569122728e4a4b52d45c00fc45fff	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	distutils-r1	28f569122728e4a4b52d45c00fc45fff	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=40878b8226ee1121c8279b83ce4bff2a
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-0.15 b/metadata/md5-cache/dev-libs/protobuf-c-0.15
index 57a15c5acd54..0c357fc0b3db 100644
--- a/metadata/md5-cache/dev-libs/protobuf-c-0.15
+++ b/metadata/md5-cache/dev-libs/protobuf-c-0.15
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=dev-libs/protobuf
 SLOT=0
 SRC_URI=http://protobuf-c.googlecode.com/files/protobuf-c-0.15.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d52c4e8d0c339446ff21635f0e89510b
diff --git a/metadata/md5-cache/dev-libs/pslib-0.4.1-r2 b/metadata/md5-cache/dev-libs/pslib-0.4.1-r2
index 14915dcc5782..9603f7770ed9 100644
--- a/metadata/md5-cache/dev-libs/pslib-0.4.1-r2
+++ b/metadata/md5-cache/dev-libs/pslib-0.4.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=pslib is a C-library to create PostScript files on the fly.
 EAPI=2
 HOMEPAGE=http://pslib.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=png? ( >=media-libs/libpng-1.2.43-r2:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff )
 SLOT=0
 SRC_URI=mirror://sourceforge/pslib/pslib-0.4.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=73060bad434b439eb4c1c1ceebe8f7bf
diff --git a/metadata/md5-cache/dev-libs/pwlib-1.10.10-r3 b/metadata/md5-cache/dev-libs/pwlib-1.10.10-r3
index 93356164ae5e..deabca070411 100644
--- a/metadata/md5-cache/dev-libs/pwlib-1.10.10-r3
+++ b/metadata/md5-cache/dev-libs/pwlib-1.10.10-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Portable Multiplatform Class Libraries used by several VoIP applications
 EAPI=1
 HOMEPAGE=http://www.ekiga.org
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://www.ekiga.org/admin/downloads/latest/sources/sources/pwlib-1.10.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=96656cece6a7fb62e048a8461113a656
diff --git a/metadata/md5-cache/dev-libs/radlib-2.12.0-r1 b/metadata/md5-cache/dev-libs/radlib-2.12.0-r1
index a4be40ead321..504ab5ba56ca 100644
--- a/metadata/md5-cache/dev-libs/radlib-2.12.0-r1
+++ b/metadata/md5-cache/dev-libs/radlib-2.12.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=mysql? ( dev-db/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/radlib/radlib-2.12.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fd6b2f332826291b522ea32789112157
diff --git a/metadata/md5-cache/dev-libs/rremove-1.0.5 b/metadata/md5-cache/dev-libs/rremove-1.0.5
index 984c0bdd4ba2..a324ebbad574 100644
--- a/metadata/md5-cache/dev-libs/rremove-1.0.5
+++ b/metadata/md5-cache/dev-libs/rremove-1.0.5
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=https://frigidcode.com/code/rremove/rremove-1.0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a68845ba2e179357b2d5925474d5c972
diff --git a/metadata/md5-cache/dev-libs/sblim-sfcc-2.2.5 b/metadata/md5-cache/dev-libs/sblim-sfcc-2.2.5
index a2fb436e2f68..1cbc368a3267 100644
--- a/metadata/md5-cache/dev-libs/sblim-sfcc-2.2.5
+++ b/metadata/md5-cache/dev-libs/sblim-sfcc-2.2.5
@@ -8,5 +8,5 @@ LICENSE=EPL-1.0
 RDEPEND=net-misc/curl[ssl]
 SLOT=0
 SRC_URI=mirror://sourceforge/project/sblim/sblim-sfcc/sblim-sfcc-2.2.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8f05f1e8244efa9fee6797cc531a4bcc
diff --git a/metadata/md5-cache/dev-libs/seed-3.2.0-r1 b/metadata/md5-cache/dev-libs/seed-3.2.0-r1
index 23479263d78a..401aa7fa1b33 100644
--- a/metadata/md5-cache/dev-libs/seed-3.2.0-r1
+++ b/metadata/md5-cache/dev-libs/seed-3.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gobject-introspection-1 dev-libs/glib:2 virtual/libffi x11-li
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/seed/3.2/seed-3.2.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=83d040662426279583499b3ecafd5c7f
diff --git a/metadata/md5-cache/dev-libs/skyutils-2.8-r2 b/metadata/md5-cache/dev-libs/skyutils-2.8-r2
index 6a01081dfcf4..1363631cce99 100644
--- a/metadata/md5-cache/dev-libs/skyutils-2.8-r2
+++ b/metadata/md5-cache/dev-libs/skyutils-2.8-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library of assorted C utility functions.
 HOMEPAGE=None available
 IUSE=ssl
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://gentoo/skyutils-2.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1275e2dac80ad84d58149e665d791576
diff --git a/metadata/md5-cache/dev-libs/starpu-1.0.4 b/metadata/md5-cache/dev-libs/starpu-1.0.4
index b56e463af57e..ce3df81fc097 100644
--- a/metadata/md5-cache/dev-libs/starpu-1.0.4
+++ b/metadata/md5-cache/dev-libs/starpu-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-apps/hwloc sci-mathematics/glpk blas? ( virtual/blas ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) qt4? ( >=dev-qt/qtgui-4.7:4 >=dev-qt/qtopengl-4.7:4 >=dev-qt/qtsql-4.7:4 x11-libs/qwt ) virtual/pkgconfig test? ( gcc-plugin? ( dev-scheme/guile ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/hwloc sci-mathematics/glpk blas? ( virtual/blas ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) qt4? ( >=dev-qt/qtgui-4.7:4 >=dev-qt/qtopengl-4.7:4 >=dev-qt/qtsql-4.7:4 x11-libs/qwt ) virtual/pkgconfig test? ( gcc-plugin? ( dev-scheme/guile ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Unified runtime system for heterogeneous multicore architectures
 EAPI=4
 HOMEPAGE=http://runtime.bordeaux.inria.fr/StarPU/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-apps/hwloc sci-mathematics/glpk blas? ( virtual/blas ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) qt4? ( >=dev-qt/qtgui-4.7:4 >=dev-qt/qtopengl-4.7:4 >=dev-qt/qtsql-4.7:4 x11-libs/qwt )
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/31588/starpu-1.0.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=52bcab2a9a47868fb080cd1722b7d5fb
diff --git a/metadata/md5-cache/dev-libs/starpu-1.0.5 b/metadata/md5-cache/dev-libs/starpu-1.0.5
index 6152e8bc4688..e84e2dd8c27d 100644
--- a/metadata/md5-cache/dev-libs/starpu-1.0.5
+++ b/metadata/md5-cache/dev-libs/starpu-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-apps/hwloc sci-mathematics/glpk blas? ( virtual/blas ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) qt4? ( >=dev-qt/qtgui-4.7:4 >=dev-qt/qtopengl-4.7:4 >=dev-qt/qtsql-4.7:4 x11-libs/qwt ) virtual/pkgconfig test? ( gcc-plugin? ( dev-scheme/guile ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/hwloc sci-mathematics/glpk blas? ( virtual/blas ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) qt4? ( >=dev-qt/qtgui-4.7:4 >=dev-qt/qtopengl-4.7:4 >=dev-qt/qtsql-4.7:4 x11-libs/qwt ) virtual/pkgconfig test? ( gcc-plugin? ( dev-scheme/guile ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Unified runtime system for heterogeneous multicore architectures
 EAPI=5
 HOMEPAGE=http://runtime.bordeaux.inria.fr/StarPU/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-apps/hwloc sci-mathematics/glpk blas? ( virtual/blas ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) qt4? ( >=dev-qt/qtgui-4.7:4 >=dev-qt/qtopengl-4.7:4 >=dev-qt/qtsql-4.7:4 x11-libs/qwt )
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/32086/starpu-1.0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fb9793d690bb5791e4f612972523b0ba
diff --git a/metadata/md5-cache/dev-libs/svrcore-4.0.4 b/metadata/md5-cache/dev-libs/svrcore-4.0.4
index e3bbe87d945b..88a91c7b9893 100644
--- a/metadata/md5-cache/dev-libs/svrcore-4.0.4
+++ b/metadata/md5-cache/dev-libs/svrcore-4.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/nss-3.11 >=dev-libs/nspr-4.6 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/nss-3.11 >=dev-libs/nspr-4.6 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Mozilla LDAP C SDK
 EAPI=2
 HOMEPAGE=http://wiki.mozilla.org/LDAP_C_SDK
@@ -8,5 +8,5 @@ LICENSE=MPL-1.1 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.11 >=dev-libs/nspr-4.6
 SLOT=0
 SRC_URI=http://ftp.mozilla.org/pub/mozilla.org/directory/svrcore/releases/4.0.4/src/svrcore-4.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b8d68044a0549ccfcee946c1af6265c
diff --git a/metadata/md5-cache/dev-libs/tntnet-1.6.3 b/metadata/md5-cache/dev-libs/tntnet-1.6.3
index 37896b53a5db..b238b70bc4ab 100644
--- a/metadata/md5-cache/dev-libs/tntnet-1.6.3
+++ b/metadata/md5-cache/dev-libs/tntnet-1.6.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND==dev-libs/cxxtools-1* sys-libs/zlib ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 ) !gnutls? ( dev-libs/openssl ) ) app-arch/zip ssl? ( gnutls? ( virtual/pkgconfig ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-libs/cxxtools-1* sys-libs/zlib ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 ) !gnutls? ( dev-libs/openssl ) ) app-arch/zip ssl? ( gnutls? ( virtual/pkgconfig ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A modular, multithreaded webapplicationserver extensible with C++.
 EAPI=2
 HOMEPAGE=http://www.tntnet.org/index.hms
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND==dev-libs/cxxtools-1* sys-libs/zlib ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 ) !gnutls? ( dev-libs/openssl ) )
 SLOT=0
 SRC_URI=http://www.tntnet.org/download/tntnet-1.6.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ac8aba463810472779de98233270df51
diff --git a/metadata/md5-cache/dev-libs/tntnet-2.0-r1 b/metadata/md5-cache/dev-libs/tntnet-2.0-r1
index 537afe674e26..ac95f0c04c89 100644
--- a/metadata/md5-cache/dev-libs/tntnet-2.0-r1
+++ b/metadata/md5-cache/dev-libs/tntnet-2.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND==dev-libs/cxxtools-2.0* sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt ) !gnutls? ( dev-libs/openssl ) ) virtual/pkgconfig examples? ( app-arch/zip ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-libs/cxxtools-2.0* sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt ) !gnutls? ( dev-libs/openssl ) ) virtual/pkgconfig examples? ( app-arch/zip ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Modular, multithreaded webapplicationserver extensible with C++
 EAPI=3
 HOMEPAGE=http://www.tntnet.org/index.hms
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND==dev-libs/cxxtools-2.0* sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt ) !gnutls? ( dev-libs/openssl ) )
 SLOT=0
 SRC_URI=http://www.tntnet.org/download/tntnet-2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=531dc779c7f780fa6946cee5cc1f5970
diff --git a/metadata/md5-cache/dev-libs/tntnet-2.1 b/metadata/md5-cache/dev-libs/tntnet-2.1
index a8128026c6ae..7dc41b0abd4c 100644
--- a/metadata/md5-cache/dev-libs/tntnet-2.1
+++ b/metadata/md5-cache/dev-libs/tntnet-2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND==dev-libs/cxxtools-2.1* sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt ) !gnutls? ( dev-libs/openssl ) ) virtual/pkgconfig examples? ( app-arch/zip ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-libs/cxxtools-2.1* sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt ) !gnutls? ( dev-libs/openssl ) ) virtual/pkgconfig examples? ( app-arch/zip ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Modular, multithreaded webapplicationserver extensible with C++
 EAPI=4
 HOMEPAGE=http://www.tntnet.org/index.hms
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND==dev-libs/cxxtools-2.1* sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt ) !gnutls? ( dev-libs/openssl ) )
 SLOT=0
 SRC_URI=http://www.tntnet.org/download/tntnet-2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=563cedc9a638d80d89aeba1903ecb309
diff --git a/metadata/md5-cache/dev-libs/totem-pl-parser-2.32.6-r3 b/metadata/md5-cache/dev-libs/totem-pl-parser-2.32.6-r3
index 2830b8dc7720..368ff89fe8a0 100644
--- a/metadata/md5-cache/dev-libs/totem-pl-parser-2.32.6-r3
+++ b/metadata/md5-cache/dev-libs/totem-pl-parser-2.32.6-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.24:2 dev-libs/gmime:2.6 >=net-libs/libsoup-gnome-2.30:2.4 archive? ( >=app-arch/libarchive-2.8.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) quvi? ( >=media-libs/libquvi-0.2.15 ) !<media-video/totem-2.21 dev-libs/gobject-introspection-common >=dev-util/intltool-0.35 dev-util/gtk-doc-am gnome-base/gnome-common >=sys-devel/gettext-0.17 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.24:2 dev-libs/gmime:2.6 >=net-libs/libsoup-gnome-2.30:2.4 archive? ( >=app-arch/libarchive-2.8.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) quvi? ( >=media-libs/libquvi-0.2.15 ) !<media-video/totem-2.21 dev-libs/gobject-introspection-common >=dev-util/intltool-0.35 dev-util/gtk-doc-am gnome-base/gnome-common >=sys-devel/gettext-0.17 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Playlist parsing library
 EAPI=4
 HOMEPAGE=http://projects.gnome.org/totem/ http://developer.gnome.org/totem-pl-parser/stable/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.24:2 dev-libs/gmime:2.6 >=net-libs/libsoup-gnome-2.30:2.4 archive? ( >=app-arch/libarchive-2.8.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) quvi? ( >=media-libs/libquvi-0.2.15 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/totem-pl-parser/2.32/totem-pl-parser-2.32.6.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f4db9acced420439391acfdb7601b2e0
diff --git a/metadata/md5-cache/dev-libs/totem-pl-parser-3.4.3-r1 b/metadata/md5-cache/dev-libs/totem-pl-parser-3.4.3-r1
index 297db755c96a..eea984e19c01 100644
--- a/metadata/md5-cache/dev-libs/totem-pl-parser-3.4.3-r1
+++ b/metadata/md5-cache/dev-libs/totem-pl-parser-3.4.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.31:2 dev-libs/gmime:2.6 >=net-libs/libsoup-gnome-2.30:2.4 archive? ( >=app-arch/libarchive-2.8.4 ) crypt? ( dev-libs/libgcrypt ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) quvi? ( >=media-libs/libquvi-0.2.15 ) !<media-video/totem-2.21 dev-libs/gobject-introspection-common >=dev-util/intltool-0.35 dev-util/gtk-doc-am >=gnome-base/gnome-common-3.6 >=sys-devel/gettext-0.17 virtual/pkgconfig test? ( gnome-base/gvfs[http] sys-apps/dbus ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.31:2 dev-libs/gmime:2.6 >=net-libs/libsoup-gnome-2.30:2.4 archive? ( >=app-arch/libarchive-2.8.4 ) crypt? ( dev-libs/libgcrypt ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) quvi? ( >=media-libs/libquvi-0.2.15 ) !<media-video/totem-2.21 dev-libs/gobject-introspection-common >=dev-util/intltool-0.35 dev-util/gtk-doc-am >=gnome-base/gnome-common-3.6 >=sys-devel/gettext-0.17 virtual/pkgconfig test? ( gnome-base/gvfs[http] sys-apps/dbus ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Playlist parsing library
 EAPI=4
 HOMEPAGE=http://projects.gnome.org/totem/ http://developer.gnome.org/totem-pl-parser/stable/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.31:2 dev-libs/gmime:2.6 >=net-libs/libsoup-gnome-2.30:2.4 archive? ( >=app-arch/libarchive-2.8.4 ) crypt? ( dev-libs/libgcrypt ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) quvi? ( >=media-libs/libquvi-0.2.15 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/totem-pl-parser/3.4/totem-pl-parser-3.4.3.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=90d8cdc7e45478a3f1dad2566a90eed4
diff --git a/metadata/md5-cache/dev-libs/ucl-1.03-r1 b/metadata/md5-cache/dev-libs/ucl-1.03-r1
index c265abd37761..02d0ad32d82d 100644
--- a/metadata/md5-cache/dev-libs/ucl-1.03-r1
+++ b/metadata/md5-cache/dev-libs/ucl-1.03-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=the UCL Compression Library
 EAPI=4
 HOMEPAGE=http://www.oberhumer.com/opensource/ucl/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=57899d16891a0226ee38914c1db9e7a4
diff --git a/metadata/md5-cache/dev-libs/ucommon-5.2.2-r3 b/metadata/md5-cache/dev-libs/ucommon-5.2.2-r3
index df0098a6f3ff..e7fa5773468a 100644
--- a/metadata/md5-cache/dev-libs/ucommon-5.2.2-r3
+++ b/metadata/md5-cache/dev-libs/ucommon-5.2.2-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls[-nettle] dev-libs/libgcrypt ) )
 SLOT=0
 SRC_URI=mirror://gnu/commoncpp/ucommon-5.2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=714fd76764808927b0d34814a645e4c4
diff --git a/metadata/md5-cache/dev-libs/ucommon-5.5.0 b/metadata/md5-cache/dev-libs/ucommon-5.5.0
index eca8628f6f89..3f3512d51edc 100644
--- a/metadata/md5-cache/dev-libs/ucommon-5.5.0
+++ b/metadata/md5-cache/dev-libs/ucommon-5.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Portable C++ runtime for threads and sockets
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/commoncpp
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) )
 SLOT=0
 SRC_URI=mirror://gnu/commoncpp/ucommon-5.5.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=042dd115e99e2af76c955b25c27709e6
diff --git a/metadata/md5-cache/dev-libs/ucommon-6.0.0 b/metadata/md5-cache/dev-libs/ucommon-6.0.0
index 6bf486c56231..1fc1f5e565c7 100644
--- a/metadata/md5-cache/dev-libs/ucommon-6.0.0
+++ b/metadata/md5-cache/dev-libs/ucommon-6.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Portable C++ runtime for threads and sockets
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/commoncpp
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) )
 SLOT=0
 SRC_URI=mirror://gnu/commoncpp/ucommon-6.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=75a361fe8522efd09170c1d19f94e75a
diff --git a/metadata/md5-cache/dev-libs/ucommon-6.0.3 b/metadata/md5-cache/dev-libs/ucommon-6.0.3
index c0f5dc917e78..0bb4ec6b293f 100644
--- a/metadata/md5-cache/dev-libs/ucommon-6.0.3
+++ b/metadata/md5-cache/dev-libs/ucommon-6.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Portable C++ runtime for threads and sockets
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/commoncpp
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) )
 SLOT=0
 SRC_URI=mirror://gnu/commoncpp/ucommon-6.0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9f460a9f14829ff20c8081f0f3887f49
diff --git a/metadata/md5-cache/dev-libs/udis86-1.7 b/metadata/md5-cache/dev-libs/udis86-1.7
index e88cbea8db45..4ef4593e67e0 100644
--- a/metadata/md5-cache/dev-libs/udis86-1.7
+++ b/metadata/md5-cache/dev-libs/udis86-1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=test? ( amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=test? ( amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Disassembler library for the x86/-64 architecture sets.
 EAPI=3
 HOMEPAGE=http://udis86.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/udis86/udis86-1.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8353036d5fb63c4c04275f8b4762cab0
diff --git a/metadata/md5-cache/dev-libs/udis86-1.7-r1 b/metadata/md5-cache/dev-libs/udis86-1.7-r1
index 6e2be3886965..0427b3ceb8c4 100644
--- a/metadata/md5-cache/dev-libs/udis86-1.7-r1
+++ b/metadata/md5-cache/dev-libs/udis86-1.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=test? ( amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=test? ( amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Disassembler library for the x86/-64 architecture sets.
 EAPI=4
 HOMEPAGE=http://udis86.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/udis86/udis86-1.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1f168c80aa49010e9b1f22f271499727
diff --git a/metadata/md5-cache/dev-libs/uriparser-0.7.5 b/metadata/md5-cache/dev-libs/uriparser-0.7.5
index 20838d8d9fa5..113faed64c8c 100644
--- a/metadata/md5-cache/dev-libs/uriparser-0.7.5
+++ b/metadata/md5-cache/dev-libs/uriparser-0.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.8 qt4? ( dev-qt/qthelp:4 ) ) test? ( dev-util/cpptest ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.8 qt4? ( dev-qt/qthelp:4 ) ) test? ( dev-util/cpptest ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Uriparser is a strictly RFC 3986 compliant URI parsing library in C
 EAPI=2
 HOMEPAGE=http://uriparser.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/uriparser/uriparser-0.7.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=35cfad80b9174458cd6c985addd24679
diff --git a/metadata/md5-cache/dev-libs/wayland-0.95.0 b/metadata/md5-cache/dev-libs/wayland-0.95.0
index a5141bb065c4..0757d16df21f 100644
--- a/metadata/md5-cache/dev-libs/wayland-0.95.0
+++ b/metadata/md5-cache/dev-libs/wayland-0.95.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/expat virtual/libffi dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/expat virtual/libffi dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Wayland protocol libraries
 EAPI=4
 HOMEPAGE=http://wayland.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-3.0 MIT
 RDEPEND=dev-libs/expat virtual/libffi
 SLOT=0
 SRC_URI=http://wayland.freedesktop.org/releases/wayland-0.95.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=ed55e3a9488f99d399e148f49580bda5
diff --git a/metadata/md5-cache/dev-libs/wayland-1.0.4 b/metadata/md5-cache/dev-libs/wayland-1.0.4
index ef35f54ecf82..d57d1466b26b 100644
--- a/metadata/md5-cache/dev-libs/wayland-1.0.4
+++ b/metadata/md5-cache/dev-libs/wayland-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare test
-DEPEND=dev-libs/expat virtual/libffi || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/expat virtual/libffi || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Wayland protocol libraries
 EAPI=4
 HOMEPAGE=http://wayland.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-3.0 MIT
 RDEPEND=dev-libs/expat virtual/libffi
 SLOT=0
 SRC_URI=http://wayland.freedesktop.org/releases/wayland-1.0.4.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=c7bc137ba8ca5183f3e1d0adc386a558
diff --git a/metadata/md5-cache/dev-libs/wayland-1.0.6 b/metadata/md5-cache/dev-libs/wayland-1.0.6
index e98bc54c3d5e..ee53afd8ebb3 100644
--- a/metadata/md5-cache/dev-libs/wayland-1.0.6
+++ b/metadata/md5-cache/dev-libs/wayland-1.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/expat virtual/libffi doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/expat virtual/libffi doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Wayland protocol libraries
 EAPI=5
 HOMEPAGE=http://wayland.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-3.0 MIT
 RDEPEND=dev-libs/expat virtual/libffi
 SLOT=0
 SRC_URI=http://wayland.freedesktop.org/releases/wayland-1.0.6.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=9351727a6a98249f5cb1f5bc9d338828
diff --git a/metadata/md5-cache/dev-libs/wayland-1.1.0 b/metadata/md5-cache/dev-libs/wayland-1.1.0
index 079b38f63063..97d59f3d105c 100644
--- a/metadata/md5-cache/dev-libs/wayland-1.1.0
+++ b/metadata/md5-cache/dev-libs/wayland-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/expat virtual/libffi doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/expat virtual/libffi doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Wayland protocol libraries
 EAPI=5
 HOMEPAGE=http://wayland.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-3.0 MIT
 RDEPEND=dev-libs/expat virtual/libffi
 SLOT=0
 SRC_URI=http://wayland.freedesktop.org/releases/wayland-1.1.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=83d1f34a8b80eb66f2d90337b848aa34
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.13 b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.13
index c4efcc6a7eeb..5d61234e2a2d 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.13
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND==dev-libs/xapian-1.2.13* 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.12:1.12 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) ) python? ( =dev-lang/python-2* ) =dev-lang/python-2*[threads]
+DEPEND==dev-libs/xapian-1.2.13* 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) ) python? ( =dev-lang/python-2* ) =dev-lang/python-2*[threads]
 DESCRIPTION=SWIG and JNI bindings for Xapian
 EAPI=4
 HOMEPAGE=http://www.xapian.org/
@@ -10,5 +10,5 @@ RDEPEND==dev-libs/xapian-1.2.13* lua? ( >=dev-lang/lua-5.1 ) mono? ( >=dev-lang/
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) || ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://oligarchy.co.uk/xapian/1.2.13/xapian-bindings-1.2.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0633f584821acdd47bebade3381ae30f
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.14 b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.14
index 647cbbf5d3b5..c06e7a610468 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.14
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND==dev-libs/xapian-1.2.14* 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.12:1.12 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) ) python? ( =dev-lang/python-2* ) =dev-lang/python-2*[threads]
+DEPEND==dev-libs/xapian-1.2.14* 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) ) python? ( =dev-lang/python-2* ) =dev-lang/python-2*[threads]
 DESCRIPTION=SWIG and JNI bindings for Xapian
 EAPI=5
 HOMEPAGE=http://www.xapian.org/
@@ -10,5 +10,5 @@ RDEPEND==dev-libs/xapian-1.2.14* lua? ( >=dev-lang/lua-5.1 ) mono? ( >=dev-lang/
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) || ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://oligarchy.co.uk/xapian/1.2.14/xapian-bindings-1.2.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=50cb38ca3a2e53c5529e4afc335bb104
diff --git a/metadata/md5-cache/dev-libs/xqilla-2.2.4 b/metadata/md5-cache/dev-libs/xqilla-2.2.4
index 0074b0e4088b..42f37d340023 100644
--- a/metadata/md5-cache/dev-libs/xqilla-2.2.4
+++ b/metadata/md5-cache/dev-libs/xqilla-2.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/xerces-c-3.1.0 faxpp? ( dev-libs/faxpp ) htmltidy? ( app-text/htmltidy ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/xerces-c-3.1.0 faxpp? ( dev-libs/faxpp ) htmltidy? ( app-text/htmltidy ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An XQuery and XPath 2 library and command line utility written in C++.
 EAPI=2
 HOMEPAGE=http://xqilla.sourceforge.net/HomePage
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD
 RDEPEND=>=dev-libs/xerces-c-3.1.0 faxpp? ( dev-libs/faxpp ) htmltidy? ( app-text/htmltidy )
 SLOT=0
 SRC_URI=mirror://sourceforge/xqilla/XQilla-2.2.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=305f9d7f0c59da1e99d115e68d53d8eb
diff --git a/metadata/md5-cache/dev-libs/xqilla-2.3.0 b/metadata/md5-cache/dev-libs/xqilla-2.3.0
index f7fe742505b6..59d272802e2b 100644
--- a/metadata/md5-cache/dev-libs/xqilla-2.3.0
+++ b/metadata/md5-cache/dev-libs/xqilla-2.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/xerces-c-3.1.1 faxpp? ( dev-libs/faxpp ) htmltidy? ( app-text/htmltidy ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/xerces-c-3.1.1 faxpp? ( dev-libs/faxpp ) htmltidy? ( app-text/htmltidy ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An XQuery and XPath 2 library and command line utility written in C++.
 EAPI=4
 HOMEPAGE=http://xqilla.sourceforge.net/HomePage
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD
 RDEPEND=>=dev-libs/xerces-c-3.1.1 faxpp? ( dev-libs/faxpp ) htmltidy? ( app-text/htmltidy )
 SLOT=0
 SRC_URI=mirror://sourceforge/xqilla/XQilla-2.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8251f258190e06cf2d9fd432118c4999
diff --git a/metadata/md5-cache/dev-libs/yaz-3.0.26 b/metadata/md5-cache/dev-libs/yaz-3.0.26
index f019f3b2f1b2..d65dc4082872 100644
--- a/metadata/md5-cache/dev-libs/yaz-3.0.26
+++ b/metadata/md5-cache/dev-libs/yaz-3.0.26
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap ) virtual/pkgconfig dev-lang/tcl || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap ) virtual/pkgconfig dev-lang/tcl || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C/C++ programmer's toolkit supporting the development of Z39.50v3 clients and servers
 HOMEPAGE=http://www.indexdata.dk/yaz
 IUSE=debug icu tcpd ziffy
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap )
 SLOT=0
 SRC_URI=http://ftp.indexdata.dk/pub/yaz/yaz-3.0.26.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4c6264f12ab909c59e0e51e5bc7ae759
diff --git a/metadata/md5-cache/dev-libs/yaz-3.0.36 b/metadata/md5-cache/dev-libs/yaz-3.0.36
index 6c5e543365e7..ee9d5f4c30fa 100644
--- a/metadata/md5-cache/dev-libs/yaz-3.0.36
+++ b/metadata/md5-cache/dev-libs/yaz-3.0.36
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap ) virtual/pkgconfig dev-lang/tcl || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap ) virtual/pkgconfig dev-lang/tcl || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C/C++ programmer's toolkit supporting the development of Z39.50v3 clients and servers
 HOMEPAGE=http://www.indexdata.dk/yaz
 IUSE=debug icu tcpd ziffy
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap )
 SLOT=0
 SRC_URI=http://ftp.indexdata.dk/pub/yaz/yaz-3.0.36.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ef77f3bccb049781c8936df6d67e6de8
diff --git a/metadata/md5-cache/dev-libs/yaz-3.0.47 b/metadata/md5-cache/dev-libs/yaz-3.0.47
index 8d2ab3981b1b..7855a92f5511 100644
--- a/metadata/md5-cache/dev-libs/yaz-3.0.47
+++ b/metadata/md5-cache/dev-libs/yaz-3.0.47
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap ) virtual/pkgconfig dev-lang/tcl >=sys-devel/libtool-2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap ) virtual/pkgconfig dev-lang/tcl >=sys-devel/libtool-2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C/C++ programmer's toolkit supporting the development of Z39.50v3 clients and servers
 EAPI=2
 HOMEPAGE=http://www.indexdata.dk/yaz
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap )
 SLOT=0
 SRC_URI=http://ftp.indexdata.dk/pub/yaz/yaz-3.0.47.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c84070195442d46b3f4567691ae10db1
diff --git a/metadata/md5-cache/dev-libs/yaz-3.0.50 b/metadata/md5-cache/dev-libs/yaz-3.0.50
index 5fde4acd1f67..86364033d4bb 100644
--- a/metadata/md5-cache/dev-libs/yaz-3.0.50
+++ b/metadata/md5-cache/dev-libs/yaz-3.0.50
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap ) virtual/pkgconfig dev-lang/tcl >=sys-devel/libtool-2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap ) virtual/pkgconfig dev-lang/tcl >=sys-devel/libtool-2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C/C++ programmer's toolkit supporting the development of Z39.50v3 clients and servers
 EAPI=2
 HOMEPAGE=http://www.indexdata.dk/yaz
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap )
 SLOT=0
 SRC_URI=http://ftp.indexdata.dk/pub/yaz/yaz-3.0.50.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7eb6682f869b303f353007b183a7893e
diff --git a/metadata/md5-cache/dev-libs/yaz-3.0.53 b/metadata/md5-cache/dev-libs/yaz-3.0.53
index 18d1803b5593..dd22f67f661e 100644
--- a/metadata/md5-cache/dev-libs/yaz-3.0.53
+++ b/metadata/md5-cache/dev-libs/yaz-3.0.53
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap ) virtual/pkgconfig dev-lang/tcl >=sys-devel/libtool-2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap ) virtual/pkgconfig dev-lang/tcl >=sys-devel/libtool-2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C/C++ programmer's toolkit supporting the development of Z39.50v3 clients and servers
 EAPI=2
 HOMEPAGE=http://www.indexdata.dk/yaz
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap )
 SLOT=0
 SRC_URI=http://ftp.indexdata.dk/pub/yaz/yaz-3.0.53.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3c7a7750efb13dac3a13ed2395fcf6c0
diff --git a/metadata/md5-cache/dev-libs/yaz-4.2.30 b/metadata/md5-cache/dev-libs/yaz-4.2.30
index 387e6af0cd71..a3df3562c23e 100644
--- a/metadata/md5-cache/dev-libs/yaz-4.2.30
+++ b/metadata/md5-cache/dev-libs/yaz-4.2.30
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap ) virtual/pkgconfig dev-lang/tcl >=sys-devel/libtool-2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap ) virtual/pkgconfig dev-lang/tcl >=sys-devel/libtool-2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C/C++ programmer's toolkit supporting the development of Z39.50v3 clients and servers
 EAPI=2
 HOMEPAGE=http://www.indexdata.dk/yaz
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap )
 SLOT=4
 SRC_URI=http://ftp.indexdata.dk/pub/yaz/yaz-4.2.30.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3e98e364a2f316105c5a5ff4ce720f33
diff --git a/metadata/md5-cache/dev-libs/yaz-4.2.51 b/metadata/md5-cache/dev-libs/yaz-4.2.51
index 0e4179f87639..0022c91c27bf 100644
--- a/metadata/md5-cache/dev-libs/yaz-4.2.51
+++ b/metadata/md5-cache/dev-libs/yaz-4.2.51
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap ) virtual/pkgconfig dev-lang/tcl >=sys-devel/libtool-2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap ) virtual/pkgconfig dev-lang/tcl >=sys-devel/libtool-2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C/C++ programmer's toolkit supporting the development of Z39.50v3 clients and servers
 EAPI=2
 HOMEPAGE=http://www.indexdata.dk/yaz
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap )
 SLOT=4
 SRC_URI=http://ftp.indexdata.dk/pub/yaz/yaz-4.2.51.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=68545133327681b541a0594ea62f6ac3
diff --git a/metadata/md5-cache/dev-libs/zthread-2.3.2-r1 b/metadata/md5-cache/dev-libs/zthread-2.3.2-r1
index 0f8d687f52a4..3080de9cc1a0 100644
--- a/metadata/md5-cache/dev-libs/zthread-2.3.2-r1
+++ b/metadata/md5-cache/dev-libs/zthread-2.3.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A platform-independent multi-threading and synchronization library for C++
 EAPI=2
 HOMEPAGE=http://zthread.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ~hppa ~mips ppc sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://sourceforge/zthread/ZThread-2.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d01bc24d90d5053e4547c9a3ce829ba8
diff --git a/metadata/md5-cache/dev-libs/zthread-2.3.2-r2 b/metadata/md5-cache/dev-libs/zthread-2.3.2-r2
index 8fe5e2679d9b..421b729b8f07 100644
--- a/metadata/md5-cache/dev-libs/zthread-2.3.2-r2
+++ b/metadata/md5-cache/dev-libs/zthread-2.3.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=platform-independent multi-threading and synchronization library for C++
 EAPI=4
 HOMEPAGE=http://zthread.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://sourceforge/zthread/ZThread-2.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=614401616176f8b981a59efd853a9ff0
diff --git a/metadata/md5-cache/dev-libs/zthread-2.3.2-r3 b/metadata/md5-cache/dev-libs/zthread-2.3.2-r3
index 83f42989b550..a71de5fbed82 100644
--- a/metadata/md5-cache/dev-libs/zthread-2.3.2-r3
+++ b/metadata/md5-cache/dev-libs/zthread-2.3.2-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=platform-independent multi-threading and synchronization library for C++
 EAPI=5
 HOMEPAGE=http://zthread.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://sourceforge/zthread/ZThread-2.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e6c260d0fead409f1df94ed14a4115aa
diff --git a/metadata/md5-cache/dev-lisp/gcl-2.6.7 b/metadata/md5-cache/dev-lisp/gcl-2.6.7
index 76a66730e246..336e07d33e46 100644
--- a/metadata/md5-cache/dev-lisp/gcl-2.6.7
+++ b/metadata/md5-cache/dev-lisp/gcl-2.6.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=emacs? ( virtual/emacs ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw ) readline? ( sys-libs/readline ) >=dev-libs/gmp-4.1 tk? ( dev-lang/tk ) doc? ( virtual/texi2dvi ) >=app-text/texi2html-1.64 >=sys-devel/autoconf-2.52 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=emacs? ( virtual/emacs ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw ) readline? ( sys-libs/readline ) >=dev-libs/gmp-4.1 tk? ( dev-lang/tk ) doc? ( virtual/texi2dvi ) >=app-text/texi2html-1.64 >=sys-devel/autoconf-2.52 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU Common Lisp
 HOMEPAGE=http://www.gnu.org/software/gcl/gcl.html
 IUSE=emacs readline debug X tk custreloc dlopen gprof doc ansi
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=emacs? ( virtual/emacs ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw ) readline? ( sys-libs/readline ) >=dev-libs/gmp-4.1 tk? ( dev-lang/tk )
 SLOT=0
 SRC_URI=ftp://ftp.gnu.org/gnu/gcl/gcl-2.6.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=403c5a000d7d0a219a2e6db2e3c7f20c
diff --git a/metadata/md5-cache/dev-lisp/gcl-2.6.7-r1 b/metadata/md5-cache/dev-lisp/gcl-2.6.7-r1
index 2e2684591dfb..1a8f7db17a02 100644
--- a/metadata/md5-cache/dev-lisp/gcl-2.6.7-r1
+++ b/metadata/md5-cache/dev-lisp/gcl-2.6.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=emacs? ( virtual/emacs ) readline? ( sys-libs/readline ) >=dev-libs/gmp-4.1 tk? ( dev-lang/tk ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw ) doc? ( virtual/texi2dvi ) >=app-text/texi2html-1.64 >=sys-devel/autoconf-2.52 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=emacs? ( virtual/emacs ) readline? ( sys-libs/readline ) >=dev-libs/gmp-4.1 tk? ( dev-lang/tk ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw ) doc? ( virtual/texi2dvi ) >=app-text/texi2html-1.64 >=sys-devel/autoconf-2.52 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU Common Lisp
 HOMEPAGE=http://www.gnu.org/software/gcl/gcl.html
 IUSE=emacs readline debug X tk custreloc dlopen gprof doc ansi
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=emacs? ( virtual/emacs ) readline? ( sys-libs/readline ) >=dev-libs/gmp-4.1 tk? ( dev-lang/tk ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw )
 SLOT=0
 SRC_URI=ftp://ftp.gnu.org/gnu/gcl/gcl-2.6.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f7cb56bb36ea05cc9987de775bd11932
diff --git a/metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0 b/metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0
index 4fff94755edf..91ee4d8cc50c 100644
--- a/metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0
+++ b/metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/ocaml x11-libs/cairo gtk? ( dev-ml/lablgtk:2 ) pango? ( x11-libs/pango ) svg? ( x11-libs/libsvg-cairo ) >=dev-ml/findlib-1.0.4-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/ocaml x11-libs/cairo gtk? ( dev-ml/lablgtk:2 ) pango? ( x11-libs/pango ) svg? ( x11-libs/libsvg-cairo ) >=dev-ml/findlib-1.0.4-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Ocaml bindings for the cairo vector graphics library
 EAPI=4
 HOMEPAGE=http://www.cairographics.org/cairo-ocaml/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml x11-libs/cairo gtk? ( dev-ml/lablgtk:2 ) pango? ( x11-libs/pango ) svg? ( x11-libs/libsvg-cairo )
 SLOT=0
 SRC_URI=http://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-1.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	findlib	9cf6020ee5481f39f1aa566a323f9868	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	findlib	9cf6020ee5481f39f1aa566a323f9868	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=790a1e1b9682f99554ddd7b126c62eff
diff --git a/metadata/md5-cache/dev-ml/ocurl-0.5.1 b/metadata/md5-cache/dev-ml/ocurl-0.5.1
index ae4f64f947b8..45ece54aefdc 100644
--- a/metadata/md5-cache/dev-ml/ocurl-0.5.1
+++ b/metadata/md5-cache/dev-ml/ocurl-0.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=net-misc/curl-7.9.8 dev-libs/openssl >=dev-ml/findlib-1.0.4-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-misc/curl-7.9.8 dev-libs/openssl >=dev-ml/findlib-1.0.4-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OCaml interface to the libcurl library
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/ocurl
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=net-misc/curl-7.9.8 dev-libs/openssl
 SLOT=0
 SRC_URI=mirror://sourceforge/ocurl/ocurl-0.5.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	findlib	9cf6020ee5481f39f1aa566a323f9868	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	findlib	9cf6020ee5481f39f1aa566a323f9868	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=00cb72ac865c22d04d98e35f469e59ee
diff --git a/metadata/md5-cache/dev-ml/ocurl-0.5.3 b/metadata/md5-cache/dev-ml/ocurl-0.5.3
index dd65dfe40d13..555e4a5cdf97 100644
--- a/metadata/md5-cache/dev-ml/ocurl-0.5.3
+++ b/metadata/md5-cache/dev-ml/ocurl-0.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=net-misc/curl-7.9.8 dev-libs/openssl >=dev-lang/ocaml-3.12:=[ocamlopt] >=dev-ml/findlib-1.0.4-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-misc/curl-7.9.8 dev-libs/openssl >=dev-lang/ocaml-3.12:=[ocamlopt] >=dev-ml/findlib-1.0.4-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OCaml interface to the libcurl library
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/ocurl
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=net-misc/curl-7.9.8 dev-libs/openssl >=dev-lang/ocaml-3.12:=[ocamlopt]
 SLOT=0/0.5.3
 SRC_URI=mirror://sourceforge/ocurl/ocurl-0.5.3.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	findlib	9cf6020ee5481f39f1aa566a323f9868	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	findlib	9cf6020ee5481f39f1aa566a323f9868	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f79ab972580bc8c49347a2dc745a2aa0
diff --git a/metadata/md5-cache/dev-php/adodb-ext-504-r3 b/metadata/md5-cache/dev-php/adodb-ext-504-r3
index 3694d89c827a..f80e0fc5c269 100644
--- a/metadata/md5-cache/dev-php/adodb-ext-504-r3
+++ b/metadata/md5-cache/dev-php/adodb-ext-504-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-php/adodb-4.70 app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=>=dev-php/adodb-4.70 app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP extension providing up to 100% speedup by replacing parts of ADOdb with C code.
 EAPI=5
 HOMEPAGE=http://adodb.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-php/adodb-4.70 php_targets_php5-3? ( dev-lang/php:5.3 )
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://phplens.com/lens/dl/adodb-ext-504.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b017acd806ac5f1a5a73665399287920
diff --git a/metadata/md5-cache/dev-php/eaccelerator-0.9.6.1-r5 b/metadata/md5-cache/dev-php/eaccelerator-0.9.6.1-r5
index 7b3877248a13..150c2339f53e 100644
--- a/metadata/md5-cache/dev-php/eaccelerator-0.9.6.1-r5
+++ b/metadata/md5-cache/dev-php/eaccelerator-0.9.6.1-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=!dev-php/pecl-apc !dev-php/xcache apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=!dev-php/pecl-apc !dev-php/xcache apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=A PHP Accelerator & Encoder.
 EAPI=4
 HOMEPAGE=http://www.eaccelerator.net/
@@ -10,5 +10,5 @@ RDEPEND=!dev-php/pecl-apc !dev-php/xcache >=dev-lang/php-5.1[zlib,session?] virt
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://bart.eaccelerator.net/source/0.9.6.1/eaccelerator-0.9.6.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8f0204525aa384e0537df060aab3957b
diff --git a/metadata/md5-cache/dev-php/ffmpeg-php-0.6.0-r1 b/metadata/md5-cache/dev-php/ffmpeg-php-0.6.0-r1
index fdd6fca67674..7ed165e1cce6 100644
--- a/metadata/md5-cache/dev-php/ffmpeg-php-0.6.0-r1
+++ b/metadata/md5-cache/dev-php/ffmpeg-php-0.6.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=virtual/ffmpeg || ( dev-lang/php[gd] dev-lang/php[gd-external] ) || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=virtual/ffmpeg || ( dev-lang/php[gd] dev-lang/php[gd-external] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP extension that provides access to movie info.
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/ffmpeg-php/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( php_targets_php5-3 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ffmpeg-php/ffmpeg-php-0.6.0.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4b5de6d535d3d2bc3eac68d5039b3c0d
diff --git a/metadata/md5-cache/dev-php/ffmpeg-php-0.6.0-r2 b/metadata/md5-cache/dev-php/ffmpeg-php-0.6.0-r2
index 23ebc035d533..de6a6caeb4bf 100644
--- a/metadata/md5-cache/dev-php/ffmpeg-php-0.6.0-r2
+++ b/metadata/md5-cache/dev-php/ffmpeg-php-0.6.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=virtual/ffmpeg dev-lang/php[gd] || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=virtual/ffmpeg dev-lang/php[gd] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP extension that provides access to movie info.
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/ffmpeg-php/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ffmpeg-php/ffmpeg-php-0.6.0.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a5193de071f9733a76771e0d590b924a
diff --git a/metadata/md5-cache/dev-php/igbinary-1.1.1-r1 b/metadata/md5-cache/dev-php/igbinary-1.1.1-r1
index a5619b17370a..98a8eab1aa8e 100644
--- a/metadata/md5-cache/dev-php/igbinary-1.1.1-r1
+++ b/metadata/md5-cache/dev-php/igbinary-1.1.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=A fast drop in replacement for the standard PHP serialize
 EAPI=5
 HOMEPAGE=http://opensource.dynamoid.com/
@@ -10,5 +10,5 @@ RDEPEND=php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://opensource.dynamoid.com/igbinary-1.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=465ab0088698c0cd662c0a285185e885
diff --git a/metadata/md5-cache/dev-php/igbinary-1.1.1-r2 b/metadata/md5-cache/dev-php/igbinary-1.1.1-r2
index b02bae119f4c..5006975943ef 100644
--- a/metadata/md5-cache/dev-php/igbinary-1.1.1-r2
+++ b/metadata/md5-cache/dev-php/igbinary-1.1.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 DESCRIPTION=A fast drop in replacement for the standard PHP serialize
 EAPI=5
 HOMEPAGE=http://opensource.dynamoid.com/
@@ -10,5 +10,5 @@ RDEPEND=php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/
 REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://opensource.dynamoid.com/igbinary-1.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6a4672c4102916267a33c8e14d37f0ce
diff --git a/metadata/md5-cache/dev-php/libvirt-php-0.4.6 b/metadata/md5-cache/dev-php/libvirt-php-0.4.6
index cc5aff3ca6dd..8b42063b1e6f 100644
--- a/metadata/md5-cache/dev-php/libvirt-php-0.4.6
+++ b/metadata/md5-cache/dev-php/libvirt-php-0.4.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-emulation/libvirt dev-libs/libxml2 dev-libs/libxslt doc? ( app-text/xhtml1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=app-emulation/libvirt dev-libs/libxml2 dev-libs/libxslt doc? ( app-text/xhtml1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP 5 bindings for libvirt.
 EAPI=4
 HOMEPAGE=http://libvirt.org/php/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://libvirt.org/sources/php/libvirt-php-0.4.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a491e65992a4785ec7f5f67dcfe7dd4d
diff --git a/metadata/md5-cache/dev-php/libvirt-php-0.4.7 b/metadata/md5-cache/dev-php/libvirt-php-0.4.7
index 357f252ce945..a51332cd39d8 100644
--- a/metadata/md5-cache/dev-php/libvirt-php-0.4.7
+++ b/metadata/md5-cache/dev-php/libvirt-php-0.4.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-emulation/libvirt dev-libs/libxml2 dev-libs/libxslt doc? ( app-text/xhtml1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=app-emulation/libvirt dev-libs/libxml2 dev-libs/libxslt doc? ( app-text/xhtml1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP 5 bindings for libvirt.
 EAPI=4
 HOMEPAGE=http://libvirt.org/php/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://libvirt.org/sources/php/libvirt-php-0.4.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2389f874ae9b67ff694dda51427d388e
diff --git a/metadata/md5-cache/dev-php/libvirt-php-9999 b/metadata/md5-cache/dev-php/libvirt-php-9999
index 8bc05438528f..582ed97a4d26 100644
--- a/metadata/md5-cache/dev-php/libvirt-php-9999
+++ b/metadata/md5-cache/dev-php/libvirt-php-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-emulation/libvirt dev-libs/libxml2 dev-libs/libxslt doc? ( app-text/xhtml1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=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-vcs/git
+DEPEND=app-emulation/libvirt dev-libs/libxml2 dev-libs/libxslt doc? ( app-text/xhtml1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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-vcs/git
 DESCRIPTION=PHP 5 bindings for libvirt.
 EAPI=4
 HOMEPAGE=http://libvirt.org/php/
@@ -9,5 +9,5 @@ RDEPEND=app-emulation/libvirt dev-libs/libxml2 php_targets_php5-3? ( dev-lang/ph
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=81ecae652a09e58f805ef1d586986a8f
diff --git a/metadata/md5-cache/dev-php/magickwand-1.0.9 b/metadata/md5-cache/dev-php/magickwand-1.0.9
index 3314e3d8f240..862f60107c0a 100644
--- a/metadata/md5-cache/dev-php/magickwand-1.0.9
+++ b/metadata/md5-cache/dev-php/magickwand-1.0.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=media-gfx/imagemagick-6.5.2.9 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DEPEND=>=media-gfx/imagemagick-6.5.2.9 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 DESCRIPTION=A native PHP-extension to the ImageMagick MagickWand API.
 EAPI=4
 HOMEPAGE=http://www.magickwand.org/
@@ -10,5 +10,5 @@ RDEPEND=>=media-gfx/imagemagick-6.5.2.9 php_targets_php5-5? ( dev-lang/php:5.5 )
 REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://www.magickwand.org/download/php/MagickWandForPHP-1.0.9-2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=68dba979f8c209463826749fca1dac58
diff --git a/metadata/md5-cache/dev-php/pecl-amqp-1.0.9 b/metadata/md5-cache/dev-php/pecl-amqp-1.0.9
index fdddba7643bf..a09e728034a8 100644
--- a/metadata/md5-cache/dev-php/pecl-amqp-1.0.9
+++ b/metadata/md5-cache/dev-php/pecl-amqp-1.0.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=net-libs/rabbitmq-c || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=net-libs/rabbitmq-c || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP Bindings for AMQP 0-9-1 compatible brokers.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/amqp
@@ -10,5 +10,5 @@ RDEPEND=net-libs/rabbitmq-c php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/amqp-1.0.9.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f19c3687a639a37cd203382b96d7cb1b
diff --git a/metadata/md5-cache/dev-php/pecl-apc-3.1.13 b/metadata/md5-cache/dev-php/pecl-apc-3.1.13
index bda0ffb0cea2..ddd319392007 100644
--- a/metadata/md5-cache/dev-php/pecl-apc-3.1.13
+++ b/metadata/md5-cache/dev-php/pecl-apc-3.1.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=!dev-php/eaccelerator !dev-php/xcache !dev-php/pecl-apcu !dev-php/pecl-zendopcache dev-lang/php[-opcache(-)] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DEPEND=!dev-php/eaccelerator !dev-php/xcache !dev-php/pecl-apcu !dev-php/pecl-zendopcache dev-lang/php[-opcache(-)] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 DESCRIPTION=A free, open, and robust framework for caching and optimizing PHP code.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/APC
@@ -10,5 +10,5 @@ RDEPEND=!dev-php/eaccelerator !dev-php/xcache !dev-php/pecl-apcu !dev-php/pecl-z
 REQUIRED_USE=^^ ( lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore ) || ( php_targets_php5-5 php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/APC-3.1.13.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=49df6e6b36849b36187b3fa8e54bea9b
diff --git a/metadata/md5-cache/dev-php/pecl-apc-3.1.9-r2 b/metadata/md5-cache/dev-php/pecl-apc-3.1.9-r2
index d8137cf26722..059e3bc2c853 100644
--- a/metadata/md5-cache/dev-php/pecl-apc-3.1.9-r2
+++ b/metadata/md5-cache/dev-php/pecl-apc-3.1.9-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=!dev-php/eaccelerator !dev-php/xcache !dev-php/pecl-apcu !dev-php/pecl-zendopcache dev-lang/php[-opcache(-)] || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=!dev-php/eaccelerator !dev-php/xcache !dev-php/pecl-apcu !dev-php/pecl-zendopcache dev-lang/php[-opcache(-)] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=A free, open, and robust framework for caching and optimizing PHP code.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/APC
@@ -10,5 +10,5 @@ RDEPEND=!dev-php/eaccelerator !dev-php/xcache !dev-php/pecl-apcu !dev-php/pecl-z
 REQUIRED_USE=^^ ( lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore ) || ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/APC-3.1.9.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b84065ce72a85672510717e54c57f554
diff --git a/metadata/md5-cache/dev-php/pecl-bbcode-1.0.3_beta1 b/metadata/md5-cache/dev-php/pecl-bbcode-1.0.3_beta1
index 1d3c82bb5659..8b36ed3ae0e1 100644
--- a/metadata/md5-cache/dev-php/pecl-bbcode-1.0.3_beta1
+++ b/metadata/md5-cache/dev-php/pecl-bbcode-1.0.3_beta1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=A quick and efficient BBCode Parsing Library.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/bbcode
@@ -10,5 +10,5 @@ RDEPEND=php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/bbcode-1.0.3b1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ad8301d3d67062404e15f647db948dd4
diff --git a/metadata/md5-cache/dev-php/pecl-cairo-0.3.1 b/metadata/md5-cache/dev-php/pecl-cairo-0.3.1
index 6e96e763579d..3793436b195b 100644
--- a/metadata/md5-cache/dev-php/pecl-cairo-0.3.1
+++ b/metadata/md5-cache/dev-php/pecl-cairo-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=x11-libs/cairo-1.4[svg] || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=>=x11-libs/cairo-1.4[svg] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Cairo bindings for PHP
 EAPI=4
 HOMEPAGE=http://pecl.php.net/cairo
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/cairo-1.4[svg] php_targets_php5-3? ( dev-lang/php:5.3 ) php_t
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/cairo-0.3.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e8e1aa98e9417d9635b0e8bb8fdccbc3
diff --git a/metadata/md5-cache/dev-php/pecl-crack-0.4-r2 b/metadata/md5-cache/dev-php/pecl-crack-0.4-r2
index c71321a6499f..82c9131141c5 100644
--- a/metadata/md5-cache/dev-php/pecl-crack-0.4-r2
+++ b/metadata/md5-cache/dev-php/pecl-crack-0.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP interface to the cracklib libraries.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/crack
@@ -10,5 +10,5 @@ RDEPEND=php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/crack-0.4.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e24f43f19874d453cd2d438bddcb930c
diff --git a/metadata/md5-cache/dev-php/pecl-crack-0.4-r3 b/metadata/md5-cache/dev-php/pecl-crack-0.4-r3
index 71bd1bf93e1a..8d62faabbf2b 100644
--- a/metadata/md5-cache/dev-php/pecl-crack-0.4-r3
+++ b/metadata/md5-cache/dev-php/pecl-crack-0.4-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP interface to the cracklib libraries.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/crack
@@ -10,5 +10,5 @@ RDEPEND=php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/crack-0.4.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=76e1a51cb746f73a9709b50c5beadae3
diff --git a/metadata/md5-cache/dev-php/pecl-dbx-1.1.2 b/metadata/md5-cache/dev-php/pecl-dbx-1.1.2
index 0f63b4f4f694..bf4418dfa0f5 100644
--- a/metadata/md5-cache/dev-php/pecl-dbx-1.1.2
+++ b/metadata/md5-cache/dev-php/pecl-dbx-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=The dbx module is a database abstraction layer.
 EAPI=5
 HOMEPAGE=http://pecl.php.net/dbx
@@ -10,5 +10,5 @@ RDEPEND=php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/dbx-1.1.2.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8a32234b6b98dbebd041b1d55b38575c
diff --git a/metadata/md5-cache/dev-php/pecl-dio-0.0.7 b/metadata/md5-cache/dev-php/pecl-dio-0.0.7
index 58a310aad3fe..a421c70d8334 100644
--- a/metadata/md5-cache/dev-php/pecl-dio-0.0.7
+++ b/metadata/md5-cache/dev-php/pecl-dio-0.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Direct I/O functions for PHP.
 EAPI=5
 HOMEPAGE=http://pecl.php.net/dio
@@ -10,5 +10,5 @@ RDEPEND=php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/dio-0.0.7.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=000eb632f0629c5c8ba520ffc648015a
diff --git a/metadata/md5-cache/dev-php/pecl-drizzle-0.4.2-r2 b/metadata/md5-cache/dev-php/pecl-drizzle-0.4.2-r2
index ba9f8f9e6edb..8de1000c3cc6 100644
--- a/metadata/md5-cache/dev-php/pecl-drizzle-0.4.2-r2
+++ b/metadata/md5-cache/dev-php/pecl-drizzle-0.4.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-db/drizzle || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=dev-db/drizzle || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP extension using libdrizzle library to provide communcation with Drizzle and MySQL databases
 EAPI=4
 HOMEPAGE=http://pecl.php.net/drizzle
@@ -10,5 +10,5 @@ RDEPEND=dev-db/drizzle php_targets_php5-3? ( dev-lang/php:5.3 )
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/drizzle-0.4.2.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e2d2eeddc8e21cbf9bba1275a4778abd
diff --git a/metadata/md5-cache/dev-php/pecl-gearman-1.0.2 b/metadata/md5-cache/dev-php/pecl-gearman-1.0.2
index 9d3936dd76d7..427e4f4dbfc0 100644
--- a/metadata/md5-cache/dev-php/pecl-gearman-1.0.2
+++ b/metadata/md5-cache/dev-php/pecl-gearman-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=sys-cluster/gearmand-0.21 || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=>=sys-cluster/gearmand-0.21 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP extension for using gearmand.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/gearman
@@ -10,5 +10,5 @@ RDEPEND=>=sys-cluster/gearmand-0.21 php_targets_php5-3? ( dev-lang/php:5.3 ) php
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/gearman-1.0.2.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a1bbfa00b5f8b52d48b7bacaa401458e
diff --git a/metadata/md5-cache/dev-php/pecl-geoip-1.0.8-r1 b/metadata/md5-cache/dev-php/pecl-geoip-1.0.8-r1
index 316effd09ff8..5673ae7fa876 100644
--- a/metadata/md5-cache/dev-php/pecl-geoip-1.0.8-r1
+++ b/metadata/md5-cache/dev-php/pecl-geoip-1.0.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/geoip-1.4.0 || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=>=dev-libs/geoip-1.4.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP extension to map IP address to geographic places
 EAPI=4
 HOMEPAGE=http://pecl.php.net/geoip
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/geoip-1.4.0 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targ
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/geoip-1.0.8.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2db30cb236ded55e9729977850cac414
diff --git a/metadata/md5-cache/dev-php/pecl-gnupg-1.3.2-r1 b/metadata/md5-cache/dev-php/pecl-gnupg-1.3.2-r1
index 943a89ff2623..ff79e77d1d97 100644
--- a/metadata/md5-cache/dev-php/pecl-gnupg-1.3.2-r1
+++ b/metadata/md5-cache/dev-php/pecl-gnupg-1.3.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-crypt/gpgme || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=app-crypt/gpgme || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP wrapper around the gpgme library
 EAPI=5
 HOMEPAGE=http://pecl.php.net/gnupg
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gpgme php_targets_php5-3? ( dev-lang/php:5.3 )
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/gnupg-1.3.2.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aa1c2e7b2baf10bf3e171f979529fd75
diff --git a/metadata/md5-cache/dev-php/pecl-haru-1.0.3 b/metadata/md5-cache/dev-php/pecl-haru-1.0.3
index e78541db8abc..e4a437d8c95f 100644
--- a/metadata/md5-cache/dev-php/pecl-haru-1.0.3
+++ b/metadata/md5-cache/dev-php/pecl-haru-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-libs/libharu[png?,zlib?] || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=media-libs/libharu[png?,zlib?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=An interface to libharu, a PDF generator
 EAPI=4
 HOMEPAGE=http://pecl.php.net/haru
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libharu[png?,zlib?] php_targets_php5-3? ( dev-lang/php:5.3 )
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/haru-1.0.3.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aa2ff80c6d6df7ae781ef70d577de974
diff --git a/metadata/md5-cache/dev-php/pecl-htscanner-1.0.1 b/metadata/md5-cache/dev-php/pecl-htscanner-1.0.1
index df3bcb988390..be20ea5517fd 100644
--- a/metadata/md5-cache/dev-php/pecl-htscanner-1.0.1
+++ b/metadata/md5-cache/dev-php/pecl-htscanner-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/php[cgi] || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=dev-lang/php[cgi] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Enables .htaccess options for php-scripts running as cgi.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/htscanner
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/php[cgi] php_targets_php5-3? ( dev-lang/php:5.3 )
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/htscanner-1.0.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5dd54a98a619705a7ef4bb487a5e4e0e
diff --git a/metadata/md5-cache/dev-php/pecl-http-1.7.4 b/metadata/md5-cache/dev-php/pecl-http-1.7.4
index 95a33039fd1a..20e7312a2e8c 100644
--- a/metadata/md5-cache/dev-php/pecl-http-1.7.4
+++ b/metadata/md5-cache/dev-php/pecl-http-1.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent >=dev-lang/php-5[hash,session,iconv] || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=>=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent >=dev-lang/php-5[hash,session,iconv] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Extended HTTP Support for PHP.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/pecl_http
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent >=dev-lang/php-5[
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 ) || ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/pecl_http-1.7.4.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bbf413f94736f864d290673ed058590c
diff --git a/metadata/md5-cache/dev-php/pecl-http-1.7.5 b/metadata/md5-cache/dev-php/pecl-http-1.7.5
index 6fdc6104c5a7..78a09c49ba9b 100644
--- a/metadata/md5-cache/dev-php/pecl-http-1.7.5
+++ b/metadata/md5-cache/dev-php/pecl-http-1.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=net-misc/curl sys-libs/zlib dev-libs/libevent dev-lang/php[hash,session,iconv] || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=net-misc/curl sys-libs/zlib dev-libs/libevent dev-lang/php[hash,session,iconv] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Extended HTTP Support for PHP.
 EAPI=5
 HOMEPAGE=http://pecl.php.net/pecl_http
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl sys-libs/zlib dev-libs/libevent dev-lang/php[hash,session,
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 ) || ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/pecl_http-1.7.5.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fdc975c57627bcd18c259c9e888b08b6
diff --git a/metadata/md5-cache/dev-php/pecl-id3-0.2-r2 b/metadata/md5-cache/dev-php/pecl-id3-0.2-r2
index a75a61e8b56a..993144acd61b 100644
--- a/metadata/md5-cache/dev-php/pecl-id3-0.2-r2
+++ b/metadata/md5-cache/dev-php/pecl-id3-0.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Read and write ID3 tags in MP3 files with PHP.
 EAPI=5
 HOMEPAGE=http://pecl.php.net/id3
@@ -10,5 +10,5 @@ RDEPEND=php_targets_php5-3? ( dev-lang/php:5.3 )
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/id3-0.2.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2268119fcd368a65a75079c0e04a4b53
diff --git a/metadata/md5-cache/dev-php/pecl-imagick-3.0.1-r1 b/metadata/md5-cache/dev-php/pecl-imagick-3.0.1-r1
index ff92765e3450..928f6cb7cd51 100644
--- a/metadata/md5-cache/dev-php/pecl-imagick-3.0.1-r1
+++ b/metadata/md5-cache/dev-php/pecl-imagick-3.0.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=media-gfx/imagemagick-6.2.4 || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=>=media-gfx/imagemagick-6.2.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP wrapper for the ImageMagick library.
 EAPI=5
 HOMEPAGE=http://pecl.php.net/imagick
@@ -10,5 +10,5 @@ RDEPEND=>=media-gfx/imagemagick-6.2.4 php_targets_php5-3? ( dev-lang/php:5.3 )
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/imagick-3.0.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=70a5d6060bdbe6a8d3a6dfa5ce420ba3
diff --git a/metadata/md5-cache/dev-php/pecl-imagick-3.1.0_rc2 b/metadata/md5-cache/dev-php/pecl-imagick-3.1.0_rc2
index 2b0a78c5cbad..9e917d801912 100644
--- a/metadata/md5-cache/dev-php/pecl-imagick-3.1.0_rc2
+++ b/metadata/md5-cache/dev-php/pecl-imagick-3.1.0_rc2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=media-gfx/imagemagick-6.2.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DEPEND=>=media-gfx/imagemagick-6.2.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 DESCRIPTION=PHP wrapper for the ImageMagick library.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/imagick
@@ -10,5 +10,5 @@ RDEPEND=>=media-gfx/imagemagick-6.2.4 php_targets_php5-5? ( dev-lang/php:5.5 ) p
 REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/imagick-3.1.0RC2.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b9c008052d4f78c798aa89ca273ff61
diff --git a/metadata/md5-cache/dev-php/pecl-libevent-0.0.4 b/metadata/md5-cache/dev-php/pecl-libevent-0.0.4
index 76adeebef5b1..21d48b418cf7 100644
--- a/metadata/md5-cache/dev-php/pecl-libevent-0.0.4
+++ b/metadata/md5-cache/dev-php/pecl-libevent-0.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libevent-1.4.0 || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=>=dev-libs/libevent-1.4.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP wrapper for libevent
 EAPI=4
 HOMEPAGE=http://pecl.php.net/libevent
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libevent-1.4.0 php_targets_php5-3? ( dev-lang/php:5.3 ) php_t
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/libevent-0.0.4.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7ed4ae0d3b0b1beea44a7a3db8112fd7
diff --git a/metadata/md5-cache/dev-php/pecl-lzf-1.6.2 b/metadata/md5-cache/dev-php/pecl-lzf-1.6.2
index 8cb8935e1ffb..6fefad934faf 100644
--- a/metadata/md5-cache/dev-php/pecl-lzf-1.6.2
+++ b/metadata/md5-cache/dev-php/pecl-lzf-1.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=This package handles LZF de/compression.
 EAPI=5
 HOMEPAGE=http://pecl.php.net/LZF
@@ -10,5 +10,5 @@ RDEPEND=php_targets_php5-3? ( dev-lang/php:5.3 )
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/LZF-1.6.2.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8dc5e41081b6d77f89f067030a7186ca
diff --git a/metadata/md5-cache/dev-php/pecl-mailparse-2.1.6 b/metadata/md5-cache/dev-php/pecl-mailparse-2.1.6
index 0f6f5369e5f6..f24fe107cf55 100644
--- a/metadata/md5-cache/dev-php/pecl-mailparse-2.1.6
+++ b/metadata/md5-cache/dev-php/pecl-mailparse-2.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/php[unicode] dev-util/re2c || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=dev-lang/php[unicode] dev-util/re2c || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=A PHP extension for parsing and working with RFC822 and RFC2045 (MIME) compliant messages.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/mailparse
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/php[unicode] php_targets_php5-3? ( dev-lang/php:5.3 ) php_targe
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/mailparse-2.1.6.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9c6f0df225361f52022f37f299d31991
diff --git a/metadata/md5-cache/dev-php/pecl-memcache-2.2.6-r2 b/metadata/md5-cache/dev-php/pecl-memcache-2.2.6-r2
index 761fdb969f2c..5cb1b8901c63 100644
--- a/metadata/md5-cache/dev-php/pecl-memcache-2.2.6-r2
+++ b/metadata/md5-cache/dev-php/pecl-memcache-2.2.6-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP extension for using memcached.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/memcache
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( php_targets_php5-3 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://pecl.php.net/get/memcache-2.2.6.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d3ed80dc5adb60676fb581c4bdb18af3
diff --git a/metadata/md5-cache/dev-php/pecl-memcache-2.2.7 b/metadata/md5-cache/dev-php/pecl-memcache-2.2.7
index e3f54932d15c..54f92721860e 100644
--- a/metadata/md5-cache/dev-php/pecl-memcache-2.2.7
+++ b/metadata/md5-cache/dev-php/pecl-memcache-2.2.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-3? ( dev-lang/php:5.3 )
+DEPEND=sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-3? ( dev-lang/php:5.3 )
 DESCRIPTION=PHP extension for using memcached.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/memcache
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-4 php_targets_php5-3 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://pecl.php.net/get/memcache-2.2.7.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=be7519fdf6b364fa91126b9f2ed1db74
diff --git a/metadata/md5-cache/dev-php/pecl-memcache-3.0.7 b/metadata/md5-cache/dev-php/pecl-memcache-3.0.7
index d42377a7cd7b..bcb92259f7f5 100644
--- a/metadata/md5-cache/dev-php/pecl-memcache-3.0.7
+++ b/metadata/md5-cache/dev-php/pecl-memcache-3.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DEPEND=sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 DESCRIPTION=PHP extension for using memcached.
 EAPI=5
 HOMEPAGE=http://pecl.php.net/memcache
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-3 php_targets_php5-4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://pecl.php.net/get/memcache-3.0.7.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6d4f3d5035f4831098fb7316c5d43138
diff --git a/metadata/md5-cache/dev-php/pecl-memcache-3.0.8 b/metadata/md5-cache/dev-php/pecl-memcache-3.0.8
index 03d56abb2065..0d12a669c6c5 100644
--- a/metadata/md5-cache/dev-php/pecl-memcache-3.0.8
+++ b/metadata/md5-cache/dev-php/pecl-memcache-3.0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DEPEND=sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 DESCRIPTION=PHP extension for using memcached.
 EAPI=5
 HOMEPAGE=http://pecl.php.net/memcache
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-3 php_targets_php5-4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://pecl.php.net/get/memcache-3.0.8.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=833c7f3b0a6a4dfb55937e76b3584fdf
diff --git a/metadata/md5-cache/dev-php/pecl-memcached-1.0.2-r1 b/metadata/md5-cache/dev-php/pecl-memcached-1.0.2-r1
index 9f3e95e55ef6..590b55082df4 100644
--- a/metadata/md5-cache/dev-php/pecl-memcached-1.0.2-r1
+++ b/metadata/md5-cache/dev-php/pecl-memcached-1.0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libmemcached-0.38 sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=>=dev-libs/libmemcached-0.38 sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP extension for interfacing with memcached via libmemcached library
 EAPI=5
 HOMEPAGE=http://pecl.php.net/memcached
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libmemcached-0.38 sys-libs/zlib dev-lang/php[session?] php_ta
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/memcached-1.0.2.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=de63d36aebd76aae428325c2b101847f
diff --git a/metadata/md5-cache/dev-php/pecl-memcached-2.1.0-r1 b/metadata/md5-cache/dev-php/pecl-memcached-2.1.0-r1
index 5264845cc9c8..6f522f7099a0 100644
--- a/metadata/md5-cache/dev-php/pecl-memcached-2.1.0-r1
+++ b/metadata/md5-cache/dev-php/pecl-memcached-2.1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libmemcached-1.0 sys-libs/zlib dev-lang/php[session?] igbinary? ( dev-php/igbinary[php_targets_php5-4?,php_targets_php5-3?] ) || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=>=dev-libs/libmemcached-1.0 sys-libs/zlib dev-lang/php[session?] igbinary? ( dev-php/igbinary[php_targets_php5-4?,php_targets_php5-3?] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP extension for interfacing with memcached via libmemcached library
 EAPI=4
 HOMEPAGE=http://pecl.php.net/memcached
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libmemcached-1.0 sys-libs/zlib dev-lang/php[session?] igbinar
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/memcached-2.1.0.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cbc677a7617d3e6d40d485fc62d75d60
diff --git a/metadata/md5-cache/dev-php/pecl-memcached-2.1.0-r2 b/metadata/md5-cache/dev-php/pecl-memcached-2.1.0-r2
index aab69beee132..893f34e3a4db 100644
--- a/metadata/md5-cache/dev-php/pecl-memcached-2.1.0-r2
+++ b/metadata/md5-cache/dev-php/pecl-memcached-2.1.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=dev-libs/libmemcached-1.0.14 >=dev-libs/libmemcached-1.0[sasl?] ) sys-libs/zlib dev-lang/php[session?,json?] igbinary? ( dev-php/igbinary[php_targets_php5-5?,php_targets_php5-4?,php_targets_php5-3?] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DEPEND=|| ( >=dev-libs/libmemcached-1.0.14 >=dev-libs/libmemcached-1.0[sasl?] ) sys-libs/zlib dev-lang/php[session?,json?] igbinary? ( dev-php/igbinary[php_targets_php5-5?,php_targets_php5-4?,php_targets_php5-3?] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 DESCRIPTION=PHP extension for interfacing with memcached via libmemcached library
 EAPI=4
 HOMEPAGE=http://pecl.php.net/memcached
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=dev-libs/libmemcached-1.0.14 >=dev-libs/libmemcached-1.0[sasl?] )
 REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/memcached-2.1.0.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=82fa469fc29e8c7d6ef52b797d73ccb6
diff --git a/metadata/md5-cache/dev-php/pecl-mogilefs-0.9.1 b/metadata/md5-cache/dev-php/pecl-mogilefs-0.9.1
index e147efc5f069..cda87d2f7ba2 100644
--- a/metadata/md5-cache/dev-php/pecl-mogilefs-0.9.1
+++ b/metadata/md5-cache/dev-php/pecl-mogilefs-0.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=net-libs/neon || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=net-libs/neon || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP client library to communicate with the MogileFS storage
 EAPI=4
 HOMEPAGE=http://projects.usrportage.de/index.fcgi/php-mogilefs
@@ -10,5 +10,5 @@ RDEPEND=net-libs/neon php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/mogilefs-0.9.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e4a0cc10125da35976650ed22a13214a
diff --git a/metadata/md5-cache/dev-php/pecl-mongo-1.3.4 b/metadata/md5-cache/dev-php/pecl-mongo-1.3.4
index 2067275bde89..926b6484d0a5 100644
--- a/metadata/md5-cache/dev-php/pecl-mongo-1.3.4
+++ b/metadata/md5-cache/dev-php/pecl-mongo-1.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=MongoDB database driver
 EAPI=5
 HOMEPAGE=http://pecl.php.net/mongo
@@ -10,5 +10,5 @@ RDEPEND=php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/mongo-1.3.4.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d250d1b24e6e4964192cdde68bd7d2df
diff --git a/metadata/md5-cache/dev-php/pecl-mysqlnd_ms-1.4.1 b/metadata/md5-cache/dev-php/pecl-mysqlnd_ms-1.4.1
index 38fd4b5a177e..dd123172998c 100644
--- a/metadata/md5-cache/dev-php/pecl-mysqlnd_ms-1.4.1
+++ b/metadata/md5-cache/dev-php/pecl-mysqlnd_ms-1.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/php[mysqlnd] || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=dev-lang/php[mysqlnd] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=A replication and load balancing plugin for the mysqlnd library.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/mysqlnd_ms
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/php[mysqlnd] php_targets_php5-3? ( dev-lang/php:5.3 ) php_targe
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/mysqlnd_ms-1.4.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c2df68432e797139962fc7e6c494b288
diff --git a/metadata/md5-cache/dev-php/pecl-mysqlnd_qc-1.0.1 b/metadata/md5-cache/dev-php/pecl-mysqlnd_qc-1.0.1
index d064651a9144..43358116caa7 100644
--- a/metadata/md5-cache/dev-php/pecl-mysqlnd_qc-1.0.1
+++ b/metadata/md5-cache/dev-php/pecl-mysqlnd_qc-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/php[mysqlnd] || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=dev-lang/php[mysqlnd] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=A query cache plugin for the mysqlnd library.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/mysqlnd_qc
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/php[mysqlnd] php_targets_php5-3? ( dev-lang/php:5.3 )
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/mysqlnd_qc-1.0.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=61947cf383c88578896bee31759a6576
diff --git a/metadata/md5-cache/dev-php/pecl-ncurses-1.0.1 b/metadata/md5-cache/dev-php/pecl-ncurses-1.0.1
index 0c5a47eae80f..d084d13bfd5c 100644
--- a/metadata/md5-cache/dev-php/pecl-ncurses-1.0.1
+++ b/metadata/md5-cache/dev-php/pecl-ncurses-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Terminal screen handling and optimization package
 EAPI=4
 HOMEPAGE=http://pecl.php.net/ncurses
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses php_targets_php5-3? ( dev-lang/php:5.3 )
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/ncurses-1.0.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9872b3eecb3c0ce441d9f126d78412e2
diff --git a/metadata/md5-cache/dev-php/pecl-oauth-1.2.2-r1 b/metadata/md5-cache/dev-php/pecl-oauth-1.2.2-r1
index eeb38e29b480..15408fdac196 100644
--- a/metadata/md5-cache/dev-php/pecl-oauth-1.2.2-r1
+++ b/metadata/md5-cache/dev-php/pecl-oauth-1.2.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/php[hash] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DEPEND=dev-lang/php[hash] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 DESCRIPTION=OAuth is an authorization protocol built on top of HTTP
 EAPI=4
 HOMEPAGE=http://pecl.php.net/oauth
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/php[hash] php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_
 REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/oauth-1.2.2.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8054ad948ea67e853929092e515ac639
diff --git a/metadata/md5-cache/dev-php/pecl-oauth-1.2.3 b/metadata/md5-cache/dev-php/pecl-oauth-1.2.3
index 5bd9a4b2c32d..ae6878def13e 100644
--- a/metadata/md5-cache/dev-php/pecl-oauth-1.2.3
+++ b/metadata/md5-cache/dev-php/pecl-oauth-1.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/php[hash] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DEPEND=dev-lang/php[hash] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 DESCRIPTION=OAuth is an authorization protocol built on top of HTTP
 EAPI=5
 HOMEPAGE=http://pecl.php.net/oauth
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/php[hash] php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_
 REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/oauth-1.2.3.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5954fa048dd9c840907958526b8a7a2a
diff --git a/metadata/md5-cache/dev-php/pecl-pam-1.0.3 b/metadata/md5-cache/dev-php/pecl-pam-1.0.3
index 164509755e35..c2e12df4482c 100644
--- a/metadata/md5-cache/dev-php/pecl-pam-1.0.3
+++ b/metadata/md5-cache/dev-php/pecl-pam-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/pam || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=sys-libs/pam || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=This extension provides PAM (Pluggable Authentication Modules) integration.
 EAPI=5
 HOMEPAGE=http://pecl.php.net/pam
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/pam php_targets_php5-3? ( dev-lang/php:5.3 )
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/pam-1.0.3.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e29158faba33cceb21c5fadc039f570f
diff --git a/metadata/md5-cache/dev-php/pecl-ps-1.3.6-r1 b/metadata/md5-cache/dev-php/pecl-ps-1.3.6-r1
index 6eeb56ee2b80..b59562c7e406 100644
--- a/metadata/md5-cache/dev-php/pecl-ps-1.3.6-r1
+++ b/metadata/md5-cache/dev-php/pecl-ps-1.3.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/pslib || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=dev-libs/pslib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP extension for creating PostScript files.
 EAPI=5
 HOMEPAGE=http://pecl.php.net/ps
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/pslib php_targets_php5-3? ( dev-lang/php:5.3 )
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/ps-1.3.6.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=65fb909f53f7ca8a1b0958c5ce73a4a1
diff --git a/metadata/md5-cache/dev-php/pecl-radius-1.2.5-r2 b/metadata/md5-cache/dev-php/pecl-radius-1.2.5-r2
index 9a8e2cb79037..3848b3e3d684 100644
--- a/metadata/md5-cache/dev-php/pecl-radius-1.2.5-r2
+++ b/metadata/md5-cache/dev-php/pecl-radius-1.2.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 DESCRIPTION=Provides full support for RADIUS authentication (RFC 2865) and RADIUS accounting (RFC 2866).
 EAPI=5
 HOMEPAGE=http://pecl.php.net/radius
@@ -10,5 +10,5 @@ RDEPEND=php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/
 REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/radius-1.2.5.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=821db1b57d1c497125e4aac561f12326
diff --git a/metadata/md5-cache/dev-php/pecl-radius-1.2.5-r3 b/metadata/md5-cache/dev-php/pecl-radius-1.2.5-r3
index 80cad2037d3b..159a02e1889a 100644
--- a/metadata/md5-cache/dev-php/pecl-radius-1.2.5-r3
+++ b/metadata/md5-cache/dev-php/pecl-radius-1.2.5-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 DESCRIPTION=Provides full support for RADIUS authentication (RFC 2865) and RADIUS accounting (RFC 2866).
 EAPI=5
 HOMEPAGE=http://pecl.php.net/radius
@@ -10,5 +10,5 @@ RDEPEND=php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/
 REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/radius-1.2.5.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8f0004dbdf84f3bdf8ce957a5ed54270
diff --git a/metadata/md5-cache/dev-php/pecl-rrd-1.0.5 b/metadata/md5-cache/dev-php/pecl-rrd-1.0.5
index fb867834924c..1c74e7428fb0 100644
--- a/metadata/md5-cache/dev-php/pecl-rrd-1.0.5
+++ b/metadata/md5-cache/dev-php/pecl-rrd-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=net-analyzer/rrdtool-1.4.5-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=>=net-analyzer/rrdtool-1.4.5-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=RRDtool bindings for PHP
 EAPI=4
 HOMEPAGE=http://pecl.php.net/rrd
@@ -10,5 +10,5 @@ RDEPEND=>=net-analyzer/rrdtool-1.4.5-r1 php_targets_php5-3? ( dev-lang/php:5.3 )
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/rrd-1.0.5.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=46b1d94a5940e50e681e06869b2ac0f2
diff --git a/metadata/md5-cache/dev-php/pecl-sca_sdo-1.2.4-r2 b/metadata/md5-cache/dev-php/pecl-sca_sdo-1.2.4-r2
index 121ad4d14ffe..f3a3bf1bfb51 100644
--- a/metadata/md5-cache/dev-php/pecl-sca_sdo-1.2.4-r2
+++ b/metadata/md5-cache/dev-php/pecl-sca_sdo-1.2.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=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.12:1.12 ) >=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 )
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Service Component Architecture (SCA) and Service Data Objects (SDO) for PHP.
 EAPI=5
 HOMEPAGE=http://pecl.php.net/SCA_SDO
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/php-5.2[json,soap,xml] || ( <dev-lang/php-5.3[pcre,reflection
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/SCA_SDO-1.2.4.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=89ad23f064eca86272f8916652b8d1f3
diff --git a/metadata/md5-cache/dev-php/pecl-sphinx-1.2.0 b/metadata/md5-cache/dev-php/pecl-sphinx-1.2.0
index edc1da2c4b9f..5ebce9903472 100644
--- a/metadata/md5-cache/dev-php/pecl-sphinx-1.2.0
+++ b/metadata/md5-cache/dev-php/pecl-sphinx-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-util/re2c-0.13 || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=>=dev-util/re2c-0.13 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP extension to execute search queries on a sphinx daemon
 EAPI=4
 HOMEPAGE=http://pecl.php.net/sphinx
@@ -10,5 +10,5 @@ RDEPEND=app-misc/sphinx php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/sphinx-1.2.0.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bd0250c25093111129257bc556ca9b0b
diff --git a/metadata/md5-cache/dev-php/pecl-spl_types-0.4.0 b/metadata/md5-cache/dev-php/pecl-spl_types-0.4.0
index 62b12f477cb1..3eca794f12c9 100644
--- a/metadata/md5-cache/dev-php/pecl-spl_types-0.4.0
+++ b/metadata/md5-cache/dev-php/pecl-spl_types-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Standard PHP library types add-on
 EAPI=5
 HOMEPAGE=http://pecl.php.net/spl_types
@@ -10,5 +10,5 @@ RDEPEND=php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/spl_types-0.4.0.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f0b68b1465ef56f020ff77c5141e139f
diff --git a/metadata/md5-cache/dev-php/pecl-ssh2-0.11.3-r1 b/metadata/md5-cache/dev-php/pecl-ssh2-0.11.3-r1
index ed9d1f821b53..e2fe2efacc95 100644
--- a/metadata/md5-cache/dev-php/pecl-ssh2-0.11.3-r1
+++ b/metadata/md5-cache/dev-php/pecl-ssh2-0.11.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=net-libs/libssh2-0.18 || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=>=net-libs/libssh2-0.18 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Provides bindings to the functions of libssh2 which implements the SSH2 protocol.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/ssh2
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libssh2-0.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_tar
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/ssh2-0.11.3.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fe1a27e3c30dc82d1b90787a73c4fb38
diff --git a/metadata/md5-cache/dev-php/pecl-ssh2-0.12 b/metadata/md5-cache/dev-php/pecl-ssh2-0.12
index 6799c93fa149..f8f695df5763 100644
--- a/metadata/md5-cache/dev-php/pecl-ssh2-0.12
+++ b/metadata/md5-cache/dev-php/pecl-ssh2-0.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=net-libs/libssh2-1.2 || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=>=net-libs/libssh2-1.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Provides bindings to the functions of libssh2 which implements the SSH2 protocol.
 EAPI=5
 HOMEPAGE=http://pecl.php.net/ssh2
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libssh2-1.2 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targ
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/ssh2-0.12.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=519d4b83f46472a13004ae8615c8a48a
diff --git a/metadata/md5-cache/dev-php/pecl-stomp-1.0.5 b/metadata/md5-cache/dev-php/pecl-stomp-1.0.5
index 1d05321177e8..f93751a0ba40 100644
--- a/metadata/md5-cache/dev-php/pecl-stomp-1.0.5
+++ b/metadata/md5-cache/dev-php/pecl-stomp-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=ssl? ( dev-lang/php[ssl] ) || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=ssl? ( dev-lang/php[ssl] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP extension to communicate with any Stomp compliant Message Brokers
 EAPI=5
 HOMEPAGE=http://pecl.php.net/stomp
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( dev-lang/php[ssl] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/stomp-1.0.5.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7cb5500b4dab86a436e81e39fd52b067
diff --git a/metadata/md5-cache/dev-php/pecl-svn-1.0.1 b/metadata/md5-cache/dev-php/pecl-svn-1.0.1
index 5dd2f2ad4f30..9fd684bd8ab8 100644
--- a/metadata/md5-cache/dev-php/pecl-svn-1.0.1
+++ b/metadata/md5-cache/dev-php/pecl-svn-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=<dev-vcs/subversion-1.7 || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=<dev-vcs/subversion-1.7 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP Bindings for the Subversion Revision control system.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/svn
@@ -10,5 +10,5 @@ RDEPEND=<dev-vcs/subversion-1.7 php_targets_php5-3? ( dev-lang/php:5.3 )
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/svn-1.0.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=592c4601e3cab644522a6e401c854028
diff --git a/metadata/md5-cache/dev-php/pecl-svn-1.0.2 b/metadata/md5-cache/dev-php/pecl-svn-1.0.2
new file mode 100644
index 000000000000..7caa8e5200b5
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-svn-1.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-vcs/subversion || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 ) php_targets_php5-5? ( dev-lang/php:5.5 )
+DESCRIPTION=PHP Bindings for the Subversion Revision control system.
+EAPI=5
+HOMEPAGE=http://pecl.php.net/svn
+IUSE=php_targets_php5-3 php_targets_php5-4 php_targets_php5-5
+KEYWORDS=~amd64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=dev-vcs/subversion php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 )
+REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 php_targets_php5-5 )
+SLOT=0
+SRC_URI=http://pecl.php.net/get/svn-1.0.2.tgz
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2a281abfaf7af865118b372b2b1c3886
diff --git a/metadata/md5-cache/dev-php/pecl-syck-0.9.3-r2 b/metadata/md5-cache/dev-php/pecl-syck-0.9.3-r2
index 9c21fcfd94e1..bbd21de12da0 100644
--- a/metadata/md5-cache/dev-php/pecl-syck-0.9.3-r2
+++ b/metadata/md5-cache/dev-php/pecl-syck-0.9.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/syck || ( <dev-lang/php-5.3.1[hash,spl] >=dev-lang/php-5.3.1[hash] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-3? ( dev-lang/php:5.3 )
+DEPEND=dev-libs/syck || ( <dev-lang/php-5.3.1[hash,spl] >=dev-lang/php-5.3.1[hash] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-3? ( dev-lang/php:5.3 )
 DESCRIPTION=PHP bindings for Syck - reads and writes YAML with it.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/syck
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/syck || ( <dev-lang/php-5.3.1[hash,spl] >=dev-lang/php-5.3.1[ha
 REQUIRED_USE=|| ( php_targets_php5-4 php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/syck-0.9.3.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=881cd1a0ad8545e0e3c1053035b0f718
diff --git a/metadata/md5-cache/dev-php/pecl-taint-0.4.1 b/metadata/md5-cache/dev-php/pecl-taint-0.4.1
index 9160e748073b..4ada802141e2 100644
--- a/metadata/md5-cache/dev-php/pecl-taint-0.4.1
+++ b/metadata/md5-cache/dev-php/pecl-taint-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Extension used for detecting XSS codes(tainted string)
 EAPI=4
 HOMEPAGE=http://pecl.php.net/taint
@@ -10,5 +10,5 @@ RDEPEND=php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/taint-0.4.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2b7f8fbdc666523160e31458e79ac988
diff --git a/metadata/md5-cache/dev-php/pecl-taint-0.5.3 b/metadata/md5-cache/dev-php/pecl-taint-0.5.3
index 37b783ee25a1..c61a67e38df5 100644
--- a/metadata/md5-cache/dev-php/pecl-taint-0.5.3
+++ b/metadata/md5-cache/dev-php/pecl-taint-0.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Extension used for detecting XSS codes(tainted string)
 EAPI=4
 HOMEPAGE=http://pecl.php.net/taint
@@ -10,5 +10,5 @@ RDEPEND=php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/taint-0.5.3.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e752a6165917c7b305d7b62ac5680f87
diff --git a/metadata/md5-cache/dev-php/pecl-timezonedb-2013.2 b/metadata/md5-cache/dev-php/pecl-timezonedb-2013.2
index 378c2a013be9..2994473a3ddb 100644
--- a/metadata/md5-cache/dev-php/pecl-timezonedb-2013.2
+++ b/metadata/md5-cache/dev-php/pecl-timezonedb-2013.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Timezone Database to be used with PHP's date and time functions
 EAPI=5
 HOMEPAGE=http://pecl.php.net/timezonedb
@@ -10,5 +10,5 @@ RDEPEND=php_targets_php5-3? ( dev-lang/php:5.3 )
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/timezonedb-2013.2.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=edee2ff9db9ef6c31d85dd613727635d
diff --git a/metadata/md5-cache/dev-php/pecl-translit-0.6.1 b/metadata/md5-cache/dev-php/pecl-translit-0.6.1
index ced0ca526a70..66a3ba276127 100644
--- a/metadata/md5-cache/dev-php/pecl-translit-0.6.1
+++ b/metadata/md5-cache/dev-php/pecl-translit-0.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Transliterates non-latin character sets to latin.
 EAPI=5
 HOMEPAGE=http://pecl.php.net/translit
@@ -10,5 +10,5 @@ RDEPEND=php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/translit-0.6.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2636a1352fb30b0b5f23ba54dc4d31df
diff --git a/metadata/md5-cache/dev-php/pecl-uploadprogress-1.0.3.1 b/metadata/md5-cache/dev-php/pecl-uploadprogress-1.0.3.1
index d819b92e2b60..2a2ec6611e1d 100644
--- a/metadata/md5-cache/dev-php/pecl-uploadprogress-1.0.3.1
+++ b/metadata/md5-cache/dev-php/pecl-uploadprogress-1.0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=An extension to track progress of a file upload.
 EAPI=5
 HOMEPAGE=http://pecl.php.net/uploadprogress
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/php[apache2] php_targets_php5-3? ( dev-lang/php:5.3 ) php_targe
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/uploadprogress-1.0.3.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=35301b791ce2f853b37e72e5b2660762
diff --git a/metadata/md5-cache/dev-php/pecl-uuid-1.0.3 b/metadata/md5-cache/dev-php/pecl-uuid-1.0.3
index 6d7db5a610de..b6597a4f215f 100644
--- a/metadata/md5-cache/dev-php/pecl-uuid-1.0.3
+++ b/metadata/md5-cache/dev-php/pecl-uuid-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-apps/util-linux || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=sys-apps/util-linux || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=A wrapper around libuuid.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/uuid
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/util-linux php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/uuid-1.0.3.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c69ca9c2799e896ebc7e87345814027c
diff --git a/metadata/md5-cache/dev-php/pecl-xdiff-1.5.2 b/metadata/md5-cache/dev-php/pecl-xdiff-1.5.2
index 3534dcc66908..c0dcb42a096a 100644
--- a/metadata/md5-cache/dev-php/pecl-xdiff-1.5.2
+++ b/metadata/md5-cache/dev-php/pecl-xdiff-1.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/libxdiff || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=dev-libs/libxdiff || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=PHP extension for generating diff files
 EAPI=4
 HOMEPAGE=http://pecl.php.net/xdiff
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxdiff php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_p
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdiff-1.5.2.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1949f983996706ccf129109a28f66c0f
diff --git a/metadata/md5-cache/dev-php/pecl-xrange-1.3.2 b/metadata/md5-cache/dev-php/pecl-xrange-1.3.2
index c5c89626f85e..c2e6daab7fed 100644
--- a/metadata/md5-cache/dev-php/pecl-xrange-1.3.2
+++ b/metadata/md5-cache/dev-php/pecl-xrange-1.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Implementation of weak references
 EAPI=4
 HOMEPAGE=http://pecl.php.net/xrange
@@ -10,5 +10,5 @@ RDEPEND=php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xrange-1.3.2.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=635224deab33b91be6f1106a223ed74e
diff --git a/metadata/md5-cache/dev-php/pecl-yaml-1.1.0 b/metadata/md5-cache/dev-php/pecl-yaml-1.1.0
index e7a17bf22c65..ccd510ecb228 100644
--- a/metadata/md5-cache/dev-php/pecl-yaml-1.1.0
+++ b/metadata/md5-cache/dev-php/pecl-yaml-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libyaml-0.1.0 || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=>=dev-libs/libyaml-0.1.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Support for YAML 1.1 (YAML Ain't Markup Language) serialization using the LibYAML library.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/yaml
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libyaml-0.1.0 php_targets_php5-3? ( dev-lang/php:5.3 ) php_ta
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/yaml-1.1.0.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b0d54c3c3e64297815c10de1d834cb86
diff --git a/metadata/md5-cache/dev-php/pecl-yaz-1.1.1 b/metadata/md5-cache/dev-php/pecl-yaz-1.1.1
index 73b3a0554662..10785e2a4a68 100644
--- a/metadata/md5-cache/dev-php/pecl-yaz-1.1.1
+++ b/metadata/md5-cache/dev-php/pecl-yaz-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/yaz-3.0.2 || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=>=dev-libs/yaz-3.0.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=This extension implements a Z39.50 client for PHP using the YAZ toolkit.
 EAPI=5
 HOMEPAGE=http://pecl.php.net/yaz
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/yaz-3.0.2 php_targets_php5-3? ( dev-lang/php:5.3 )
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/yaz-1.1.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9f5a172b41f05b6fa89bc6cef74ef601
diff --git a/metadata/md5-cache/dev-php/pecl-zendopcache-7.0.1 b/metadata/md5-cache/dev-php/pecl-zendopcache-7.0.1
index e7ccbb6646be..3fade9bed38e 100644
--- a/metadata/md5-cache/dev-php/pecl-zendopcache-7.0.1
+++ b/metadata/md5-cache/dev-php/pecl-zendopcache-7.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=The Zend Optimizer+ provides faster PHP execution through opcode caching and optimization.
 EAPI=5
 HOMEPAGE=http://pecl.php.net/zendopcache
@@ -10,5 +10,5 @@ RDEPEND=php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/zendopcache-7.0.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=62052717d99f261d5ae3fdbc3d8f1da0
diff --git a/metadata/md5-cache/dev-php/suhosin-0.9.33 b/metadata/md5-cache/dev-php/suhosin-0.9.33
index e149754bb6a9..49323151fa61 100644
--- a/metadata/md5-cache/dev-php/suhosin-0.9.33
+++ b/metadata/md5-cache/dev-php/suhosin-0.9.33
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/php[unicode] || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=dev-lang/php[unicode] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Suhosin is an advanced protection system for PHP installations.
 EAPI=5
 HOMEPAGE=http://www.suhosin.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/php[unicode] php_targets_php5-3? ( dev-lang/php:5.3 )
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://download.suhosin.org/suhosin-0.9.33.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=309fe3d4d27fbb97a22302e142184852
diff --git a/metadata/md5-cache/dev-php/xcache-3.0.1 b/metadata/md5-cache/dev-php/xcache-3.0.1
index 1e3d677438a1..6016d95aa10c 100644
--- a/metadata/md5-cache/dev-php/xcache-3.0.1
+++ b/metadata/md5-cache/dev-php/xcache-3.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=virtual/httpd-php !dev-php/eaccelerator !dev-php/pecl-apc || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=virtual/httpd-php !dev-php/eaccelerator !dev-php/pecl-apc || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=A fast and stable PHP opcode cacher
 EAPI=4
 HOMEPAGE=http://xcache.lighttpd.net/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://xcache.lighttpd.net/pub/Releases/3.0.1/xcache-3.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=645d1a30ab8ce534ce385d97349a0798
diff --git a/metadata/md5-cache/dev-php/xdebug-2.2.0 b/metadata/md5-cache/dev-php/xdebug-2.2.0
index b2da9a7aa44a..fbb0ee0cf869 100644
--- a/metadata/md5-cache/dev-php/xdebug-2.2.0
+++ b/metadata/md5-cache/dev-php/xdebug-2.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=!dev-php/ZendOptimizer || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DEPEND=!dev-php/ZendOptimizer || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 DESCRIPTION=A PHP debugging and profiling extension
 EAPI=4
 HOMEPAGE=http://www.xdebug.org/
@@ -10,5 +10,5 @@ RDEPEND=!dev-php/ZendOptimizer ~dev-php/xdebug-client-2.2.0 php_targets_php5-5?
 REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdebug-2.2.0.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=46d187aee42c5af71f949bcc856662f9
diff --git a/metadata/md5-cache/dev-php/xdebug-2.2.1 b/metadata/md5-cache/dev-php/xdebug-2.2.1
index 586b986f251c..8a830d34bb72 100644
--- a/metadata/md5-cache/dev-php/xdebug-2.2.1
+++ b/metadata/md5-cache/dev-php/xdebug-2.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=!dev-php/ZendOptimizer || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DEPEND=!dev-php/ZendOptimizer || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 DESCRIPTION=A PHP debugging and profiling extension
 EAPI=4
 HOMEPAGE=http://www.xdebug.org/
@@ -10,5 +10,5 @@ RDEPEND=!dev-php/ZendOptimizer ~dev-php/xdebug-client-2.2.1 php_targets_php5-5?
 REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdebug-2.2.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3801098874925bc10c428dcc4ebc8430
diff --git a/metadata/md5-cache/dev-php/xdebug-2.2.2 b/metadata/md5-cache/dev-php/xdebug-2.2.2
index c83fe83afdba..f5cb4b8c02ed 100644
--- a/metadata/md5-cache/dev-php/xdebug-2.2.2
+++ b/metadata/md5-cache/dev-php/xdebug-2.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 DESCRIPTION=A PHP debugging and profiling extension
 EAPI=5
 HOMEPAGE=http://www.xdebug.org/
@@ -10,5 +10,5 @@ RDEPEND=~dev-php/xdebug-client-2.2.2 php_targets_php5-5? ( dev-lang/php:5.5 ) ph
 REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdebug-2.2.2.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=922480bfbfff80dbb04d36f40da16ca9
diff --git a/metadata/md5-cache/dev-php/xhprof-0.9.2 b/metadata/md5-cache/dev-php/xhprof-0.9.2
index d448affa4965..fed0dd7246cc 100644
--- a/metadata/md5-cache/dev-php/xhprof-0.9.2
+++ b/metadata/md5-cache/dev-php/xhprof-0.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=A Hierarchical Profiler for PHP
 EAPI=5
 HOMEPAGE=http://pecl.php.net/package/xhprof
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/php php_targets_php5-3? ( dev-lang/php:5.3 )
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xhprof-0.9.2.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	3cf993f06c7469d50493002995666449	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=47c6085d51100b067686a96ac2392eac
diff --git a/metadata/md5-cache/dev-python/astropy-0.2.1 b/metadata/md5-cache/dev-python/astropy-0.2.1
new file mode 100644
index 000000000000..b95382b1f676
--- /dev/null
+++ b/metadata/md5-cache/dev-python/astropy-0.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/expat dev-python/numpy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] sci-astronomy/sofa_c sci-astronomy/wcslib sci-libs/cfitsio sys-libs/zlib !dev-python/pyfits !dev-python/pywcs !dev-python/vo dev-python/cython[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] virtual/pkgconfig doc? ( dev-python/matplotlib dev-python/sphinx media-gfx/graphviz ) test? ( dev-libs/libxml2 dev-python/h5py[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/matplotlib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pytest[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] sci-libs/scipy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DESCRIPTION=Core functionality for performing astrophysics with Python
+EAPI=5
+HOMEPAGE=http://astropy.org/
+IUSE=doc test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-libs/expat dev-python/numpy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] sci-astronomy/sofa_c sci-astronomy/wcslib sci-libs/cfitsio sys-libs/zlib !dev-python/pyfits !dev-python/pywcs !dev-python/vo python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+SLOT=0
+SRC_URI=mirror://pypi/a/astropy/astropy-0.2.1.tar.gz
+_eclasses_=distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=746e0ec0a9e00b33a0331416235596d7
diff --git a/metadata/md5-cache/dev-python/brasero-python-2.32.0 b/metadata/md5-cache/dev-python/brasero-python-2.32.0
index 11c36d1fce08..e97a214b6bdb 100644
--- a/metadata/md5-cache/dev-python/brasero-python-2.32.0
+++ b/metadata/md5-cache/dev-python/brasero-python-2.32.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=app-cdr/brasero-2.29 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.12:1.12 ) >=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 virtual/pkgconfig
+DEPEND=>=app-cdr/brasero-2.29 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig
 DESCRIPTION=Python bindings for Brasero CD/DVD burning
 EAPI=3
 HOMEPAGE=http://pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=>=app-cdr/brasero-2.29 !<dev-python/gnome-python-desktop-2.22.0-r10 =dev
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=82c83265f153456fbc944430bc92a0cb
diff --git a/metadata/md5-cache/dev-python/bug-buddy-python-2.32.0 b/metadata/md5-cache/dev-python/bug-buddy-python-2.32.0
index 019d52175aeb..ceca9359afef 100644
--- a/metadata/md5-cache/dev-python/bug-buddy-python-2.32.0
+++ b/metadata/md5-cache/dev-python/bug-buddy-python-2.32.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=gnome-extra/bug-buddy-2.16:2 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 ~dev-python/gnome-python-desktop-base-2.32.0 virtual/pkgconfig
+DEPEND=>=gnome-extra/bug-buddy-2.16:2 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 ~dev-python/gnome-python-desktop-base-2.32.0 virtual/pkgconfig
 DESCRIPTION=Python bindings for Bug Buddy
 EAPI=3
 HOMEPAGE=http://pygtk.org/
@@ -9,5 +9,5 @@ RDEPEND=>=gnome-extra/bug-buddy-2.16:2 !<dev-python/gnome-python-desktop-2.22.0-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f57d51783b0951e1b8eb68912ca1a676
diff --git a/metadata/md5-cache/dev-python/egg-python-2.25.3 b/metadata/md5-cache/dev-python/egg-python-2.25.3
index e3d9a338fed1..07e104690021 100644
--- a/metadata/md5-cache/dev-python/egg-python-2.25.3
+++ b/metadata/md5-cache/dev-python/egg-python-2.25.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-python/libbonobo-python-2.22.1 >=dev-python/libgnome-python-2.22.1 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=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 virtual/pkgconfig
+DEPEND=>=dev-python/libbonobo-python-2.22.1 >=dev-python/libgnome-python-2.22.1 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig
 DESCRIPTION=EggTrayIcon bindings for Python
 EAPI=2
 HOMEPAGE=http://pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/libbonobo-python-2.22.1 >=dev-python/libgnome-python-2.22.1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7c823f5a1417e890a79fec0f65cdf853
diff --git a/metadata/md5-cache/dev-python/evince-python-2.32.0 b/metadata/md5-cache/dev-python/evince-python-2.32.0
index b655874f56a0..e31fad7ea316 100644
--- a/metadata/md5-cache/dev-python/evince-python-2.32.0
+++ b/metadata/md5-cache/dev-python/evince-python-2.32.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=app-text/evince-2.32 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.12:1.12 ) >=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 virtual/pkgconfig
+DEPEND=>=app-text/evince-2.32 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig
 DESCRIPTION=Python bindings for Evince
 EAPI=3
 HOMEPAGE=http://pygtk.org/
@@ -9,5 +9,5 @@ RDEPEND=>=app-text/evince-2.32 !<dev-python/gnome-python-desktop-2.22.0-r10 =dev
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c78f315319211c78d16f12820bf83e97
diff --git a/metadata/md5-cache/dev-python/evolution-python-2.32.0 b/metadata/md5-cache/dev-python/evolution-python-2.32.0
index 084048b5d7a8..a8ca739071ae 100644
--- a/metadata/md5-cache/dev-python/evolution-python-2.32.0
+++ b/metadata/md5-cache/dev-python/evolution-python-2.32.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-python/libbonobo-python:2 <gnome-extra/evolution-data-server-3.6 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.12:1.12 ) >=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 virtual/pkgconfig
+DEPEND=dev-python/libbonobo-python:2 <gnome-extra/evolution-data-server-3.6 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 virtual/pkgconfig
 DESCRIPTION=Python bindings for Evolution and Evolution Data Server
 EAPI=4
 HOMEPAGE=http://pygtk.org/
@@ -9,5 +9,5 @@ RDEPEND=dev-python/libbonobo-python:2 <gnome-extra/evolution-data-server-3.6 !<d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=06b53b1a16379f74e8e5d8d34f891446
diff --git a/metadata/md5-cache/dev-python/gconf-python-2.28.1 b/metadata/md5-cache/dev-python/gconf-python-2.28.1
index bc261e70c51a..bd62ddf2a11b 100644
--- a/metadata/md5-cache/dev-python/gconf-python-2.28.1
+++ b/metadata/md5-cache/dev-python/gconf-python-2.28.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DEPEND=dev-python/pygobject:2 >=gnome-base/gconf-2.11.1 !<dev-python/gnome-python-2.22.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1 virtual/pkgconfig
+DEPEND=dev-python/pygobject:2 >=gnome-base/gconf-2.11.1 !<dev-python/gnome-python-2.22.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1 virtual/pkgconfig
 DESCRIPTION=Python bindings for the GConf library
 EAPI=1
 HOMEPAGE=http://pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:2 >=gnome-base/gconf-2.11.1 !<dev-python/gnome-pyth
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-python/2.28/gnome-python-2.28.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5f37b0119dbeeefe8b0e205ba0720de4
diff --git a/metadata/md5-cache/dev-python/gdl-python-2.25.3 b/metadata/md5-cache/dev-python/gdl-python-2.25.3
index 39201d6c88ec..93432dabfbfb 100644
--- a/metadata/md5-cache/dev-python/gdl-python-2.25.3
+++ b/metadata/md5-cache/dev-python/gdl-python-2.25.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/gdl-2.28:1 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=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 virtual/pkgconfig
+DEPEND=>=dev-libs/gdl-2.28:1 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig
 DESCRIPTION=Python bindings for GDL
 EAPI=2
 HOMEPAGE=http://pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gdl-2.28:1 =dev-lang/python-2* !<=dev-python/gnome-python-ext
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=96d6dae1112397faa92ae9b5af90d3f0
diff --git a/metadata/md5-cache/dev-python/git-python-0.3.2_rc1 b/metadata/md5-cache/dev-python/git-python-0.3.2_rc1
index 2ec7232435a1..4319951a1449 100644
--- a/metadata/md5-cache/dev-python/git-python-0.3.2_rc1
+++ b/metadata/md5-cache/dev-python/git-python-0.3.2_rc1
@@ -5,8 +5,8 @@ EAPI=3
 HOMEPAGE=http://gitorious.org/git-python http://pypi.python.org/pypi/GitPython
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-vcs/git =dev-lang/python-2*
+RDEPEND=dev-vcs/git >=dev-python/gitdb-0.5.4 =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://pypi/G/GitPython/GitPython-0.3.2.RC1.tar.gz
 _eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=07d888c5456f73e32854b8ba9b8f1bfc
+_md5_=99404dde8d7d203d8e355cc5d543849d
diff --git a/metadata/md5-cache/dev-python/gitdb-0.5.4 b/metadata/md5-cache/dev-python/gitdb-0.5.4
index 7bbd93991e38..aa601de87521 100644
--- a/metadata/md5-cache/dev-python/gitdb-0.5.4
+++ b/metadata/md5-cache/dev-python/gitdb-0.5.4
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-vcs/git dev-python/setuptools >=dev-python/async-0.6 >=dev-python/smmap-0.8 =dev-lang/python-2*
+DEPEND=dev-vcs/git >=dev-python/async-0.6 >=dev-python/smmap-0.8 dev-python/setuptools =dev-lang/python-2*
 DESCRIPTION=GitDB is a pure-Python git object database
 EAPI=3
 HOMEPAGE=https://github.com/gitpython-developers/gitdb http://pypi.python.org/pypi/gitdb
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-vcs/git =dev-lang/python-2*
+RDEPEND=dev-vcs/git >=dev-python/async-0.6 >=dev-python/smmap-0.8 =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://pypi/g/gitdb/gitdb-0.5.4.tar.gz
 _eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=66f61d1a493efa0f39d59dbd639d5351
+_md5_=729556de2be36b21ae1cd37f767fe265
diff --git a/metadata/md5-cache/dev-python/gnome-applets-python-2.32.0 b/metadata/md5-cache/dev-python/gnome-applets-python-2.32.0
index 34a4065b7d3e..257644774b4b 100644
--- a/metadata/md5-cache/dev-python/gnome-applets-python-2.32.0
+++ b/metadata/md5-cache/dev-python/gnome-applets-python-2.32.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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.12:1.12 ) >=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 virtual/pkgconfig
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig
 DESCRIPTION=Python bindings for writing GNOME applets
 EAPI=3
 HOMEPAGE=http://pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/gnome-panel-2.13.4 >=dev-python/libbonobo-python-2.22.0:2 g
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9c713a706bb4d75dab5907a9d394b121
diff --git a/metadata/md5-cache/dev-python/gnome-desktop-python-2.32.0 b/metadata/md5-cache/dev-python/gnome-desktop-python-2.32.0
index fa36f04075d2..ecda9f2c2cd7 100644
--- a/metadata/md5-cache/dev-python/gnome-desktop-python-2.32.0
+++ b/metadata/md5-cache/dev-python/gnome-desktop-python-2.32.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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.12:1.12 ) >=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 virtual/pkgconfig
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig
 DESCRIPTION=Python bindings for some GNOME desktop libraries
 EAPI=3
 HOMEPAGE=http://pygtk.org/
@@ -9,5 +9,5 @@ RDEPEND=>=gnome-base/gnome-desktop-2.10.0:2 >=dev-python/gnome-vfs-python-2.22:2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fe0dde0ffb54f38c4b3878f3920f3e14
diff --git a/metadata/md5-cache/dev-python/gnome-keyring-python-2.32.0 b/metadata/md5-cache/dev-python/gnome-keyring-python-2.32.0
index 60a02841930a..ebff52174f93 100644
--- a/metadata/md5-cache/dev-python/gnome-keyring-python-2.32.0
+++ b/metadata/md5-cache/dev-python/gnome-keyring-python-2.32.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=gnome-base/gnome-keyring-0.5.0 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.12:1.12 ) >=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 virtual/pkgconfig
+DEPEND=>=gnome-base/gnome-keyring-0.5.0 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig
 DESCRIPTION=Python bindings for the interfacing with the GNOME keyring
 EAPI=3
 HOMEPAGE=http://pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/gnome-keyring-0.5.0 !<dev-python/gnome-python-desktop-2.22.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f7dca8f9d2c0850538c8d9da9105079c
diff --git a/metadata/md5-cache/dev-python/gnome-media-python-2.32.0 b/metadata/md5-cache/dev-python/gnome-media-python-2.32.0
index 6a2728ec9512..c2779b47fec2 100644
--- a/metadata/md5-cache/dev-python/gnome-media-python-2.32.0
+++ b/metadata/md5-cache/dev-python/gnome-media-python-2.32.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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.12:1.12 ) >=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 virtual/pkgconfig
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig
 DESCRIPTION=Python bindings for GNOME media profiles
 EAPI=3
 HOMEPAGE=http://pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-extra/gnome-media-2.10.0:2 <gnome-extra/gnome-media-2.91 >=gnome
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0e03ba941836dc1ee33e20406da62b87
diff --git a/metadata/md5-cache/dev-python/gnome-python-extras-base-2.25.3 b/metadata/md5-cache/dev-python/gnome-python-extras-base-2.25.3
index c8e299fc74ce..5a85d33e5f03 100644
--- a/metadata/md5-cache/dev-python/gnome-python-extras-base-2.25.3
+++ b/metadata/md5-cache/dev-python/gnome-python-extras-base-2.25.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=x11-libs/gtk+-2.4:2 >=dev-libs/glib-2.6:2 >=dev-python/pygtk-2.10.3:2 !<=dev-python/gnome-python-extras-2.19.1-r2 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2*
+DEPEND=>=x11-libs/gtk+-2.4:2 >=dev-libs/glib-2.6:2 >=dev-python/pygtk-2.10.3:2 !<=dev-python/gnome-python-extras-2.19.1-r2 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2*
 DESCRIPTION=Provides python the base files for the Gnome Python Desktop bindings
 EAPI=3
 HOMEPAGE=http://pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gtk+-2.4:2 >=dev-libs/glib-2.6:2 >=dev-python/pygtk-2.10.3:2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ab0f6c7e668feb85b2c9ce85aa77c193
diff --git a/metadata/md5-cache/dev-python/gnome-vfs-python-2.28.1 b/metadata/md5-cache/dev-python/gnome-vfs-python-2.28.1
index ae0971df1ba5..dc769f8fc7a8 100644
--- a/metadata/md5-cache/dev-python/gnome-vfs-python-2.28.1
+++ b/metadata/md5-cache/dev-python/gnome-vfs-python-2.28.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1 virtual/pkgconfig
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1 virtual/pkgconfig
 DESCRIPTION=Python bindings for the GnomeVFS library
 EAPI=1
 HOMEPAGE=http://pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:2 >=gnome-base/gnome-vfs-2.24.0 >=gnome-base/libbon
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-python/2.28/gnome-python-2.28.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ccb35e3ef0886dfb28cbabb1f49375a9
diff --git a/metadata/md5-cache/dev-python/gst-python-0.10.22 b/metadata/md5-cache/dev-python/gst-python-0.10.22
index cd9c61c8c9a2..9b85cc673ec2 100644
--- a/metadata/md5-cache/dev-python/gst-python-0.10.22
+++ b/metadata/md5-cache/dev-python/gst-python-0.10.22
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/libxml2 >=dev-python/pygobject-2.28:2 >=media-libs/gstreamer-0.10.32:0.10 >=media-libs/gst-plugins-base-0.10.32:0.10 virtual/pkgconfig test? ( media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-vorbis:0.10 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=dev-libs/libxml2 >=dev-python/pygobject-2.28:2 >=media-libs/gstreamer-0.10.32:0.10 >=media-libs/gst-plugins-base-0.10.32:0.10 virtual/pkgconfig test? ( media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-vorbis:0.10 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=A Python Interface to GStreamer
 EAPI=4
 HOMEPAGE=http://gstreamer.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/libxml2 >=dev-python/pygobject-2.28:2 >=media-libs/gstreamer-0.10.32:0.10 >=media-libs/gst-plugins-base-0.10.32:0.10 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.22.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dcf6bb4470f18b1d641c9011db7319fc
diff --git a/metadata/md5-cache/dev-python/gst-python-0.10.22-r1 b/metadata/md5-cache/dev-python/gst-python-0.10.22-r1
index 0d39e51093be..ae776f0224da 100644
--- a/metadata/md5-cache/dev-python/gst-python-0.10.22-r1
+++ b/metadata/md5-cache/dev-python/gst-python-0.10.22-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libxml2 >=dev-python/pygobject-2.28:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=media-libs/gstreamer-0.10.32:0.10 >=media-libs/gst-plugins-base-0.10.32:0.10 virtual/pkgconfig test? ( media-plugins/gst-plugins-ogg:0.10 !!media-plugins/gst-plugins-ivorbis:0.10 media-plugins/gst-plugins-vorbis:0.10 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-libs/libxml2 >=dev-python/pygobject-2.28:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=media-libs/gstreamer-0.10.32:0.10 >=media-libs/gst-plugins-base-0.10.32:0.10 virtual/pkgconfig test? ( media-plugins/gst-plugins-ogg:0.10 !!media-plugins/gst-plugins-ivorbis:0.10 media-plugins/gst-plugins-vorbis:0.10 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A Python Interface to GStreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/libxml2 >=dev-python/pygobject-2.28:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=media-libs/gstreamer-0.10.32:0.10 >=media-libs/gst-plugins-base-0.10.32:0.10
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.22.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=fbb31ec59b4ce16c2a71c03a41a9b9d5
diff --git a/metadata/md5-cache/dev-python/gtkhtml-python-2.25.3 b/metadata/md5-cache/dev-python/gtkhtml-python-2.25.3
index 99fd9a4ac0e8..c50b9e0a68fa 100644
--- a/metadata/md5-cache/dev-python/gtkhtml-python-2.25.3
+++ b/metadata/md5-cache/dev-python/gtkhtml-python-2.25.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND==gnome-extra/gtkhtml-2* virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=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 virtual/pkgconfig
+DEPEND==gnome-extra/gtkhtml-2* virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig
 DESCRIPTION=A dynamic object module to interface GtkHTML with Python
 EAPI=2
 HOMEPAGE=http://pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND==gnome-extra/gtkhtml-2* =dev-lang/python-2* !<=dev-python/gnome-python-e
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eb165568b8a992cf2c0fba309ad4fb88
diff --git a/metadata/md5-cache/dev-python/gtkspell-python-2.25.3 b/metadata/md5-cache/dev-python/gtkspell-python-2.25.3
index c29c166444bd..29980c1bd69d 100644
--- a/metadata/md5-cache/dev-python/gtkspell-python-2.25.3
+++ b/metadata/md5-cache/dev-python/gtkspell-python-2.25.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=app-text/gtkspell:2 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=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 virtual/pkgconfig
+DEPEND=app-text/gtkspell:2 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig
 DESCRIPTION=GtkSpell bindings for Python
 EAPI=2
 HOMEPAGE=http://pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=app-text/gtkspell:2 =dev-lang/python-2* !<=dev-python/gnome-python-extra
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=97ca2935a28762601683cb978cb8535d
diff --git a/metadata/md5-cache/dev-python/h5py-2.1.3 b/metadata/md5-cache/dev-python/h5py-2.1.3
new file mode 100644
index 000000000000..e8cf1d496f34
--- /dev/null
+++ b/metadata/md5-cache/dev-python/h5py-2.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sci-libs/hdf5:= dev-python/numpy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-)] test? ( virtual/python-unittest2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-)]
+DESCRIPTION=Simple Python interface to HDF5 files
+EAPI=5
+HOMEPAGE=http://www.h5py.org/
+IUSE=test examples python_targets_python2_6 python_targets_python2_7 python_targets_python3_2
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=sci-libs/hdf5:= dev-python/numpy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-)]
+SLOT=0
+SRC_URI=http://h5py.googlecode.com/files/h5py-2.1.3.tar.gz
+_eclasses_=distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=88681938a49c550619928af729d4974e
diff --git a/metadata/md5-cache/dev-python/libbonobo-python-2.28.1 b/metadata/md5-cache/dev-python/libbonobo-python-2.28.1
index 1e9a2afa9f71..92b5cf3741db 100644
--- a/metadata/md5-cache/dev-python/libbonobo-python-2.28.1
+++ b/metadata/md5-cache/dev-python/libbonobo-python-2.28.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1 virtual/pkgconfig
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1 virtual/pkgconfig
 DESCRIPTION=Python bindings for the Bonobo framework
 EAPI=1
 HOMEPAGE=http://pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:2 >=dev-python/pyorbit-2.24.0 >=gnome-base/libbonob
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-python/2.28/gnome-python-2.28.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=97d100ecd2bcb70ef1b2b47e8bf98e2a
diff --git a/metadata/md5-cache/dev-python/libgda-python-2.25.3 b/metadata/md5-cache/dev-python/libgda-python-2.25.3
index 1bb751d031c6..5941cde2c406 100644
--- a/metadata/md5-cache/dev-python/libgda-python-2.25.3
+++ b/metadata/md5-cache/dev-python/libgda-python-2.25.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=gnome-extra/libgda-4:4 >=dev-python/libbonobo-python-2.22.1:2 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=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 virtual/pkgconfig
+DEPEND=>=gnome-extra/libgda-4:4 >=dev-python/libbonobo-python-2.22.1:2 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig
 DESCRIPTION=Python bindings for interacting with libgda
 EAPI=2
 HOMEPAGE=http://pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-extra/libgda-4:4 >=dev-python/libbonobo-python-2.22.1:2 =dev-lan
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8320ae71db6d28328191dd3db5190cae
diff --git a/metadata/md5-cache/dev-python/libgksu-python-2.25.3 b/metadata/md5-cache/dev-python/libgksu-python-2.25.3
index 0075a52a8a13..3d55e9d5af4c 100644
--- a/metadata/md5-cache/dev-python/libgksu-python-2.25.3
+++ b/metadata/md5-cache/dev-python/libgksu-python-2.25.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=x11-libs/libgksu-2.0.4 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=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 virtual/pkgconfig
+DEPEND=>=x11-libs/libgksu-2.0.4 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig
 DESCRIPTION=Python bindings for libgksu
 EAPI=2
 HOMEPAGE=http://pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/libgksu-2.0.4 =dev-lang/python-2* !<=dev-python/gnome-python-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e1915779c0025f4889a7cee1743f3176
diff --git a/metadata/md5-cache/dev-python/libgnome-python-2.28.1 b/metadata/md5-cache/dev-python/libgnome-python-2.28.1
index 21f200b8dcb0..483cd8d701af 100644
--- a/metadata/md5-cache/dev-python/libgnome-python-2.28.1
+++ b/metadata/md5-cache/dev-python/libgnome-python-2.28.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1 virtual/pkgconfig
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1 virtual/pkgconfig
 DESCRIPTION=Python bindings for essential GNOME libraries
 EAPI=1
 HOMEPAGE=http://pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/libgnome-2.24.1 >=gnome-base/libgnomeui-2.24.0 dev-python/p
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-python/2.28/gnome-python-2.28.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c43aea73f6779603398b8792e5102d0f
diff --git a/metadata/md5-cache/dev-python/libgnomecanvas-python-2.28.1 b/metadata/md5-cache/dev-python/libgnomecanvas-python-2.28.1
index f2d6a1cfe8d9..ad13472f3ac4 100644
--- a/metadata/md5-cache/dev-python/libgnomecanvas-python-2.28.1
+++ b/metadata/md5-cache/dev-python/libgnomecanvas-python-2.28.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DEPEND=dev-python/pygobject:2 >=gnome-base/libgnomecanvas-2.8.0 !<dev-python/gnome-python-2.22.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1 virtual/pkgconfig
+DEPEND=dev-python/pygobject:2 >=gnome-base/libgnomecanvas-2.8.0 !<dev-python/gnome-python-2.22.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1 virtual/pkgconfig
 DESCRIPTION=Python bindings for the Gnome Canvas library
 EAPI=1
 HOMEPAGE=http://pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:2 >=gnome-base/libgnomecanvas-2.8.0 !<dev-python/gn
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-python/2.28/gnome-python-2.28.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=503f1996987546c25a16a0f8fc59520b
diff --git a/metadata/md5-cache/dev-python/libgnomeprint-python-2.32.0 b/metadata/md5-cache/dev-python/libgnomeprint-python-2.32.0
index 2c8050cc030a..4575b9100460 100644
--- a/metadata/md5-cache/dev-python/libgnomeprint-python-2.32.0
+++ b/metadata/md5-cache/dev-python/libgnomeprint-python-2.32.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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.12:1.12 ) >=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 virtual/pkgconfig
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig
 DESCRIPTION=Python bindings for GNOME printing support
 EAPI=3
 HOMEPAGE=http://pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/libgnomeprint-2.2.0:2.2 >=gnome-base/libgnomeprintui-2.2.0:
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6e0ece3c45d5ed220cefc5fc75b42cbc
diff --git a/metadata/md5-cache/dev-python/libgtop-python-2.32.0 b/metadata/md5-cache/dev-python/libgtop-python-2.32.0
index 833b7018f193..f00f58534036 100644
--- a/metadata/md5-cache/dev-python/libgtop-python-2.32.0
+++ b/metadata/md5-cache/dev-python/libgtop-python-2.32.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=gnome-base/libgtop-2.13.0:2 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.12:1.12 ) >=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 virtual/pkgconfig
+DEPEND=>=gnome-base/libgtop-2.13.0:2 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig
 DESCRIPTION=Python bindings for the libgtop library
 EAPI=3
 HOMEPAGE=http://pygtk.org/
@@ -9,5 +9,5 @@ RDEPEND=>=gnome-base/libgtop-2.13.0:2 !<dev-python/gnome-python-desktop-2.22.0-r
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=56de12cd678a1fe9d31a3a6b531c1136
diff --git a/metadata/md5-cache/dev-python/librsvg-python-2.32.0 b/metadata/md5-cache/dev-python/librsvg-python-2.32.0
index ae0bd26c5435..4b0129cf9c38 100644
--- a/metadata/md5-cache/dev-python/librsvg-python-2.32.0
+++ b/metadata/md5-cache/dev-python/librsvg-python-2.32.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=gnome-base/librsvg-2.13.93:2 dev-python/pycairo !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 ~dev-python/gnome-python-desktop-base-2.32.0 virtual/pkgconfig
+DEPEND=>=gnome-base/librsvg-2.13.93:2 dev-python/pycairo !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 ~dev-python/gnome-python-desktop-base-2.32.0 virtual/pkgconfig
 DESCRIPTION=Python bindings for the librsvg library
 EAPI=3
 HOMEPAGE=http://pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/librsvg-2.13.93:2 dev-python/pycairo !<dev-python/gnome-pyt
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=48be94935c783b7f1dd573ee99b5ff6f
diff --git a/metadata/md5-cache/dev-python/libwnck-python-2.32.0 b/metadata/md5-cache/dev-python/libwnck-python-2.32.0
index 084d9b981560..a976381c5e46 100644
--- a/metadata/md5-cache/dev-python/libwnck-python-2.32.0
+++ b/metadata/md5-cache/dev-python/libwnck-python-2.32.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=x11-libs/libwnck-2.19.3:1 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.12:1.12 ) >=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 virtual/pkgconfig
+DEPEND=>=x11-libs/libwnck-2.19.3:1 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig
 DESCRIPTION=Python bindings for the libwnck library
 EAPI=3
 HOMEPAGE=http://pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/libwnck-2.19.3:1 !<dev-python/gnome-python-desktop-2.22.0-r10
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8651abc430e39fc56ff8a3f6e0102e15
diff --git a/metadata/md5-cache/dev-python/nautilus-python-0.7.3 b/metadata/md5-cache/dev-python/nautilus-python-0.7.3
index 4880947f076a..0c004a54a322 100644
--- a/metadata/md5-cache/dev-python/nautilus-python-0.7.3
+++ b/metadata/md5-cache/dev-python/nautilus-python-0.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Python bindings for the Nautilus file manager
 EAPI=3
 HOMEPAGE=http://projects.gnome.org/nautilus-python/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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*
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus-python/0.7/nautilus-python-0.7.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1b85cb1ff04c31194f0cad25efe4abff
diff --git a/metadata/md5-cache/dev-python/notify-python-0.1.1-r3 b/metadata/md5-cache/dev-python/notify-python-0.1.1-r3
index 619ac912ce84..c8eacf140b2c 100644
--- a/metadata/md5-cache/dev-python/notify-python-0.1.1-r3
+++ b/metadata/md5-cache/dev-python/notify-python-0.1.1-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-python/pygtk-2.24:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=x11-libs/libnotify-0.7
 SLOT=0
 SRC_URI=http://www.galago-project.org/files/releases/source/notify-python/notify-python-0.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a55fdd08a90d0f8ae32a80573316bb85
diff --git a/metadata/md5-cache/dev-python/psycopg-1.1.21-r1 b/metadata/md5-cache/dev-python/psycopg-1.1.21-r1
index e938682f3d3d..0b87c0e059de 100644
--- a/metadata/md5-cache/dev-python/psycopg-1.1.21-r1
+++ b/metadata/md5-cache/dev-python/psycopg-1.1.21-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-python/egenix-mx-base-2.0.3[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-db/postgresql-base python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 SLOT=0
 SRC_URI=http://initd.org/pub/software/psycopg/psycopg-1.1.21.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6dc0b4b2a5e7a80c3f94b8adab6f263e
diff --git a/metadata/md5-cache/dev-python/py-1.4.13 b/metadata/md5-cache/dev-python/py-1.4.13
index 7e61498bf616..4d0c4d8499f6 100644
--- a/metadata/md5-cache/dev-python/py-1.4.13
+++ b/metadata/md5-cache/dev-python/py-1.4.13
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] test? ( >=dev-python/pytest-2[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 DESCRIPTION=library with cross-python path, ini-parsing, io, code, log facilities
 EAPI=5
-HOMEPAGE=http://pylib.org/ http://pypi.python.org/pypi/py
+HOMEPAGE=http://pylib.readthedocs.org/ http://pypi.python.org/pypi/py
 IUSE=test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=MIT
@@ -10,4 +10,4 @@ RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2
 SLOT=0
 SRC_URI=mirror://pypi/p/py/py-1.4.13.tar.gz
 _eclasses_=distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f941ef1b282e0dfd60c45e3ad6d956fb
+_md5_=f61ff6f427ce0b29938e7b7958a3cef9
diff --git a/metadata/md5-cache/dev-python/pyds9-1.6 b/metadata/md5-cache/dev-python/pyds9-1.6
new file mode 100644
index 000000000000..ec2d697e0590
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyds9-1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=x11-libs/xpa-2.1.14 python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Python interface to XPA to communicate with DS9
+EAPI=5
+HOMEPAGE=http://hea-www.harvard.edu/RD/ds9/pyds9/
+IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=x11-libs/xpa-2.1.14 dev-python/numpy[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyfits[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=http://hea-www.harvard.edu/RD/download/pyds9/pyds9-1.6.tar.gz
+_eclasses_=distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=86359f080921b2fe3bd7c306436f55fe
diff --git a/metadata/md5-cache/dev-python/pyelftools-0.20 b/metadata/md5-cache/dev-python/pyelftools-0.20
deleted file mode 100644
index ba1f00cc0536..000000000000
--- a/metadata/md5-cache/dev-python/pyelftools-0.20
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=dev-lang/python
-DESCRIPTION=pure-Python library for parsing and analyzing ELF files and DWARF debugging information
-EAPI=4
-HOMEPAGE=http://pypi.python.org/pypi/pyelftools https://bitbucket.org/eliben/pyelftools
-KEYWORDS=~amd64 ~x86
-LICENSE=public-domain
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=mirror://pypi/p/pyelftools/pyelftools-0.20.tar.gz
-_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=c988706724a4898e402dba21a63ef187
diff --git a/metadata/md5-cache/dev-python/pyelftools-0.20-r2 b/metadata/md5-cache/dev-python/pyelftools-0.20-r2
deleted file mode 100644
index e1b09a0f30a2..000000000000
--- a/metadata/md5-cache/dev-python/pyelftools-0.20-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)]
-DESCRIPTION=pure-Python library for parsing and analyzing ELF files and DWARF debugging information
-EAPI=5
-HOMEPAGE=http://pypi.python.org/pypi/pyelftools https://bitbucket.org/eliben/pyelftools
-IUSE=python_targets_python2_7 python_targets_python3_2
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=public-domain
-RDEPEND=python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)]
-SLOT=0
-SRC_URI=mirror://pypi/p/pyelftools/pyelftools-0.20.tar.gz
-_eclasses_=distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e0b6115f579e81d96e9ec59d7ba5f73a
diff --git a/metadata/md5-cache/dev-python/pyelftools-0.21-r1 b/metadata/md5-cache/dev-python/pyelftools-0.21-r1
deleted file mode 100644
index e1d244178e24..000000000000
--- a/metadata/md5-cache/dev-python/pyelftools-0.21-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
-DESCRIPTION=Pure-Python library for parsing and analyzing ELF files and DWARF debugging information
-EAPI=5
-HOMEPAGE=http://pypi.python.org/pypi/pyelftools https://bitbucket.org/eliben/pyelftools
-IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=public-domain
-RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
-SLOT=0
-SRC_URI=mirror://pypi/p/pyelftools/pyelftools-0.21.tar.gz
-_eclasses_=distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3256a344bee1564ef109649e9629bd43
diff --git a/metadata/md5-cache/dev-python/pyelftools-0.20-r1 b/metadata/md5-cache/dev-python/pyelftools-0.21-r2
similarity index 88%
rename from metadata/md5-cache/dev-python/pyelftools-0.20-r1
rename to metadata/md5-cache/dev-python/pyelftools-0.21-r2
index 8852274b4182..52d365d49bc7 100644
--- a/metadata/md5-cache/dev-python/pyelftools-0.20-r1
+++ b/metadata/md5-cache/dev-python/pyelftools-0.21-r2
@@ -7,6 +7,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=public-domain
 RDEPEND=dev-lang/python
 SLOT=0
-SRC_URI=mirror://pypi/p/pyelftools/pyelftools-0.20.tar.gz
+SRC_URI=mirror://pypi/p/pyelftools/pyelftools-0.21.tar.gz
 _eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=99f4d316967642eab0ff5b02e86d23f8
+_md5_=ff41f3cae05757b47d88b2db424c7d06
diff --git a/metadata/md5-cache/dev-python/pyfits-3.0.8 b/metadata/md5-cache/dev-python/pyfits-3.0.8
deleted file mode 100644
index 4c663d028439..000000000000
--- a/metadata/md5-cache/dev-python/pyfits-3.0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=dev-python/numpy dev-python/setuptools !dev-python/astropy dev-python/stsci-distutils dev-python/d2to1 || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( dev-python/nose )
-DESCRIPTION=Provides an interface to FITS formatted files under python
-EAPI=4
-HOMEPAGE=http://www.stsci.edu/resources/software_hardware/pyfits http://pypi.python.org/pypi/pyfits
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/numpy dev-python/setuptools !dev-python/astropy || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyfits/pyfits-3.0.8.tar.gz
-_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fc7c6eec5263910a7f6db1e4cfa9ae73
diff --git a/metadata/md5-cache/dev-python/pyfits-3.1 b/metadata/md5-cache/dev-python/pyfits-3.1
deleted file mode 100644
index fef1047d040b..000000000000
--- a/metadata/md5-cache/dev-python/pyfits-3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=dev-python/numpy dev-python/setuptools !dev-python/astropy dev-python/stsci-distutils dev-python/d2to1 || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( dev-python/nose )
-DESCRIPTION=Provides an interface to FITS formatted files under python
-EAPI=4
-HOMEPAGE=http://www.stsci.edu/resources/software_hardware/pyfits http://pypi.python.org/pypi/pyfits
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/numpy dev-python/setuptools !dev-python/astropy || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyfits/pyfits-3.1.tar.gz
-_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d0e0f98208bec2cfecc134950f994840
diff --git a/metadata/md5-cache/dev-python/pyfits-3.1.1-r1 b/metadata/md5-cache/dev-python/pyfits-3.1.1-r1
new file mode 100644
index 000000000000..0ae377796902
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyfits-3.1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] !dev-python/astropy dev-python/stsci-distutils[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/d2to1[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Provides an interface to FITS formatted files under python
+EAPI=5
+HOMEPAGE=http://www.stsci.edu/resources/software_hardware/pyfits
+IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/numpy[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] !dev-python/astropy python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=mirror://pypi/p/pyfits/pyfits-3.1.1.tar.gz
+_eclasses_=distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6bc11d46c23749f164c555c6c9e9988e
diff --git a/metadata/md5-cache/dev-python/pygobject-2.28.6-r53 b/metadata/md5-cache/dev-python/pygobject-2.28.6-r53
index 8d7714a31621..6436e4afde6b 100644
--- a/metadata/md5-cache/dev-python/pygobject-2.28.6-r53
+++ b/metadata/md5-cache/dev-python/pygobject-2.28.6-r53
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.24.0:2 libffi? ( virtual/libffi:= ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-util/gtk-doc-am virtual/pkgconfig test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.24.0:2 libffi? ( virtual/libffi:= ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-util/gtk-doc-am virtual/pkgconfig test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GLib's GObject library bindings for Python
 EAPI=5
 HOMEPAGE=http://www.pygtk.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.24.0:2 libffi? ( virtual/libffi:= ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] !<dev-python/pygtk-2.23
 SLOT=2
 SRC_URI=mirror://gnome/sources/pygobject/2.28/pygobject-2.28.6.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=95d3581b5755beea6d85137adc3bea33
diff --git a/metadata/md5-cache/dev-python/pygobject-3.2.2-r1 b/metadata/md5-cache/dev-python/pygobject-3.2.2-r1
index 15c5774aa1b2..28d18f565107 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.2.2-r1
+++ b/metadata/md5-cache/dev-python/pygobject-3.2.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.31.0:2 >=dev-libs/gobject-introspection-1.31.20 virtual/libffi:= cairo? ( >=dev-python/pycairo-1.10.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] x11-libs/cairo[glib] virtual/pkgconfig test? ( dev-libs/atk[introspection] media-fonts/font-cursor-misc media-fonts/font-misc-misc x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.31.0:2 >=dev-libs/gobject-introspection-1.31.20 virtual/libffi:= cairo? ( >=dev-python/pycairo-1.10.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] x11-libs/cairo[glib] virtual/pkgconfig test? ( dev-libs/atk[introspection] media-fonts/font-cursor-misc media-fonts/font-misc-misc x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GLib's GObject library bindings for Python
 EAPI=5
 HOMEPAGE=http://www.pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.31.0:2 >=dev-libs/gobject-introspection-1.31.20 virtua
 REQUIRED_USE=test? ( cairo )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.2/pygobject-3.2.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=6947384e9b687a7c997c3ccd3907bec2
diff --git a/metadata/md5-cache/dev-python/pygobject-3.4.2-r1 b/metadata/md5-cache/dev-python/pygobject-3.4.2-r1
index 80b093b0b45e..37944d257434 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.4.2-r1
+++ b/metadata/md5-cache/dev-python/pygobject-3.4.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.31.0:2 >=dev-libs/gobject-introspection-1.34.1.1 virtual/libffi:= cairo? ( >=dev-python/pycairo-1.10.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] x11-libs/cairo[glib] virtual/pkgconfig test? ( dev-libs/atk[introspection] media-fonts/font-cursor-misc media-fonts/font-misc-misc virtual/python-unittest2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.31.0:2 >=dev-libs/gobject-introspection-1.34.1.1 virtual/libffi:= cairo? ( >=dev-python/pycairo-1.10.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] x11-libs/cairo[glib] virtual/pkgconfig test? ( dev-libs/atk[introspection] media-fonts/font-cursor-misc media-fonts/font-misc-misc virtual/python-unittest2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GLib's GObject library bindings for Python
 EAPI=5
 HOMEPAGE=http://www.pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.31.0:2 >=dev-libs/gobject-introspection-1.34.1.1 virtu
 REQUIRED_USE=test? ( cairo )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.4/pygobject-3.4.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=8e750b27ccd3d510cc9fe757eb642a98
diff --git a/metadata/md5-cache/dev-python/pygobject-3.8.0 b/metadata/md5-cache/dev-python/pygobject-3.8.0
index 298f107505d6..3b74a9661b20 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.8.0
+++ b/metadata/md5-cache/dev-python/pygobject-3.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.31.0:2 >=dev-libs/gobject-introspection-1.34.1.1 virtual/libffi:= cairo? ( >=dev-python/pycairo-1.10.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] x11-libs/cairo[glib] virtual/pkgconfig test? ( dev-libs/atk[introspection] media-fonts/font-cursor-misc media-fonts/font-misc-misc virtual/python-unittest2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.31.0:2 >=dev-libs/gobject-introspection-1.34.1.1 virtual/libffi:= cairo? ( >=dev-python/pycairo-1.10.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] x11-libs/cairo[glib] virtual/pkgconfig test? ( dev-libs/atk[introspection] media-fonts/font-cursor-misc media-fonts/font-misc-misc virtual/python-unittest2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GLib's GObject library bindings for Python
 EAPI=5
 HOMEPAGE=http://www.pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.31.0:2 >=dev-libs/gobject-introspection-1.34.1.1 virtu
 REQUIRED_USE=test? ( cairo )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.8/pygobject-3.8.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=a4e6c7ba81fbbe61655dc7b7eb11012b
diff --git a/metadata/md5-cache/dev-python/pygobject-3.8.1 b/metadata/md5-cache/dev-python/pygobject-3.8.1
index 7052021f1a93..453c712bcbc6 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.8.1
+++ b/metadata/md5-cache/dev-python/pygobject-3.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.31.0:2 >=dev-libs/gobject-introspection-1.34.1.1 virtual/libffi:= cairo? ( >=dev-python/pycairo-1.10.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] x11-libs/cairo[glib] virtual/pkgconfig test? ( dev-libs/atk[introspection] media-fonts/font-cursor-misc media-fonts/font-misc-misc virtual/python-unittest2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.31.0:2 >=dev-libs/gobject-introspection-1.34.1.1 virtual/libffi:= cairo? ( >=dev-python/pycairo-1.10.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] x11-libs/cairo[glib] virtual/pkgconfig test? ( dev-libs/atk[introspection] media-fonts/font-cursor-misc media-fonts/font-misc-misc virtual/python-unittest2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GLib's GObject library bindings for Python
 EAPI=5
 HOMEPAGE=http://www.pygtk.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.31.0:2 >=dev-libs/gobject-introspection-1.34.1.1 virtu
 REQUIRED_USE=test? ( cairo )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.8/pygobject-3.8.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=1162f41c8e0d83ab63c85ca542ed1ee7
diff --git a/metadata/md5-cache/dev-python/pygtk-2.24.0-r2 b/metadata/md5-cache/dev-python/pygtk-2.24.0-r2
index 64a0fb8de160..2d6a110197cd 100644
--- a/metadata/md5-cache/dev-python/pygtk-2.24.0-r2
+++ b/metadata/md5-cache/dev-python/pygtk-2.24.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=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
+DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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
 DESCRIPTION=GTK+2 bindings for Python
 EAPI=4
 HOMEPAGE=http://www.pygtk.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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* )
 SLOT=2
 SRC_URI=mirror://gnome/sources/pygtk/2.24/pygtk-2.24.0.tar.bz2
-_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=8e32a62af3a92e69c111822151c9772c
diff --git a/metadata/md5-cache/dev-python/pygtk-2.24.0-r3 b/metadata/md5-cache/dev-python/pygtk-2.24.0-r3
index 3b825c6e93d0..9760cc389b39 100644
--- a/metadata/md5-cache/dev-python/pygtk-2.24.0-r3
+++ b/metadata/md5-cache/dev-python/pygtk-2.24.0-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=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[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/pygobject-2.26.8-r53:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=gnome-base/libglade-2.5:2.0 virtual/pkgconfig doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=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[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/pygobject-2.26.8-r53:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=gnome-base/libglade-2.5:2.0 virtual/pkgconfig doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GTK+2 bindings for Python
 EAPI=5
 HOMEPAGE=http://www.pygtk.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/pygobject-2.26.8-r53:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=gnome-base/libglade-2.5:2.0
 SLOT=2
 SRC_URI=mirror://gnome/sources/pygtk/2.24/pygtk-2.24.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=c768048798444d328862ee21acd12739
diff --git a/metadata/md5-cache/dev-python/python-exec-0.2 b/metadata/md5-cache/dev-python/python-exec-0.2
index df71d7617e74..ad7dd6302ae7 100644
--- a/metadata/md5-cache/dev-python/python-exec-0.2
+++ b/metadata/md5-cache/dev-python/python-exec-0.2
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~a
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/python-exec/downloads/python-exec-0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0438068bc3d025c97224088308bbfa2c
diff --git a/metadata/md5-cache/dev-python/python-exec-0.3 b/metadata/md5-cache/dev-python/python-exec-0.3
index 1f4a7ae01940..bc49301e9ce2 100644
--- a/metadata/md5-cache/dev-python/python-exec-0.3
+++ b/metadata/md5-cache/dev-python/python-exec-0.3
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/python-exec/downloads/python-exec-0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0d658e0ed1e388f15f375274d33e3aff
diff --git a/metadata/md5-cache/dev-python/python-exec-0.3.1 b/metadata/md5-cache/dev-python/python-exec-0.3.1
index e6430514ae37..20778fa85054 100644
--- a/metadata/md5-cache/dev-python/python-exec-0.3.1
+++ b/metadata/md5-cache/dev-python/python-exec-0.3.1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~a
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/python-exec/downloads/python-exec-0.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a8c0080391d373c314c7e6c33f284fe2
diff --git a/metadata/md5-cache/dev-python/python-exec-9999 b/metadata/md5-cache/dev-python/python-exec-9999
index e986edf1e002..8358ca1237ab 100644
--- a/metadata/md5-cache/dev-python/python-exec-9999
+++ b/metadata/md5-cache/dev-python/python-exec-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Python script wrapper
 EAPI=5
 HOMEPAGE=https://bitbucket.org/mgorny/python-exec/
 IUSE=python_targets_jython2_5 python_targets_jython2_7 python_targets_pypy1_9 python_targets_pypy2_0 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
 LICENSE=BSD
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=63e4a3760ba5d661149e8326ce08f049
diff --git a/metadata/md5-cache/dev-python/python-gudev-147.2 b/metadata/md5-cache/dev-python/python-gudev-147.2
index f917ccf17c94..e548e1f07b08 100644
--- a/metadata/md5-cache/dev-python/python-gudev-147.2
+++ b/metadata/md5-cache/dev-python/python-gudev-147.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pygobject:2 virtual/udev[gudev] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+DEPEND=dev-python/pygobject:2 virtual/udev[gudev] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 DESCRIPTION=Python binding to the GUDev udev helper library
 EAPI=3
 HOMEPAGE=http://github.com/nzjrs/python-gudev
@@ -8,5 +8,5 @@ LICENSE=LGPL-3
 RDEPEND=dev-python/pygobject:2 virtual/udev[gudev] || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=https://github.com/nzjrs/python-gudev/tarball/147.2 -> python-gudev-147.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=640b25f97239fddc444cff4738c31ff0
diff --git a/metadata/md5-cache/dev-python/python-poppler-0.12.1-r4 b/metadata/md5-cache/dev-python/python-poppler-0.12.1-r4
index c1b4e7ae59d7..1d6065f52bd1 100644
--- a/metadata/md5-cache/dev-python/python-poppler-0.12.1-r4
+++ b/metadata/md5-cache/dev-python/python-poppler-0.12.1-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=app-text/poppler-0.15.0:=[cairo] >=dev-python/pycairo-1.8.4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 SLOT=0
 SRC_URI=http://launchpad.net/poppler-python/trunk/development/+download/pypoppler-0.12.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2ef492f9a9805c415a84298ee42a7002
diff --git a/metadata/md5-cache/dev-python/pythonmagick-0.9.7-r1 b/metadata/md5-cache/dev-python/pythonmagick-0.9.7-r1
index bfc3ce4ec0a1..2b6b0cbc8a84 100644
--- a/metadata/md5-cache/dev-python/pythonmagick-0.9.7-r1
+++ b/metadata/md5-cache/dev-python/pythonmagick-0.9.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/boost-1.48[python] >=media-gfx/imagemagick-6.4 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=>=dev-libs/boost-1.48[python] >=media-gfx/imagemagick-6.4 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=Python bindings for ImageMagick
 EAPI=3
 HOMEPAGE=http://www.imagemagick.org/script/api.php
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.48[python] >=media-gfx/imagemagick-6.4 || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=http://www.imagemagick.org/download/python/PythonMagick-0.9.7.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9794e38201622a4bd2daa22dc82b2b89
diff --git a/metadata/md5-cache/dev-python/pythonmagick-0.9.8 b/metadata/md5-cache/dev-python/pythonmagick-0.9.8
index 750b7edb6d49..97d6389ff1f0 100644
--- a/metadata/md5-cache/dev-python/pythonmagick-0.9.8
+++ b/metadata/md5-cache/dev-python/pythonmagick-0.9.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/boost-1.48[python] >=media-gfx/imagemagick-6.4 virtual/pkgconfig >=sys-devel/automake-1.12 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=>=dev-libs/boost-1.48[python] >=media-gfx/imagemagick-6.4 virtual/pkgconfig =sys-devel/automake-1.12* >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=Python bindings for ImageMagick
 EAPI=4
 HOMEPAGE=http://www.imagemagick.org/script/api.php
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.48[python] >=media-gfx/imagemagick-6.4 || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=http://www.imagemagick.org/download/python/PythonMagick-0.9.8.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=212d07ab4187ba6e1cbdd147609befcb
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=648fea20b9be8cb083870e05785768c8
diff --git a/metadata/md5-cache/dev-python/pywcs-1.11 b/metadata/md5-cache/dev-python/pywcs-1.11
index 7c8af161cf9f..b8a77f05a073 100644
--- a/metadata/md5-cache/dev-python/pywcs-1.11
+++ b/metadata/md5-cache/dev-python/pywcs-1.11
@@ -5,8 +5,8 @@ EAPI=4
 HOMEPAGE=https://trac6.assembla.com/astrolib/wiki http://www.scipy.org/AstroLib
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=sci-astronomy/wcslib-4.8.2 dev-python/pyfits dev-lang/python
+RDEPEND=>=sci-astronomy/wcslib-4.8.2 dev-python/pyfits !dev-python/astropy dev-lang/python
 SLOT=0
 SRC_URI=http://stsdas.stsci.edu/astrolib/pywcs-1.11-4.8.2.tar.gz
 _eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d0e98e818e3aef2e32253f9ce978a402
+_md5_=d3b41e2ec7ba50de288576a4307aa4da
diff --git a/metadata/md5-cache/dev-python/sip-4.14.6 b/metadata/md5-cache/dev-python/sip-4.14.6
new file mode 100644
index 000000000000..9f1bc8686251
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sip-4.14.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DESCRIPTION=Python extension module generator for C and C++ libraries
+EAPI=5
+HOMEPAGE=http://www.riverbankcomputing.co.uk/software/sip/intro http://pypi.python.org/pypi/SIP
+IUSE=debug doc python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=|| ( GPL-2 GPL-3 sip )
+RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+SLOT=0/9
+SRC_URI=mirror://sourceforge/pyqt/sip-4.14.6.tar.gz
+_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3bb856bbb83649811fd56d25c88c1e9b
diff --git a/metadata/md5-cache/dev-python/sleekxmpp-1.1.11 b/metadata/md5-cache/dev-python/sleekxmpp-1.1.11
new file mode 100644
index 000000000000..667ad87cb64e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sleekxmpp-1.1.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)]
+DESCRIPTION=Python library for XMPP
+EAPI=5
+HOMEPAGE=http://sleekxmpp.com/ https://github.com/fritzy/SleekXMPP/ https://pypi.python.org/pypi/sleekxmpp/
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-crypt/gnupg python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)]
+SLOT=0
+SRC_URI=mirror://pypi/s/sleekxmpp/sleekxmpp-1.1.11.tar.gz
+_eclasses_=distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a7ac12c0f8f525a63a053156cb258df7
diff --git a/metadata/md5-cache/dev-python/subunit-0.0.10-r1 b/metadata/md5-cache/dev-python/subunit-0.0.10-r1
index 807cb07c38b4..e2eaea100992 100644
--- a/metadata/md5-cache/dev-python/subunit-0.0.10-r1
+++ b/metadata/md5-cache/dev-python/subunit-0.0.10-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD
 RDEPEND=>=dev-python/testtools-0.9.23[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?]
 SLOT=0
 SRC_URI=http://launchpad.net/subunit/trunk/0.0.10/+download/subunit-0.0.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e3e0d6a0ce8194ed629ffd287f6ef76f
diff --git a/metadata/md5-cache/dev-python/telepathy-python-0.15.19 b/metadata/md5-cache/dev-python/telepathy-python-0.15.19
index 3ea77edf9495..c9859630dae6 100644
--- a/metadata/md5-cache/dev-python/telepathy-python-0.15.19
+++ b/metadata/md5-cache/dev-python/telepathy-python-0.15.19
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Telepathy Python base classes for use in connection managers, and proxy classes for use in clients.
 EAPI=3
 HOMEPAGE=http://telepathy.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-python/dbus-python-0.80
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-0.15.19.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7d1a052a696a36ed01c3558b7e509539
diff --git a/metadata/md5-cache/dev-python/thunarx-python-0.3.0 b/metadata/md5-cache/dev-python/thunarx-python-0.3.0
index 0e8486ba8bf9..de33fcd69998 100644
--- a/metadata/md5-cache/dev-python/thunarx-python-0.3.0
+++ b/metadata/md5-cache/dev-python/thunarx-python-0.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2 >=dev-python/pygobject-2.16:2 dev-python/pygtk:2 >=xfce-base/thunar-1.1.0 =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://xfce/src/bindings/thunarx-python/0.3/thunarx-python-0.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=d0886c2abc76d2f63f51c3d6fdd22a64
diff --git a/metadata/md5-cache/dev-python/totem-python-2.32.0 b/metadata/md5-cache/dev-python/totem-python-2.32.0
index 4faa3700b1ac..125b65a0dd27 100644
--- a/metadata/md5-cache/dev-python/totem-python-2.32.0
+++ b/metadata/md5-cache/dev-python/totem-python-2.32.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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.12:1.12 ) >=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 virtual/pkgconfig
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 virtual/pkgconfig
 DESCRIPTION=Python bindings for the Totem Playlist Parser
 EAPI=3
 HOMEPAGE=http://pygtk.org/
@@ -9,5 +9,5 @@ RDEPEND=>=media-video/totem-1.4.0 >=dev-python/gnome-vfs-python-2.25.90:2 !<dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8552b60ec40d2f82d5f6074d38becd0b
diff --git a/metadata/md5-cache/dev-python/zsi-2.1_alpha1-r1 b/metadata/md5-cache/dev-python/zsi-2.1_alpha1-r1
new file mode 100644
index 000000000000..0f803a91c9ac
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zsi-2.1_alpha1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] twisted? ( dev-python/twisted dev-python/twisted-web ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Web Services for Python
+EAPI=5
+HOMEPAGE=http://pywebsvcs.sourceforge.net/zsi.html
+IUSE=doc examples twisted python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=BSD MIT
+RDEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] twisted? ( dev-python/twisted dev-python/twisted-web ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=mirror://sourceforge/pywebsvcs/ZSI-2.1-a1.tar.gz
+_eclasses_=distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6b718e9fd20c30265c606b328e466f4a
diff --git a/metadata/md5-cache/dev-ruby/libxml-2.4.0 b/metadata/md5-cache/dev-ruby/libxml-2.4.0
index 73a53619f9d3..a7d7173e32a3 100644
--- a/metadata/md5-cache/dev-ruby/libxml-2.4.0
+++ b/metadata/md5-cache/dev-ruby/libxml-2.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=Ruby libxml with a user friendly API, akin to REXML, but feature com
 EAPI=2
 HOMEPAGE=https://github.com/xml4r/libxml-ruby
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-libs/libxml2 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 SLOT=0
 SRC_URI=mirror://rubygems/libxml-ruby-2.4.0.gem
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	d2a1d4e0903b29b09c892b21b79fcf46	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a8ca6abca5452673b59b82ace0673d91
+_md5_=af6867b7d730de48292cc38a1c761a64
diff --git a/metadata/md5-cache/dev-ruby/locale-2.0.8 b/metadata/md5-cache/dev-ruby/locale-2.0.8
index 3e074cdc6419..83a58c7304a8 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.0.8
+++ b/metadata/md5-cache/dev-ruby/locale-2.0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-ruby/yard[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/yard[ruby_targets_ruby19] ) ruby_targets_jruby? ( dev-ruby/yard[ruby_targets_jruby] ) ruby_targets_ree18? ( dev-ruby/yard[ruby_targets_ree18] ) ruby_targets_ruby18? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby18] dev-ruby/test-unit-rr[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/test-unit-rr[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/test-unit:2[ruby_targets_jruby] dev-ruby/test-unit-rr[ruby_targets_jruby] ) ) ruby_targets_ree18? ( test? ( dev-ruby/test-unit:2[ruby_targets_ree18] dev-ruby/test-unit-rr[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+DEPEND=ruby_targets_ruby18? ( doc? ( dev-ruby/yard[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/yard[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby18] dev-ruby/test-unit-rr[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/test-unit-rr[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/test-unit:2[ruby_targets_jruby] dev-ruby/test-unit-rr[ruby_targets_jruby] ) ) ruby_targets_ree18? ( test? ( dev-ruby/test-unit:2[ruby_targets_ree18] dev-ruby/test-unit-rr[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
 DESCRIPTION=A pure ruby library which provides basic APIs for localization.
 EAPI=4
 HOMEPAGE=https://github.com/ruby-gettext/locale
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby rub
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.0.8.tar.gz -> locale-2.0.8-git.tgz
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	d2a1d4e0903b29b09c892b21b79fcf46	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0562f5b827055527d461f8a5f9c3aa41
+_md5_=a5080cb038a1a949681ac671dc0d0e87
diff --git a/metadata/md5-cache/dev-ruby/vlad-2.4.1 b/metadata/md5-cache/dev-ruby/vlad-2.4.1
new file mode 100644
index 000000000000..d4237ffad930
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/vlad-2.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby18? ( >=dev-ruby/hoe-2.9.2[ruby_targets_ruby18] test? ( dev-ruby/minitest[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( >=dev-ruby/hoe-2.9.2[ruby_targets_ruby19] test? ( dev-ruby/minitest[ruby_targets_ruby19] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/rake-remote_task-2.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/rake-remote_task-2.1[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=Pragmatic application deployment automation, without mercy.
+EAPI=5
+HOMEPAGE=http://rubyhitsquad.com/Vlad_the_Deployer.html
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/rake-remote_task-2.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/rake-remote_task-2.1[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+SLOT=0
+SRC_URI=mirror://rubygems/vlad-2.4.1.gem
+_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	d2a1d4e0903b29b09c892b21b79fcf46	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=6b7e66b1f2fb38aa95b48fd76e026bbd
diff --git a/metadata/md5-cache/dev-ruby/webrobots-0.1.1 b/metadata/md5-cache/dev-ruby/webrobots-0.1.1
new file mode 100644
index 000000000000..9fb0131f1c32
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/webrobots-0.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/shoulda[ruby_targets_ruby18] dev-ruby/test-unit:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/shoulda[ruby_targets_ruby19] dev-ruby/test-unit:2[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=A library to help write robots.txt compliant web robots.
+EAPI=5
+HOMEPAGE=http://rubygems.org/gems/webrobots
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+SLOT=0
+SRC_URI=mirror://rubygems/webrobots-0.1.1.gem
+_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	d2a1d4e0903b29b09c892b21b79fcf46	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=3a1e5aedc38a3dafa1ec0eebb7f27682
diff --git a/metadata/md5-cache/dev-scheme/c-wrapper-0.6.1 b/metadata/md5-cache/dev-scheme/c-wrapper-0.6.1
index eaa4a6d9e481..f1b9b1e24834 100644
--- a/metadata/md5-cache/dev-scheme/c-wrapper-0.6.1
+++ b/metadata/md5-cache/dev-scheme/c-wrapper-0.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare test
-DEPEND=dev-scheme/gauche virtual/libffi || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-scheme/gauche virtual/libffi || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Foreign function interface for C and Objective-C libraries
 EAPI=4
 HOMEPAGE=http://homepage.mac.com/naoki.koguro/prog/c-wrapper/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-scheme/gauche virtual/libffi
 SLOT=0
 SRC_URI=http://homepage.mac.com/naoki.koguro/prog/c-wrapper/c-wrapper-0.6.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d098a8e208a3eb2757f60a9886f0476d
diff --git a/metadata/md5-cache/dev-scheme/escm-1.1 b/metadata/md5-cache/dev-scheme/escm-1.1
index 3fc98b356295..7408daaaafbc 100644
--- a/metadata/md5-cache/dev-scheme/escm-1.1
+++ b/metadata/md5-cache/dev-scheme/escm-1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=escm - Embedded Scheme Processor
 EAPI=4
 HOMEPAGE=http://practical-scheme.net/vault/escm.html
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=|| ( dev-scheme/gauche dev-scheme/guile )
 SLOT=0
 SRC_URI=http://practical-scheme.net/vault/escm-1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=5068ced2398aa0f082112a88810ce9e6
diff --git a/metadata/md5-cache/dev-scheme/gauche-0.9.3.3 b/metadata/md5-cache/dev-scheme/gauche-0.9.3.3
index ab1d8934b486..d41b6013f5af 100644
--- a/metadata/md5-cache/dev-scheme/gauche-0.9.3.3
+++ b/metadata/md5-cache/dev-scheme/gauche-0.9.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=sys-libs/gdbm test? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/gdbm test? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Unix system friendly Scheme Interpreter
 EAPI=4
 HOMEPAGE=http://practical-scheme.net/gauche/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/gdbm
 SLOT=0
 SRC_URI=mirror://sourceforge/gauche/Gauche-0.9.3.3.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ac07a1244957cd2d7d32bb6a23f424cf
diff --git a/metadata/md5-cache/dev-scheme/gauche-cdb-0.3.1-r1 b/metadata/md5-cache/dev-scheme/gauche-cdb-0.3.1-r1
index d512f254d6e9..f2bab9b756c4 100644
--- a/metadata/md5-cache/dev-scheme/gauche-cdb-0.3.1-r1
+++ b/metadata/md5-cache/dev-scheme/gauche-cdb-0.3.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=dev-scheme/gauche dev-db/tinycdb || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-scheme/gauche dev-db/tinycdb || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=CDB binding for Gauche
 EAPI=4
 HOMEPAGE=http://sourceforge.jp/projects/gauche/
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-scheme/gauche dev-db/tinycdb
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/gauche/8407/Gauche-cdb-0.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5736faa926a80cfa401f77ececf8c22a
diff --git a/metadata/md5-cache/dev-scheme/gauche-gtk-0.6_pre1 b/metadata/md5-cache/dev-scheme/gauche-gtk-0.6_pre1
index c431e800b7a6..bca0a33248b4 100644
--- a/metadata/md5-cache/dev-scheme/gauche-gtk-0.6_pre1
+++ b/metadata/md5-cache/dev-scheme/gauche-gtk-0.6_pre1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK2 binding for Gauche
 EAPI=4
 HOMEPAGE=http://practical-scheme.net/gauche/
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 dev-scheme/gauche opengl? ( x11-libs/gtkglext dev-scheme
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/shirok/Gauche-gtk2/tarball/598828842a339a44c32ab8c16f5f9a77f3c1c799 -> Gauche-gtk-0.6_pre1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d91cb51af0b03240241e485361f161f2
diff --git a/metadata/md5-cache/dev-scheme/gauche-qdbm-0.2-r1 b/metadata/md5-cache/dev-scheme/gauche-qdbm-0.2-r1
index dc229dbf09a5..40b37aa0914e 100644
--- a/metadata/md5-cache/dev-scheme/gauche-qdbm-0.2-r1
+++ b/metadata/md5-cache/dev-scheme/gauche-qdbm-0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=dev-scheme/gauche dev-db/qdbm || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-scheme/gauche dev-db/qdbm || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=QDBM binding for Gauche
 EAPI=4
 HOMEPAGE=http://sourceforge.jp/projects/gauche/
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-scheme/gauche dev-db/qdbm
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/gauche/6988/Gauche-qdbm-0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8ac0a8c3a65a6d5609719d24b7dcf97b
diff --git a/metadata/md5-cache/dev-scheme/greg-2.0.0 b/metadata/md5-cache/dev-scheme/greg-2.0.0
index 6303958bd132..5a5686531d29 100644
--- a/metadata/md5-cache/dev-scheme/greg-2.0.0
+++ b/metadata/md5-cache/dev-scheme/greg-2.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Testing-Framework for guile
 EAPI=3
 HOMEPAGE=http://gna.org/projects/greg/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-scheme/guile-1.8
 SLOT=0
 SRC_URI=http://download.gna.org/greg/greg-2.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d4dbdef3805633de2b68a6de8ef6780c
diff --git a/metadata/md5-cache/dev-scheme/guile-1.8.8-r1 b/metadata/md5-cache/dev-scheme/guile-1.8.8-r1
index b785ebf8645a..eeb8b03a3c40 100644
--- a/metadata/md5-cache/dev-scheme/guile-1.8.8-r1
+++ b/metadata/md5-cache/dev-scheme/guile-1.8.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst postrm prepare
-DEPEND=>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Scheme interpreter
 EAPI=3
 HOMEPAGE=http://www.gnu.org/software/guile/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? (
 RESTRICT=!regex? ( test )
 SLOT=12
 SRC_URI=mirror://gnu/guile/guile-1.8.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=997bff1f66ff1287deefec6dc092e9fa
diff --git a/metadata/md5-cache/dev-scheme/guile-cairo-1.9.91 b/metadata/md5-cache/dev-scheme/guile-cairo-1.9.91
index f8ea308b124f..cf2b2d7421c3 100644
--- a/metadata/md5-cache/dev-scheme/guile-cairo-1.9.91
+++ b/metadata/md5-cache/dev-scheme/guile-cairo-1.9.91
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-scheme/guile-1.8 >=x11-libs/cairo-1.4
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/guile-cairo/guile-cairo-1.9.91.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=817c381ee3c1f010e4a5a578c235d7b7
diff --git a/metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.1 b/metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.1
index 1e122262289c..17fce682dc57 100644
--- a/metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.1
+++ b/metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Guile Scheme code that wraps the GNOME developer platform
 EAPI=3
 HOMEPAGE=http://www.gnu.org/software/guile-gnome
@@ -9,5 +9,5 @@ RDEPEND=>=dev-scheme/guile-1.6.4 >=dev-libs/g-wrap-1.9.11 dev-scheme/guile-cairo
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.gnu.org/pub/gnu/guile-gnome/guile-gnome-platform/guile-gnome-platform-2.16.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ec6185fa40a7f8fea7ded3b712801590
diff --git a/metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.1-r1 b/metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.1-r1
index bbb083ba7420..9646088e7143 100644
--- a/metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.1-r1
+++ b/metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Guile Scheme code that wraps the GNOME developer platform
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/guile-gnome/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk dev-libs/g-wrap dev-libs/glib:2 dev-scheme/guile:12 dev-sch
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.gnu.org/pub/gnu/guile-gnome/guile-gnome-platform/guile-gnome-platform-2.16.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6922a66d5840908037ba137cbef18438
diff --git a/metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.2 b/metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.2
index c7960098aa81..08dc9b250e8e 100644
--- a/metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.2
+++ b/metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/atk >=dev-libs/g-wrap-1.9.14 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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/atk >=dev-libs/g-wrap-1.9.14 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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Guile Scheme code that wraps the GNOME developer platform
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/guile-gnome/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk >=dev-libs/g-wrap-1.9.14 dev-libs/glib:2 dev-scheme/guile:1
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.gnu.org/pub/gnu/guile-gnome/guile-gnome-platform/guile-gnome-platform-2.16.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=03f187c76b17b3fabd4c5ccf138ff4a3
diff --git a/metadata/md5-cache/dev-scheme/ikarus-0.0.3_p1870 b/metadata/md5-cache/dev-scheme/ikarus-0.0.3_p1870
index d4323778b25c..163b2ea102c3 100644
--- a/metadata/md5-cache/dev-scheme/ikarus-0.0.3_p1870
+++ b/metadata/md5-cache/dev-scheme/ikarus-0.0.3_p1870
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-libs/gmp-4.2.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/gmp-4.2.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free optimizing incremental native-code compiler for R6RS Scheme
 EAPI=3
 HOMEPAGE=http://ikarus-scheme.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/gmp-4.2.2
 SLOT=0
 SRC_URI=http://ikarus-scheme.org/ikarus.dev/ikarus-scheme-r1870.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fe6a4ca13dc5da7fed33c6cd478ce177
diff --git a/metadata/md5-cache/dev-tcltk/blt-2.4z-r12 b/metadata/md5-cache/dev-tcltk/blt-2.4z-r12
index 1b5c12c3a827..72a5df49219f 100644
--- a/metadata/md5-cache/dev-tcltk/blt-2.4z-r12
+++ b/metadata/md5-cache/dev-tcltk/blt-2.4z-r12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/tk jpeg? ( virtual/jpeg ) X? ( x11-libs/libX11 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/tk jpeg? ( virtual/jpeg ) X? ( x11-libs/libX11 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Extension to Tk, adding new widgets, geometry managers, and misc commands
 EAPI=5
 HOMEPAGE=http://blt.sourceforge.net/ http://jos.decoster.googlepages.com/bltfortk8.5.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/tk jpeg? ( virtual/jpeg ) X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/blt2.4z-8.5.2.tar.gz http://jos.decoster.googlepages.com/blt2.4z-8.5.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d737c4da59991a0974a818acdc51185b
diff --git a/metadata/md5-cache/dev-tcltk/expect-5.43.0 b/metadata/md5-cache/dev-tcltk/expect-5.43.0
index e24070ce6bbc..8ca7437f4ed8 100644
--- a/metadata/md5-cache/dev-tcltk/expect-5.43.0
+++ b/metadata/md5-cache/dev-tcltk/expect-5.43.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/tcl-8.2 X? ( >=dev-lang/tk-8.2 ) || ( >=sys-devel/automake-1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=>=dev-lang/tcl-8.2 X? ( >=dev-lang/tk-8.2 ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=tool for automating interactive applications
 HOMEPAGE=http://expect.nist.gov/
 IUSE=X doc
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/tcl-8.2 X? ( >=dev-lang/tk-8.2 )
 SLOT=0
 SRC_URI=http://expect.nist.gov/src/expect-5.43.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8b8012c06357cf6d112b2c169d858c37
diff --git a/metadata/md5-cache/dev-tcltk/expect-5.43.0-r1 b/metadata/md5-cache/dev-tcltk/expect-5.43.0-r1
index d83e244a53ab..1f35e3afc5c8 100644
--- a/metadata/md5-cache/dev-tcltk/expect-5.43.0-r1
+++ b/metadata/md5-cache/dev-tcltk/expect-5.43.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/tcl-8.2 X? ( >=dev-lang/tk-8.2 ) || ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=>=dev-lang/tcl-8.2 X? ( >=dev-lang/tk-8.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=tool for automating interactive applications
 EAPI=3
 HOMEPAGE=http://expect.nist.gov/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/tcl-8.2 X? ( >=dev-lang/tk-8.2 )
 SLOT=0
 SRC_URI=http://expect.nist.gov/src/expect-5.43.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fb1351d1e858536f2623631640c0c1d1
diff --git a/metadata/md5-cache/dev-tcltk/expect-5.44.1.15 b/metadata/md5-cache/dev-tcltk/expect-5.44.1.15
index fb97b871c439..e1ffd5f9fb22 100644
--- a/metadata/md5-cache/dev-tcltk/expect-5.44.1.15
+++ b/metadata/md5-cache/dev-tcltk/expect-5.44.1.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-lang/tcl-8.2[threads?] X? ( >=dev-lang/tk-8.2[threads?] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-lang/tcl-8.2[threads?] X? ( >=dev-lang/tk-8.2[threads?] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=tool for automating interactive applications
 EAPI=3
 HOMEPAGE=http://expect.nist.gov/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/tcl-8.2[threads?] X? ( >=dev-lang/tk-8.2[threads?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/expect/expect-5.44.1.15.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c60631f9a3fdc50a06c4f5c0bba41fc5
diff --git a/metadata/md5-cache/dev-tcltk/expect-5.45 b/metadata/md5-cache/dev-tcltk/expect-5.45
index 45652076aecb..63620c9e8c3c 100644
--- a/metadata/md5-cache/dev-tcltk/expect-5.45
+++ b/metadata/md5-cache/dev-tcltk/expect-5.45
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-lang/tcl-8.2[threads?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-lang/tcl-8.2[threads?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=tool for automating interactive applications
 EAPI=3
 HOMEPAGE=http://expect.nist.gov/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/tcl-8.2[threads?]
 SLOT=0
 SRC_URI=mirror://sourceforge/expect/expect5.45.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dedcaeeb75afae1a00a79b990cea4116
diff --git a/metadata/md5-cache/dev-tcltk/itk-3.4_pre20090417-r1 b/metadata/md5-cache/dev-tcltk/itk-3.4_pre20090417-r1
index 01979cd0d8ef..2d96150beb41 100644
--- a/metadata/md5-cache/dev-tcltk/itk-3.4_pre20090417-r1
+++ b/metadata/md5-cache/dev-tcltk/itk-3.4_pre20090417-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/tk =dev-tcltk/itcl-3.4* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/tk =dev-tcltk/itcl-3.4* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Object Oriented Enhancements for Tcl/Tk
 EAPI=4
 HOMEPAGE=http://incrtcl.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/tk =dev-tcltk/itcl-3.4*
 SLOT=0
 SRC_URI=mirror://gentoo/incrTcl-3.4_pre20090417.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=94194ac254a66dd34cb338b50b2bb191
diff --git a/metadata/md5-cache/dev-tcltk/itk-4.0.0 b/metadata/md5-cache/dev-tcltk/itk-4.0.0
index 35adcb598c4e..ec7cf65e14e8 100644
--- a/metadata/md5-cache/dev-tcltk/itk-4.0.0
+++ b/metadata/md5-cache/dev-tcltk/itk-4.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/tk-8.6 =dev-tcltk/itcl-4.0* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-lang/tk-8.6 =dev-tcltk/itcl-4.0* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Object Oriented Enhancements for Tcl/Tk
 EAPI=5
 HOMEPAGE=http://incrtcl.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/tk-8.6 =dev-tcltk/itcl-4.0*
 SLOT=0
 SRC_URI=mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/Itcl%204.0.0/itk4.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8f1f57d02337090c4631cd41f68318c9
diff --git a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r6 b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r6
index 204414b2fa92..21fabbeb17cb 100644
--- a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r6
+++ b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/tcl dev-lang/tk alsa? ( media-libs/alsa-lib ) python? ( python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] ) vorbis? ( media-libs/libvorbis ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+DEPEND=dev-lang/tcl dev-lang/tk alsa? ( media-libs/alsa-lib ) python? ( python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] ) vorbis? ( media-libs/libvorbis ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 DESCRIPTION=The Snack Sound Toolkit (Tcl)
 EAPI=5
 HOMEPAGE=http://www.speech.kth.se/snack/
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/tcl dev-lang/tk alsa? ( media-libs/alsa-lib ) python? ( python_
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b4a4cb087d74ef38b53ece03bb977f75
diff --git a/metadata/md5-cache/dev-tcltk/tcl-mccp-0.6 b/metadata/md5-cache/dev-tcltk/tcl-mccp-0.6
index e09a6217a41b..feff4fca82f9 100644
--- a/metadata/md5-cache/dev-tcltk/tcl-mccp-0.6
+++ b/metadata/md5-cache/dev-tcltk/tcl-mccp-0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/tcl
 SLOT=0
 SRC_URI=mirror://sourceforge/tcl-mccp/tcl-mccp-0.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d177b24aca6a2d09fe1aec1ceb90ecf7
diff --git a/metadata/md5-cache/dev-tcltk/tclreadline-2.1.0-r2 b/metadata/md5-cache/dev-tcltk/tclreadline-2.1.0-r2
index 4759f9175134..cf2d0cca3c3c 100644
--- a/metadata/md5-cache/dev-tcltk/tclreadline-2.1.0-r2
+++ b/metadata/md5-cache/dev-tcltk/tclreadline-2.1.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/tcl sys-libs/readline || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/tcl sys-libs/readline || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Readline extension to TCL
 EAPI=5
 HOMEPAGE=http://tclreadline.sf.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/tcl sys-libs/readline
 SLOT=0
 SRC_URI=mirror://sourceforge/tclreadline/tclreadline-2.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9be5343f5924540b23faa2cde26684ad
diff --git a/metadata/md5-cache/dev-tcltk/tclxml-3.1-r2 b/metadata/md5-cache/dev-tcltk/tclxml-3.1-r2
index d69ea19ede47..762ed6c0da85 100644
--- a/metadata/md5-cache/dev-tcltk/tclxml-3.1-r2
+++ b/metadata/md5-cache/dev-tcltk/tclxml-3.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/tcl-8.2 >=dev-tcltk/tcllib-1.2 xml? ( >=dev-libs/libxml2-2.6.9 ) expat? ( dev-libs/expat virtual/libiconv ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-lang/tcl-8.2 >=dev-tcltk/tcllib-1.2 xml? ( >=dev-libs/libxml2-2.6.9 ) expat? ( dev-libs/expat virtual/libiconv ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Pure Tcl implementation of an XML parser.
 HOMEPAGE=http://tclxml.sourceforge.net/
 IUSE=debug expat threads xml
@@ -9,5 +9,5 @@ RDEPEND=>=dev-lang/tcl-8.2 >=dev-tcltk/tcllib-1.2 xml? ( >=dev-libs/libxml2-2.6.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/tclxml/tclxml-3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e6550047f32b6c5fb832e66a53169ae4
diff --git a/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r1 b/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r1
index 06843063d16e..cedd4e3bb484 100644
--- a/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r1
+++ b/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/tcl dev-libs/expat || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/tcl dev-libs/expat || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A XML/DOM/XPath/XSLT Implementation for Tcl
 EAPI=4
 HOMEPAGE=http://tdom.github.com/
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=dev-lang/tcl dev-libs/expat
 SLOT=0
 SRC_URI=mirror://github/tDOM/tdom/tDOM-0.8.3.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b79ad4ee731cf074905743e04908c5ac
diff --git a/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r2 b/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r2
index 105f2c136714..28a5637105c5 100644
--- a/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r2
+++ b/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/tcl:= dev-libs/expat || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/tcl:= dev-libs/expat || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A XML/DOM/XPath/XSLT Implementation for Tcl
 EAPI=5
 HOMEPAGE=http://tdom.github.com/
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=dev-lang/tcl:= dev-libs/expat
 SLOT=0
 SRC_URI=mirror://github/tDOM/tdom/tDOM-0.8.3.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b04dd3e54336f886f373b75cfb5cef56
diff --git a/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r3 b/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r3
index 365170ca19a2..7d22fb30fa0a 100644
--- a/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r3
+++ b/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/tcl:= dev-libs/expat || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/tcl:= dev-libs/expat || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A XML/DOM/XPath/XSLT Implementation for Tcl
 EAPI=5
 HOMEPAGE=http://tdom.github.com/
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=dev-lang/tcl:= dev-libs/expat
 SLOT=0
 SRC_URI=mirror://github/tDOM/tdom/tDOM-0.8.3.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c82927c18f65a08b5e5a72cce2c52245
diff --git a/metadata/md5-cache/dev-tcltk/thread-2.6.2 b/metadata/md5-cache/dev-tcltk/thread-2.6.2
index c1b4c5c7bfe7..fa1ab60aae84 100644
--- a/metadata/md5-cache/dev-tcltk/thread-2.6.2
+++ b/metadata/md5-cache/dev-tcltk/thread-2.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/tcl[threads] gdbm? ( sys-libs/gdbm ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/tcl[threads] gdbm? ( sys-libs/gdbm ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tcl Thread extension
 EAPI=2
 HOMEPAGE=http://www.tcl.tk/
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/tcl[threads] gdbm? ( sys-libs/gdbm )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/tcl/thread2.6.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f1d9f2767226e2ce874b2c9add0e24c4
diff --git a/metadata/md5-cache/dev-tcltk/thread-2.6.6 b/metadata/md5-cache/dev-tcltk/thread-2.6.6
index 02189b22fb52..ab2c70ce850e 100644
--- a/metadata/md5-cache/dev-tcltk/thread-2.6.6
+++ b/metadata/md5-cache/dev-tcltk/thread-2.6.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/tcl[threads] gdbm? ( sys-libs/gdbm ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/tcl[threads] gdbm? ( sys-libs/gdbm ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tcl Thread extension
 EAPI=2
 HOMEPAGE=http://www.tcl.tk/
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/tcl[threads] gdbm? ( sys-libs/gdbm )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/tcl/thread2.6.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=df9db2d170cce33b9a8e8daaf66d4320
diff --git a/metadata/md5-cache/dev-tcltk/thread-2.7.0 b/metadata/md5-cache/dev-tcltk/thread-2.7.0
index 1c5dde9adff5..1a8c1e59ffc2 100644
--- a/metadata/md5-cache/dev-tcltk/thread-2.7.0
+++ b/metadata/md5-cache/dev-tcltk/thread-2.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/tcl[threads] gdbm? ( sys-libs/gdbm ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/tcl[threads] gdbm? ( sys-libs/gdbm ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tcl Thread extension
 EAPI=5
 HOMEPAGE=http://www.tcl.tk/
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/tcl[threads] gdbm? ( sys-libs/gdbm )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/tcl/thread2.7.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=92fbc7131f8f5d3cfd05ce36d979bf44
diff --git a/metadata/md5-cache/dev-tcltk/tkTheme-1.0-r2 b/metadata/md5-cache/dev-tcltk/tkTheme-1.0-r2
index c36349283d81..17b51e578f15 100644
--- a/metadata/md5-cache/dev-tcltk/tkTheme-1.0-r2
+++ b/metadata/md5-cache/dev-tcltk/tkTheme-1.0-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/tk x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm
 SLOT=0
 SRC_URI=http://www.xmission.com/~georgeps/Tk_Theme/other/tkTheme.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=82ad2dbcc692c504d1796680bbd7f054
diff --git a/metadata/md5-cache/dev-tcltk/tkXwin-1.0-r3 b/metadata/md5-cache/dev-tcltk/tkXwin-1.0-r3
index f749acd0d7d2..df8d564063fa 100644
--- a/metadata/md5-cache/dev-tcltk/tkXwin-1.0-r3
+++ b/metadata/md5-cache/dev-tcltk/tkXwin-1.0-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/tk[threads?] x11-libs/libXScrnSaver x11-libs/libX11 x11-libs/libXext x11-proto/scrnsaverproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://beepcore-tcl.sourceforge.net/tkXwin-1.0.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b11b39e2644cf6d11602809fe6d12c1f
diff --git a/metadata/md5-cache/dev-tcltk/tkdnd-2.2 b/metadata/md5-cache/dev-tcltk/tkdnd-2.2
index 2c65ed601bf1..08313ed28418 100644
--- a/metadata/md5-cache/dev-tcltk/tkdnd-2.2
+++ b/metadata/md5-cache/dev-tcltk/tkdnd-2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/tk
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/tkdnd/TkDND/TkDND%202.2/tkdnd2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fc60665fad5b2d11ccb4db9495e004fa
diff --git a/metadata/md5-cache/dev-tcltk/tkzinc-3.3.4 b/metadata/md5-cache/dev-tcltk/tkzinc-3.3.4
index 29d4f581e1db..bbcad05dc087 100644
--- a/metadata/md5-cache/dev-tcltk/tkzinc-3.3.4
+++ b/metadata/md5-cache/dev-tcltk/tkzinc-3.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/tk media-libs/glew virtual/opengl doc? ( virtual/latex-base ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/tk media-libs/glew virtual/opengl doc? ( virtual/latex-base ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Tk widget library.
 EAPI=3
 HOMEPAGE=http://www.tkzinc.org
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-lang/tk media-libs/glew virtual/opengl doc? ( virtual/latex-base )
 SLOT=0
 SRC_URI=http://www.tkzinc.org/Packages/zinc-tk_3.3.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eee34184510db3eceacd1d2e91f00827
diff --git a/metadata/md5-cache/dev-tcltk/tkzinc-3.3.6 b/metadata/md5-cache/dev-tcltk/tkzinc-3.3.6
index 2fee32b1e33f..1991ba4d8e6d 100644
--- a/metadata/md5-cache/dev-tcltk/tkzinc-3.3.6
+++ b/metadata/md5-cache/dev-tcltk/tkzinc-3.3.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/tk media-libs/glew virtual/opengl doc? ( virtual/latex-base ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/tk media-libs/glew virtual/opengl doc? ( virtual/latex-base ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Tk widget library.
 EAPI=5
 HOMEPAGE=http://www.tkzinc.org
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-lang/tk media-libs/glew virtual/opengl doc? ( virtual/latex-base )
 SLOT=0
 SRC_URI=http://www.tkzinc.org/Packages/Tkzinc-3.3.6plus.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f53091b0ef482d7b4dc0eb04f2c4f18e
diff --git a/metadata/md5-cache/dev-tex/catdvi-0.14-r1 b/metadata/md5-cache/dev-tex/catdvi-0.14-r1
index b4d4a899ffd3..b34d3b77a590 100644
--- a/metadata/md5-cache/dev-tex/catdvi-0.14-r1
+++ b/metadata/md5-cache/dev-tex/catdvi-0.14-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=virtual/tex-base || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/tex-base || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=DVI to plain text translator
 EAPI=4
 HOMEPAGE=http://catdvi.sourceforge.net
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/tex-base
 SLOT=0
 SRC_URI=mirror://sourceforge/catdvi/catdvi-0.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d21396837283a02e3d772fc39d50ae7c
diff --git a/metadata/md5-cache/dev-tex/chktex-1.7.0 b/metadata/md5-cache/dev-tex/chktex-1.7.0
index 3571928bb877..04b866fc279e 100644
--- a/metadata/md5-cache/dev-tex/chktex-1.7.0
+++ b/metadata/md5-cache/dev-tex/chktex-1.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/latex-base dev-lang/perl pcre? ( dev-libs/libpcre ) sys-apps/groff doc? ( dev-tex/latex2html ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/latex-base dev-lang/perl pcre? ( dev-libs/libpcre ) sys-apps/groff doc? ( dev-tex/latex2html ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Checks latex source for common mistakes
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/chktex/
@@ -10,5 +10,5 @@ RDEPEND=virtual/latex-base dev-lang/perl pcre? ( dev-libs/libpcre )
 REQUIRED_USE=test? ( pcre )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/chktex/chktex-1.7.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=85cc64cd262979e41e1196b767ee09ef
diff --git a/metadata/md5-cache/dev-tex/chktex-1.7.1 b/metadata/md5-cache/dev-tex/chktex-1.7.1
index 5c6c2c0cf5bf..f97136eeb91a 100644
--- a/metadata/md5-cache/dev-tex/chktex-1.7.1
+++ b/metadata/md5-cache/dev-tex/chktex-1.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/latex-base dev-lang/perl pcre? ( dev-libs/libpcre ) sys-apps/groff doc? ( dev-tex/latex2html ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/latex-base dev-lang/perl pcre? ( dev-libs/libpcre ) sys-apps/groff doc? ( dev-tex/latex2html ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Checks latex source for common mistakes
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/chktex/
@@ -10,5 +10,5 @@ RDEPEND=virtual/latex-base dev-lang/perl pcre? ( dev-libs/libpcre )
 REQUIRED_USE=test? ( pcre )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/chktex/chktex-1.7.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d46768cdb179a348578de0afa53f5850
diff --git a/metadata/md5-cache/dev-tex/cjk-latex-4.8.2 b/metadata/md5-cache/dev-tex/cjk-latex-4.8.2
index 5ca44ac156b0..604a03db6c9e 100644
--- a/metadata/md5-cache/dev-tex/cjk-latex-4.8.2
+++ b/metadata/md5-cache/dev-tex/cjk-latex-4.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=virtual/latex-base emacs? ( virtual/emacs ) virtual/latex-base >=sys-apps/texinfo-4.2-r5 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/latex-base emacs? ( virtual/emacs ) virtual/latex-base >=sys-apps/texinfo-4.2-r5 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A LaTeX 2e macro package which enables the use of CJK scripts in various encodings
 EAPI=4
 HOMEPAGE=http://cjk.ffii.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base emacs? ( virtual/emacs ) app-arch/unzip virtual/latex-base
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	latex-package	e7bfe03b27224512702eac009812cc50	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	latex-package	e7bfe03b27224512702eac009812cc50	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=44b09410ed1fcb95e1b954d43e075440
diff --git a/metadata/md5-cache/dev-util/ald-0.1.7-r1 b/metadata/md5-cache/dev-util/ald-0.1.7-r1
index f880a08a4f24..5f4341d9d001 100644
--- a/metadata/md5-cache/dev-util/ald-0.1.7-r1
+++ b/metadata/md5-cache/dev-util/ald-0.1.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=ncurses? ( sys-libs/ncurses ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ncurses? ( sys-libs/ncurses ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Assembly Language Debugger - a tool for debugging executable programs at the assembly level
 EAPI=4
 HOMEPAGE=http://ald.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( sys-libs/ncurses )
 SLOT=0
 SRC_URI=mirror://sourceforge/ald/ald-0.1.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=3e897566ed3034a8af37daf60ff3e2a6
diff --git a/metadata/md5-cache/dev-util/anjuta-3.6.2-r1 b/metadata/md5-cache/dev-util/anjuta-3.6.2-r1
index aa46e4b1b7cc..d5b519b70d55 100644
--- a/metadata/md5-cache/dev-util/anjuta-3.6.2-r1
+++ b/metadata/md5-cache/dev-util/anjuta-3.6.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.4:3 >=x11-libs/vte-0.27.6:2.90 >=dev-libs/libxml2-2.4.23 >=dev-libs/gdl-3.5.5:3= >=x11-libs/gtksourceview-3:3.0 sys-devel/autogen >=gnome-extra/libgda-5:5= dev-util/ctags x11-libs/libXext x11-libs/libXrender python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] devhelp? ( >=dev-util/devhelp-3.4.2:= ) glade? ( >=dev-util/glade-3.12:3.10= ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) subversion? ( >=dev-vcs/subversion-1.5.0:= >=net-libs/neon-0.28.2:= >=dev-libs/apr-1:= >=dev-libs/apr-util-1:= ) vala? ( || ( dev-lang/vala:0.18 ) ) >=dev-lang/perl-5 >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.1 sys-devel/bison sys-devel/flex >=sys-devel/gettext-0.17 virtual/pkgconfig !!dev-libs/gnome-build test? ( app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.5 ) app-text/yelp-tools dev-libs/gobject-introspection-common gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.4:3 >=x11-libs/vte-0.27.6:2.90 >=dev-libs/libxml2-2.4.23 >=dev-libs/gdl-3.5.5:3= >=x11-libs/gtksourceview-3:3.0 sys-devel/autogen >=gnome-extra/libgda-5:5= dev-util/ctags x11-libs/libXext x11-libs/libXrender python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] devhelp? ( >=dev-util/devhelp-3.4.2:= ) glade? ( >=dev-util/glade-3.12:3.10= ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) subversion? ( >=dev-vcs/subversion-1.5.0:= >=net-libs/neon-0.28.2:= >=dev-libs/apr-1:= >=dev-libs/apr-util-1:= ) vala? ( || ( dev-lang/vala:0.18 ) ) >=dev-lang/perl-5 >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.1 sys-devel/bison sys-devel/flex >=sys-devel/gettext-0.17 virtual/pkgconfig !!dev-libs/gnome-build test? ( app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.5 ) app-text/yelp-tools dev-libs/gobject-introspection-common gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A versatile IDE for GNOME
 EAPI=5
 HOMEPAGE=http://www.anjuta.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.4:3 >=x11-libs/vte-0.27.6:2.90 >=dev-libs/libxml2-2.4.23 >=dev-libs/gdl-3.5.5:3= >=x11-libs/gtksourceview-3:3.0 sys-devel/autogen >=gnome-extra/libgda-5:5= dev-util/ctags x11-libs/libXext x11-libs/libXrender python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] devhelp? ( >=dev-util/devhelp-3.4.2:= ) glade? ( >=dev-util/glade-3.12:3.10= ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) subversion? ( >=dev-vcs/subversion-1.5.0:= >=net-libs/neon-0.28.2:= >=dev-libs/apr-1:= >=dev-libs/apr-util-1:= ) vala? ( || ( dev-lang/vala:0.18 ) ) packagekit? ( app-admin/packagekit-base )
 SLOT=0
 SRC_URI=mirror://gnome/sources/anjuta/3.6/anjuta-3.6.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c28fee2dce41920077d627be0066f49b
diff --git a/metadata/md5-cache/dev-util/anjuta-3.8.1 b/metadata/md5-cache/dev-util/anjuta-3.8.1
index 51a4544f74e1..fadb1aabfb73 100644
--- a/metadata/md5-cache/dev-util/anjuta-3.8.1
+++ b/metadata/md5-cache/dev-util/anjuta-3.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.4:3 >=x11-libs/vte-0.27.6:2.90 >=dev-libs/libxml2-2.4.23 >=dev-libs/gdl-3.5.5:3= >=x11-libs/gtksourceview-3:3.0 sys-devel/autogen >=gnome-extra/libgda-5:5= dev-util/ctags x11-libs/libXext x11-libs/libXrender python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] devhelp? ( >=dev-util/devhelp-3.7.4:= ) glade? ( >=dev-util/glade-3.12:3.10= ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) subversion? ( >=dev-vcs/subversion-1.5.0:= >=net-libs/neon-0.28.2:= >=dev-libs/apr-1:= >=dev-libs/apr-util-1:= ) vala? ( || ( dev-lang/vala:0.20 ) ) >=dev-lang/perl-5 >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.1 sys-devel/bison sys-devel/flex >=sys-devel/gettext-0.17 virtual/pkgconfig !!dev-libs/gnome-build test? ( app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.5 ) app-text/yelp-tools dev-libs/gobject-introspection-common gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.4:3 >=x11-libs/vte-0.27.6:2.90 >=dev-libs/libxml2-2.4.23 >=dev-libs/gdl-3.5.5:3= >=x11-libs/gtksourceview-3:3.0 sys-devel/autogen >=gnome-extra/libgda-5:5= dev-util/ctags x11-libs/libXext x11-libs/libXrender python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] devhelp? ( >=dev-util/devhelp-3.7.4:= ) glade? ( >=dev-util/glade-3.12:3.10= ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) subversion? ( >=dev-vcs/subversion-1.5.0:= >=net-libs/neon-0.28.2:= >=dev-libs/apr-1:= >=dev-libs/apr-util-1:= ) vala? ( || ( dev-lang/vala:0.20 ) ) >=dev-lang/perl-5 >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.1 sys-devel/bison sys-devel/flex >=sys-devel/gettext-0.17 virtual/pkgconfig !!dev-libs/gnome-build test? ( app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.5 ) app-text/yelp-tools dev-libs/gobject-introspection-common gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A versatile IDE for GNOME
 EAPI=5
 HOMEPAGE=http://www.anjuta.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.4:3 >=x11-libs/vte-0.27.6:2.90 >=dev-libs/libxml2-2.4.23 >=dev-libs/gdl-3.5.5:3= >=x11-libs/gtksourceview-3:3.0 sys-devel/autogen >=gnome-extra/libgda-5:5= dev-util/ctags x11-libs/libXext x11-libs/libXrender python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] devhelp? ( >=dev-util/devhelp-3.7.4:= ) glade? ( >=dev-util/glade-3.12:3.10= ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) subversion? ( >=dev-vcs/subversion-1.5.0:= >=net-libs/neon-0.28.2:= >=dev-libs/apr-1:= >=dev-libs/apr-util-1:= ) vala? ( || ( dev-lang/vala:0.20 ) ) packagekit? ( app-admin/packagekit-base )
 SLOT=0
 SRC_URI=mirror://gnome/sources/anjuta/3.8/anjuta-3.8.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=47f2edc40d1b6b0cc227ec51a6d71103
diff --git a/metadata/md5-cache/dev-util/astyle-1.24 b/metadata/md5-cache/dev-util/astyle-1.24
index 4d8c67c7c512..5cd79d74d2c7 100644
--- a/metadata/md5-cache/dev-util/astyle-1.24
+++ b/metadata/md5-cache/dev-util/astyle-1.24
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Artistic Style is a reindenter and reformatter of C++, C and Java source code
 EAPI=3
 HOMEPAGE=http://astyle.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/astyle/astyle_1.24_linux.tar.gz http://gentoo.ccss.cz/1.24-autotools.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d5d8f5206856a6864160303b14e6d894
diff --git a/metadata/md5-cache/dev-util/atomic-install-0.1.1 b/metadata/md5-cache/dev-util/atomic-install-0.1.1
index d27458b0a84e..f5c787c1c1e8 100644
--- a/metadata/md5-cache/dev-util/atomic-install-0.1.1
+++ b/metadata/md5-cache/dev-util/atomic-install-0.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=xattr? ( sys-apps/attr )
 SLOT=0
 SRC_URI=mirror://github/mgorny/atomic-install/atomic-install-0.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9187ebc7df63ce73a0c60707cb6cba4e
diff --git a/metadata/md5-cache/dev-util/atomic-install-9999 b/metadata/md5-cache/dev-util/atomic-install-9999
index 5d114b61ae4a..f64adb9fa2db 100644
--- a/metadata/md5-cache/dev-util/atomic-install-9999
+++ b/metadata/md5-cache/dev-util/atomic-install-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=xattr? ( sys-apps/attr ) doc? ( >=dev-util/gtk-doc-1.18 ) >=dev-util/gtk-doc-1.18 dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=xattr? ( sys-apps/attr ) doc? ( >=dev-util/gtk-doc-1.18 ) >=dev-util/gtk-doc-1.18 dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library and tool to atomically install sets of files
 EAPI=4
 HOMEPAGE=https://github.com/mgorny/atomic-install/
@@ -7,5 +7,5 @@ IUSE=doc static-libs xattr
 LICENSE=BSD
 RDEPEND=xattr? ( sys-apps/attr )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eb1eebc5888ee6fce7524bb2bf949889
diff --git a/metadata/md5-cache/dev-util/bin_replace_string-0.2 b/metadata/md5-cache/dev-util/bin_replace_string-0.2
index 2cb6c424f13d..3bb44cfafc7b 100644
--- a/metadata/md5-cache/dev-util/bin_replace_string-0.2
+++ b/metadata/md5-cache/dev-util/bin_replace_string-0.2
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=|| ( >=dev-libs/libelf-0.8.13 dev-libs/elfutils )
 SLOT=0
 SRC_URI=ftp://mirror.ohnopub.net/mirror/bin_replace_string-0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e910ced991f0da0b5c938dde98488263
diff --git a/metadata/md5-cache/dev-util/bless-0.5.2 b/metadata/md5-cache/dev-util/bless-0.5.2
index 60e49cf3d07a..c00faf8ad3c6 100644
--- a/metadata/md5-cache/dev-util/bless-0.5.2
+++ b/metadata/md5-cache/dev-util/bless-0.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DEPEND=>=dev-lang/mono-1.1.14 >=dev-dotnet/gtk-sharp-2.8 >=dev-dotnet/glade-sharp-2.8 app-text/scrollkeeper >=sys-devel/gettext-0.15 virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=dev-lang/mono-1.1.14 >=dev-dotnet/gtk-sharp-2.8 >=dev-dotnet/glade-sharp-2.8 app-text/scrollkeeper >=sys-devel/gettext-0.15 virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=GTK# Hex Editor
 HOMEPAGE=http://home.gna.org/bless/
 IUSE=debug debug
@@ -9,5 +9,5 @@ RDEPEND=>=dev-lang/mono-1.1.14 >=dev-dotnet/gtk-sharp-2.8 >=dev-dotnet/glade-sha
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.gna.org/bless/bless-0.5.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1a47f8b97055eb3a3534b88a17937743
diff --git a/metadata/md5-cache/dev-util/bless-0.6.0-r1 b/metadata/md5-cache/dev-util/bless-0.6.0-r1
index ea041180f144..93783cc12534 100644
--- a/metadata/md5-cache/dev-util/bless-0.6.0-r1
+++ b/metadata/md5-cache/dev-util/bless-0.6.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=GTK# Hex Editor
 EAPI=2
 HOMEPAGE=http://home.gna.org/bless/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/mono-1.1.14 >=dev-dotnet/gtk-sharp-2.12 >=dev-dotnet/glade-sh
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.gna.org/bless/bless-0.6.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b254c670d59973d27ccc1511c9f3663a
diff --git a/metadata/md5-cache/dev-util/ccache-2.4-r6 b/metadata/md5-cache/dev-util/ccache-2.4-r6
index a624a004b9e1..f57b7fb512a2 100644
--- a/metadata/md5-cache/dev-util/ccache-2.4-r6
+++ b/metadata/md5-cache/dev-util/ccache-2.4-r6
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-f
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://samba.org/ftp/ccache/ccache-2.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ce6cd5a210d327e0a1d4de5b97728f9a
diff --git a/metadata/md5-cache/dev-util/ccache-2.4-r7 b/metadata/md5-cache/dev-util/ccache-2.4-r7
index 3fbd28645ed1..6f2609e8f101 100644
--- a/metadata/md5-cache/dev-util/ccache-2.4-r7
+++ b/metadata/md5-cache/dev-util/ccache-2.4-r7
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-f
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://samba.org/ftp/ccache/ccache-2.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=861a45454be6040ccab80f599e875209
diff --git a/metadata/md5-cache/dev-util/ccache-2.4-r8 b/metadata/md5-cache/dev-util/ccache-2.4-r8
index b118a7212aa9..7fca7f65c250 100644
--- a/metadata/md5-cache/dev-util/ccache-2.4-r8
+++ b/metadata/md5-cache/dev-util/ccache-2.4-r8
@@ -6,5 +6,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://samba.org/ftp/ccache/ccache-2.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fd841ccc4171adbd4060a10ed6b33d89
diff --git a/metadata/md5-cache/dev-util/ccache-2.4-r9 b/metadata/md5-cache/dev-util/ccache-2.4-r9
index 170df4da89fb..cdd9f8084d43 100644
--- a/metadata/md5-cache/dev-util/ccache-2.4-r9
+++ b/metadata/md5-cache/dev-util/ccache-2.4-r9
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-f
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://samba.org/ftp/ccache/ccache-2.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e7f606c14e2eb4453d3e009b8119134d
diff --git a/metadata/md5-cache/dev-util/ccglue-0.3.1 b/metadata/md5-cache/dev-util/ccglue-0.3.1
index cce17f8e41f0..90b167d2291f 100644
--- a/metadata/md5-cache/dev-util/ccglue-0.3.1
+++ b/metadata/md5-cache/dev-util/ccglue-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=dev-libs/glib:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Produce cross-reference files from cscope and ctags for use with app-vim/cctree
 EAPI=4
 HOMEPAGE=http://ccglue.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2
 SLOT=0
 SRC_URI=mirror://sourceforge/ccglue/ccglue-release-0.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=47d4d71b4689b5b6405fa7b9291ad9d6
diff --git a/metadata/md5-cache/dev-util/ccglue-0.6.0 b/metadata/md5-cache/dev-util/ccglue-0.6.0
index 69f92f54ebce..cb11aed1658f 100644
--- a/metadata/md5-cache/dev-util/ccglue-0.6.0
+++ b/metadata/md5-cache/dev-util/ccglue-0.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Produce cross-reference files from cscope and ctags for use with app-vim/cctree
 EAPI=4
 HOMEPAGE=http://ccglue.sourceforge.net/
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/ccglue/ccglue-release-0.6.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=48f4da3fc001f8c89181c5fee0543322
diff --git a/metadata/md5-cache/dev-util/cmake-2.8.10.2-r2 b/metadata/md5-cache/dev-util/cmake-2.8.10.2-r2
index e361a542c481..59789e600645 100644
--- a/metadata/md5-cache/dev-util/cmake-2.8.10.2-r2
+++ b/metadata/md5-cache/dev-util/cmake-2.8.10.2-r2
@@ -10,4 +10,4 @@ RDEPEND=>=app-arch/libarchive-2.8.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.2
 SLOT=0
 SRC_URI=http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	bc8bbf26de246f74e2901a3696ad96d6	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6b749094e669183123b0b1dd212d4ffe
+_md5_=1af33f99f84a282fd4ca797324fc47ad
diff --git a/metadata/md5-cache/dev-util/cmockery-0.1.2 b/metadata/md5-cache/dev-util/cmockery-0.1.2
index da118b8ac423..619af99601c2 100644
--- a/metadata/md5-cache/dev-util/cmockery-0.1.2
+++ b/metadata/md5-cache/dev-util/cmockery-0.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A lightweight library to simplify writing unit tests for C applications
 EAPI=4
 HOMEPAGE=http://code.google.com/p/cmockery/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~hppa ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=http://cmockery.googlecode.com/files/cmockery-0.1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=4bd1bf9c1c3fa23cf1c3b49c60739224
diff --git a/metadata/md5-cache/dev-util/coccinelle-1.0.0_rc15-r1 b/metadata/md5-cache/dev-util/coccinelle-1.0.0_rc15-r1
index 8f3aeb41a5b0..65ed93b36d73 100644
--- a/metadata/md5-cache/dev-util/coccinelle-1.0.0_rc15-r1
+++ b/metadata/md5-cache/dev-util/coccinelle-1.0.0_rc15-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ocaml-3.10[ocamlopt?] dev-ml/sexplib emacs? ( virtual/emacs ) ocaml? ( dev-ml/findlib ) pcre? ( dev-ml/pcre-ocaml ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-fontsextra ) python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-lang/ocaml-3.10[ocamlopt?] dev-ml/sexplib emacs? ( virtual/emacs ) ocaml? ( dev-ml/findlib ) pcre? ( dev-ml/pcre-ocaml ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-fontsextra ) python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Program matching and transformation engine
 EAPI=4
 HOMEPAGE=http://coccinelle.lip6.fr/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ocaml-3.10[ocamlopt?] dev-ml/sexplib emacs? ( virtual/emacs )
 REQUIRED_USE=test? ( ocaml python )
 SLOT=0
 SRC_URI=http://coccinelle.lip6.fr/distrib/coccinelle-1.0.0-rc15.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=23c7029351f55e74bc608a07e0a3c847
diff --git a/metadata/md5-cache/dev-util/coccinelle-1.0.0_rc16 b/metadata/md5-cache/dev-util/coccinelle-1.0.0_rc16
index 5d289390409c..541ac36b2586 100644
--- a/metadata/md5-cache/dev-util/coccinelle-1.0.0_rc16
+++ b/metadata/md5-cache/dev-util/coccinelle-1.0.0_rc16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ocaml-3.10[ocamlopt?] dev-ml/sexplib emacs? ( virtual/emacs ) ocaml? ( dev-ml/findlib ) pcre? ( dev-ml/pcre-ocaml ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-fontsextra ) python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-lang/ocaml-3.10[ocamlopt?] dev-ml/sexplib emacs? ( virtual/emacs ) ocaml? ( dev-ml/findlib ) pcre? ( dev-ml/pcre-ocaml ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-fontsextra ) python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Program matching and transformation engine
 EAPI=4
 HOMEPAGE=http://coccinelle.lip6.fr/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ocaml-3.10[ocamlopt?] dev-ml/sexplib emacs? ( virtual/emacs )
 REQUIRED_USE=test? ( ocaml python )
 SLOT=0
 SRC_URI=http://coccinelle.lip6.fr/distrib/coccinelle-1.0.0-rc16.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4b7ecea6c419d3b31f84e0348bd2d774
diff --git a/metadata/md5-cache/dev-util/cocom-0.996-r1 b/metadata/md5-cache/dev-util/cocom-0.996-r1
index 7ef79d1c8be0..1ac16cf90d08 100644
--- a/metadata/md5-cache/dev-util/cocom-0.996-r1
+++ b/metadata/md5-cache/dev-util/cocom-0.996-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=!!media-gfx/hugin || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!!media-gfx/hugin || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Toolset to help create compilers, cross-compilers, interpreters, and other language processors
 EAPI=2
 HOMEPAGE=http://cocom.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!!media-gfx/hugin
 SLOT=0
 SRC_URI=mirror://sourceforge/cocom/cocom-0.996.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fdd32b7cd38a8ef101c0d7a38851da1b
diff --git a/metadata/md5-cache/dev-util/codeblocks-9999 b/metadata/md5-cache/dev-util/codeblocks-9999
index 77be30c2fcc3..e73740454f8b 100644
--- a/metadata/md5-cache/dev-util/codeblocks-9999
+++ b/metadata/md5-cache/dev-util/codeblocks-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare unpack
-DEPEND=app-arch/zip x11-libs/wxGTK:2.8[X] contrib? ( app-text/hunspell dev-libs/boost:= dev-libs/libgamin ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=app-arch/zip x11-libs/wxGTK:2.8[X] contrib? ( app-text/hunspell dev-libs/boost:= dev-libs/libgamin ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=The open source, cross platform, free C++ IDE.
 EAPI=5
 HOMEPAGE=http://www.codeblocks.org/
@@ -7,5 +7,5 @@ IUSE=contrib debug pch static-libs
 LICENSE=GPL-3
 RDEPEND=app-arch/zip x11-libs/wxGTK:2.8[X] contrib? ( app-text/hunspell dev-libs/boost:= dev-libs/libgamin )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=28bcc071d3f0c10f1ec219c380b4e21e
diff --git a/metadata/md5-cache/dev-util/complexity-1.0 b/metadata/md5-cache/dev-util/complexity-1.0
index a39aaf51bc61..f3bab8cea211 100644
--- a/metadata/md5-cache/dev-util/complexity-1.0
+++ b/metadata/md5-cache/dev-util/complexity-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=>=sys-devel/autogen-5.11.7 sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-devel/autogen-5.11.7 sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a tool designed for analyzing the complexity of C program functions
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/complexity/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-devel/autogen-5.11.7
 SLOT=0
 SRC_URI=mirror://gnu/complexity/complexity-1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=26ea1961e8dded18978463ae7261e3c9
diff --git a/metadata/md5-cache/dev-util/cppi-1.17 b/metadata/md5-cache/dev-util/cppi-1.17
index ffffdb00fcfc..39082d295cd6 100644
--- a/metadata/md5-cache/dev-util/cppi-1.17
+++ b/metadata/md5-cache/dev-util/cppi-1.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=app-arch/xz-utils nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/xz-utils nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a cpp directive indenter
 EAPI=4
 HOMEPAGE=http://savannah.gnu.org/projects/cppi
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/cppi/cppi-1.17.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=581d162c6e409bf1503278c35ad9a290
diff --git a/metadata/md5-cache/dev-util/cpptest-1.1.0 b/metadata/md5-cache/dev-util/cpptest-1.1.0
index f342ce031d0f..334186c31694 100644
--- a/metadata/md5-cache/dev-util/cpptest-1.1.0
+++ b/metadata/md5-cache/dev-util/cpptest-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple but powerful unit testing framework for C++
 EAPI=2
 HOMEPAGE=http://cpptest.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/cpptest/cpptest-1.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d4f85df8c3d43a60a86a38c339c932de
diff --git a/metadata/md5-cache/dev-util/cpptest-1.1.1 b/metadata/md5-cache/dev-util/cpptest-1.1.1
index cb157228f03e..1f7ffef09e3b 100644
--- a/metadata/md5-cache/dev-util/cpptest-1.1.1
+++ b/metadata/md5-cache/dev-util/cpptest-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple but powerful unit testing framework for C++
 EAPI=2
 HOMEPAGE=http://cpptest.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/cpptest/cpptest-1.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=19bec67a16c926b8365719db43c7c4ef
diff --git a/metadata/md5-cache/dev-util/cppunit-9999 b/metadata/md5-cache/dev-util/cppunit-9999
index c3c4fbdfc642..8169fb94c4ef 100644
--- a/metadata/md5-cache/dev-util/cppunit-9999
+++ b/metadata/md5-cache/dev-util/cppunit-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=doc? ( app-doc/doxygen[dot] media-gfx/graphviz ) dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen[dot] media-gfx/graphviz ) dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C++ port of the famous JUnit framework for unit testing
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/cppunit
 IUSE=doc examples static-libs
 LICENSE=LGPL-2.1
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8282292f1047fb3ae5c966ee3d4af3f1
diff --git a/metadata/md5-cache/dev-util/cscope-15.8 b/metadata/md5-cache/dev-util/cscope-15.8
index 8f35451f243f..73920eda0050 100644
--- a/metadata/md5-cache/dev-util/cscope-15.8
+++ b/metadata/md5-cache/dev-util/cscope-15.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=>=sys-libs/ncurses-5.2 emacs? ( virtual/emacs ) sys-devel/flex sys-devel/bison || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.2 emacs? ( virtual/emacs ) sys-devel/flex sys-devel/bison || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Interactively examine a C program
 EAPI=4
 HOMEPAGE=http://cscope.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=mirror://sourceforge/cscope/cscope-15.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4a0f6b9865bbaf0c3a023f1817d0735d
diff --git a/metadata/md5-cache/dev-util/cscope-15.8a b/metadata/md5-cache/dev-util/cscope-15.8a
index 7e7f6542205d..f36b6649cf74 100644
--- a/metadata/md5-cache/dev-util/cscope-15.8a
+++ b/metadata/md5-cache/dev-util/cscope-15.8a
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=>=sys-libs/ncurses-5.2 emacs? ( virtual/emacs ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.2 emacs? ( virtual/emacs ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Interactively examine a C program
 EAPI=4
 HOMEPAGE=http://cscope.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=mirror://sourceforge/cscope/cscope-15.8a.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5c56a000a508cb26eb6a42c4b034d050
diff --git a/metadata/md5-cache/dev-util/cunit-2.1-r1 b/metadata/md5-cache/dev-util/cunit-2.1-r1
index 9b06936374a2..4a2b88ecd75d 100644
--- a/metadata/md5-cache/dev-util/cunit-2.1-r1
+++ b/metadata/md5-cache/dev-util/cunit-2.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=CUnit - C Unit Test Framework
 EAPI=3
 HOMEPAGE=http://cunit.sourceforge.net
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/cunit/CUnit-2.1-0-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e3113b5e9f02b5a887e74a4b413cd372
diff --git a/metadata/md5-cache/dev-util/ddd-3.3.12-r2 b/metadata/md5-cache/dev-util/ddd-3.3.12-r2
index 8213d131a42e..1329c2927ca5 100644
--- a/metadata/md5-cache/dev-util/ddd-3.3.12-r2
+++ b/metadata/md5-cache/dev-util/ddd-3.3.12-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/gdb sys-libs/ncurses x11-libs/libX11 x11-libs/libXaw x11-libs/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/ddd/ddd-3.3.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d5625a9873aacb47e974bb44aeaeca82
diff --git a/metadata/md5-cache/dev-util/ddd-3.3.12-r3 b/metadata/md5-cache/dev-util/ddd-3.3.12-r3
index 1e82fa9ff6c1..a80a113f06b0 100644
--- a/metadata/md5-cache/dev-util/ddd-3.3.12-r3
+++ b/metadata/md5-cache/dev-util/ddd-3.3.12-r3
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/gdb sys-libs/ncurses x11-libs/libX11 x11-libs/libXaw x11-libs/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/ddd/ddd-3.3.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=192441c69a462337ea70440bebd61760
diff --git a/metadata/md5-cache/dev-util/devhelp-3.6.1-r1 b/metadata/md5-cache/dev-util/devhelp-3.6.1-r1
index b8b8fa5c1bfb..5ec76e7192c0 100644
--- a/metadata/md5-cache/dev-util/devhelp-3.6.1-r1
+++ b/metadata/md5-cache/dev-util/devhelp-3.6.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=gnome-base/gconf-2.6:2 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 >=net-libs/webkit-gtk-1.6:3 python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=sys-devel/gettext-0.17 >=dev-util/intltool-0.40 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=gnome-base/gconf-2.6:2 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 >=net-libs/webkit-gtk-1.6:3 python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=sys-devel/gettext-0.17 >=dev-util/intltool-0.40 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=An API documentation browser for GNOME
 EAPI=5
 HOMEPAGE=http://live.gnome.org/devhelp
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=gnome-base/gconf-2.6:2 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 >=net-libs/webkit-gtk-1.6:3 gedit? ( python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] app-editors/gedit[introspection,python,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] x11-libs/gtk+[introspection] ) gnome-base/gsettings-desktop-schemas
 SLOT=0/3-1
 SRC_URI=mirror://gnome/sources/devhelp/3.6/devhelp-3.6.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6ed4ed143358a5656cffe389ceda9b7d
diff --git a/metadata/md5-cache/dev-util/difffilter-0.3.1 b/metadata/md5-cache/dev-util/difffilter-0.3.1
index 5e1d9c68ae0b..4c459c0e0ee2 100644
--- a/metadata/md5-cache/dev-util/difffilter-0.3.1
+++ b/metadata/md5-cache/dev-util/difffilter-0.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/liblist-2.3.1 dev-libs/libstrl dev-libs/tre
 SLOT=0
 SRC_URI=ftp://ohnopub.net/mirror/difffilter-0.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3a16426236e6934ac5b880972eb9a0fd
diff --git a/metadata/md5-cache/dev-util/difffilter-0.3.3 b/metadata/md5-cache/dev-util/difffilter-0.3.3
index 9cfe9037681c..99541de193c5 100644
--- a/metadata/md5-cache/dev-util/difffilter-0.3.3
+++ b/metadata/md5-cache/dev-util/difffilter-0.3.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/liblist-2.3.1 dev-libs/libstrl dev-libs/tre
 SLOT=0
 SRC_URI=ftp://mirror.ohnopub.net/mirror/difffilter/difffilter-0.3.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d3ad2d11cb1de006b048a4d0ea4602e8
diff --git a/metadata/md5-cache/dev-util/febootstrap-2.11 b/metadata/md5-cache/dev-util/febootstrap-2.11
index cc38fe6d9a8a..5898e20fe491 100644
--- a/metadata/md5-cache/dev-util/febootstrap-2.11
+++ b/metadata/md5-cache/dev-util/febootstrap-2.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=sys-apps/fakeroot-1.11 >=sys-apps/fakechroot-2.9 dev-lang/perl >=sys-apps/yum-3.2.21 sys-fs/e2fsprogs sys-libs/e2fsprogs-libs || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-apps/fakeroot-1.11 >=sys-apps/fakechroot-2.9 dev-lang/perl >=sys-apps/yum-3.2.21 sys-fs/e2fsprogs sys-libs/e2fsprogs-libs || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Fedora bootstrap scripts
 EAPI=2
 HOMEPAGE=http://people.redhat.com/~rjones/febootstrap/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/fakeroot-1.11 >=sys-apps/fakechroot-2.9 dev-lang/perl >=sys-apps/yum-3.2.21 sys-fs/e2fsprogs sys-libs/e2fsprogs-libs
 SLOT=0
 SRC_URI=http://people.redhat.com/~rjones/febootstrap/files/febootstrap-2.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=decffad450b7d203cd1f0c4437162a93
diff --git a/metadata/md5-cache/dev-util/ftnchek-3.3.1-r1 b/metadata/md5-cache/dev-util/ftnchek-3.3.1-r1
index 77041491282f..7afd38d6dbbf 100644
--- a/metadata/md5-cache/dev-util/ftnchek-3.3.1-r1
+++ b/metadata/md5-cache/dev-util/ftnchek-3.3.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Static analyzer a la 'lint' for Fortran 77
 EAPI=2
 HOMEPAGE=http://www.dsm.fordham.edu/~ftnchek/
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://www.dsm.fordham.edu/~ftnchek/download/ftnchek-3.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=4287a7311e3e0b5b8d80c29c22abd37d
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.30.3 b/metadata/md5-cache/dev-util/gdbus-codegen-2.30.3
deleted file mode 100644
index 6deac7b26272..000000000000
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.30.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup test
-DEPEND=app-arch/xz-utils || ( =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] )
-DESCRIPTION=GDBus code and documentation generator
-EAPI=4
-HOMEPAGE=http://www.gtk.org/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2+
-PDEPEND=>=dev-libs/glib-2.30.3:2
-RDEPEND=|| ( =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] )
-SLOT=0
-SRC_URI=mirror://gnome/sources/glib/2.30/glib-2.30.3.tar.xz
-_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=13ed8a3e08b8b56c0a2721e823fdcdbc
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.34.2 b/metadata/md5-cache/dev-util/gdbus-codegen-2.36.1
similarity index 96%
rename from metadata/md5-cache/dev-util/gdbus-codegen-2.34.2
rename to metadata/md5-cache/dev-util/gdbus-codegen-2.36.1
index a572652a9eef..10182fb05ef8 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.34.2
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.36.1
@@ -4,11 +4,11 @@ DESCRIPTION=GDBus code and documentation generator
 EAPI=5
 HOMEPAGE=http://www.gtk.org/
 IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=LGPL-2+
-PDEPEND=>=dev-libs/glib-2.34.2:2
+PDEPEND=>=dev-libs/glib-2.36.1:2
 RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5[xml] ) python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) python_targets_python3_1? ( dev-lang/python:3.1[xml] ) python_targets_python3_2? ( dev-lang/python:3.2[xml] ) python_targets_python3_3? ( dev-lang/python:3.3[xml] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_5? ( dev-lang/python:2.5[xml] ) python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) python_targets_python3_1? ( dev-lang/python:3.1[xml] ) python_targets_python3_2? ( dev-lang/python:3.2[xml] ) python_targets_python3_3? ( dev-lang/python:3.3[xml] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 SLOT=0
-SRC_URI=mirror://gnome/sources/glib/2.34/glib-2.34.2.tar.xz
+SRC_URI=mirror://gnome/sources/glib/2.36/glib-2.36.1.tar.xz
 _eclasses_=distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=01cb6ba0771d6eec6c46714e2cb39889
+_md5_=3a01bed13ac1cfa6a59795f6370f6873
diff --git a/metadata/md5-cache/dev-util/geany-plugins-0.21.1 b/metadata/md5-cache/dev-util/geany-plugins-0.21.1
index 56edbdb33173..b3e3fa26fdb0 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-0.21.1
+++ b/metadata/md5-cache/dev-util/geany-plugins-0.21.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-util/geany-0.21 dev-libs/libxml2:2 dev-libs/glib:2 debugger? ( x11-libs/vte:0 ) devhelp? ( dev-util/devhelp net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) 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 )
 SLOT=0
 SRC_URI=http://plugins.geany.org/geany-plugins/geany-plugins-0.21.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ce64f92d98e73000705a5d49457de093
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.22-r1 b/metadata/md5-cache/dev-util/geany-plugins-1.22-r1
index e7979b16af3d..c2ae79063801 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-1.22-r1
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.22-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-util/geany-1.22 dev-libs/libxml2:2 dev-libs/glib:2 debugger? ( x11-libs/vte:0 ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) multiterm? ( || ( dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 )
 SLOT=0
 SRC_URI=http://plugins.geany.org/geany-plugins/geany-plugins-1.22.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c84a037d4b30b434f9df623c86f98c86
diff --git a/metadata/md5-cache/dev-util/gengetopt-2.22.6 b/metadata/md5-cache/dev-util/gengetopt-2.22.6
index 5232e3b2cd98..ef9f9f6fdf82 100644
--- a/metadata/md5-cache/dev-util/gengetopt-2.22.6
+++ b/metadata/md5-cache/dev-util/gengetopt-2.22.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A tool to write command line option parsing code for C programs
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/gengetopt/
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gengetopt/gengetopt-2.22.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=68ee1de4a614605b51324fbf2f422751
diff --git a/metadata/md5-cache/dev-util/ghh-9999 b/metadata/md5-cache/dev-util/ghh-9999
index 12324775bc4a..dae077cb72de 100644
--- a/metadata/md5-cache/dev-util/ghh-9999
+++ b/metadata/md5-cache/dev-util/ghh-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install prepare setup unpack
-DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=a tool to track the history and make backups of your home directory
 EAPI=3
 HOMEPAGE=http://jean-francois.richard.name/ghh/
 LICENSE=GPL-2
 RDEPEND=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* )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=8216bea2d490028824f4807074e49c84
diff --git a/metadata/md5-cache/dev-util/glade-3.12.1 b/metadata/md5-cache/dev-util/glade-3.12.1
index 9ec6c593f987..311302587fca 100644
--- a/metadata/md5-cache/dev-util/glade-3.12.1
+++ b/metadata/md5-cache/dev-util/glade-3.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.4:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.10.1 ) python? ( >=dev-python/pygobject-2.90.4:3 ) app-text/docbook-xml-dtd:4.1.2 >=app-text/gnome-doc-utils-0.18 app-text/scrollkeeper dev-util/gtk-doc-am >=dev-util/intltool-0.41.0 >=sys-devel/gettext-0.17 virtual/pkgconfig dev-libs/gobject-introspection-common gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.4:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.10.1 ) python? ( >=dev-python/pygobject-2.90.4:3 ) app-text/docbook-xml-dtd:4.1.2 >=app-text/gnome-doc-utils-0.18 app-text/scrollkeeper dev-util/gtk-doc-am >=dev-util/intltool-0.41.0 >=sys-devel/gettext-0.17 virtual/pkgconfig dev-libs/gobject-introspection-common gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A user interface designer for GTK+ and GNOME
 EAPI=4
 HOMEPAGE=http://glade.gnome.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.4:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.10.1 ) python? ( >=dev-python/pygobject-2.90.4:3 )
 SLOT=3.10
 SRC_URI=mirror://gnome/sources/glade/3.12/glade-3.12.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=38fe33a36ff50ea4f63e67eac5e99e0f
diff --git a/metadata/md5-cache/dev-util/glade-3.12.2 b/metadata/md5-cache/dev-util/glade-3.12.2
index 2646842a323c..a4956165fbe6 100644
--- a/metadata/md5-cache/dev-util/glade-3.12.2
+++ b/metadata/md5-cache/dev-util/glade-3.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.4:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.10.1 ) python? ( >=dev-python/pygobject-2.90.4:3 ) app-text/docbook-xml-dtd:4.1.2 >=app-text/gnome-doc-utils-0.18 app-text/scrollkeeper >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.41.0 >=sys-devel/gettext-0.17 virtual/pkgconfig dev-libs/gobject-introspection-common gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.4:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.10.1 ) python? ( >=dev-python/pygobject-2.90.4:3 ) app-text/docbook-xml-dtd:4.1.2 >=app-text/gnome-doc-utils-0.18 app-text/scrollkeeper >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.41.0 >=sys-devel/gettext-0.17 virtual/pkgconfig dev-libs/gobject-introspection-common gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A user interface designer for GTK+ and GNOME
 EAPI=4
 HOMEPAGE=http://glade.gnome.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.4:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.10.1 ) python? ( >=dev-python/pygobject-2.90.4:3 )
 SLOT=3.10
 SRC_URI=mirror://gnome/sources/glade/3.12/glade-3.12.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ca7d946cbd9e14589edcda4ac2bcee01
diff --git a/metadata/md5-cache/dev-util/google-perftools-2.0-r2 b/metadata/md5-cache/dev-util/google-perftools-2.0-r2
index 0a8d5b3b5a3a..ccb77b3aa2a9 100644
--- a/metadata/md5-cache/dev-util/google-perftools-2.0-r2
+++ b/metadata/md5-cache/dev-util/google-perftools-2.0-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/libunwind
 SLOT=0/4
 SRC_URI=http://gperftools.googlecode.com/files/gperftools-2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a854abce2999a25a25c796305eb6b0da
diff --git a/metadata/md5-cache/dev-util/indent-2.2.11-r1 b/metadata/md5-cache/dev-util/indent-2.2.11-r1
index 8c8ef93ee0d3..c97db5f5ab6c 100644
--- a/metadata/md5-cache/dev-util/indent-2.2.11-r1
+++ b/metadata/md5-cache/dev-util/indent-2.2.11-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=nls? ( sys-devel/gettext ) app-text/texi2html || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=nls? ( sys-devel/gettext ) app-text/texi2html || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Indent program source files
 EAPI=4
 HOMEPAGE=http://indent.isidore-it.eu/beautify.html
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://indent.isidore-it.eu/indent-2.2.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fb80ca27a6ea3463acdc66448331917b
diff --git a/metadata/md5-cache/dev-util/insight-6.8.1 b/metadata/md5-cache/dev-util/insight-6.8.1
index 64b9a687cc32..b692b64b5476 100644
--- a/metadata/md5-cache/dev-util/insight-6.8.1
+++ b/metadata/md5-cache/dev-util/insight-6.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A graphical interface to the GNU debugger
 EAPI=4
 HOMEPAGE=http://sourceware.org/insight/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-libs/expat dev-tcltk/iwidgets sys-libs/ncurses sys-libs/readline x11-libs/libX11
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=070cdce9e9f6a50f7fa46adeb62c27dc
diff --git a/metadata/md5-cache/dev-util/insight-6.8.1-r1 b/metadata/md5-cache/dev-util/insight-6.8.1-r1
index fb58c72234b5..46c298fd2d19 100644
--- a/metadata/md5-cache/dev-util/insight-6.8.1-r1
+++ b/metadata/md5-cache/dev-util/insight-6.8.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A graphical interface to the GNU debugger
 EAPI=4
 HOMEPAGE=http://sourceware.org/insight/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-libs/expat dev-tcltk/iwidgets sys-libs/ncurses sys-libs/readline x11-libs/libX11
 SLOT=0
 SRC_URI=ftp://sources.redhat.com/pub/insight/releases/insight-6.8-1a.tar.bz2 http://dev.gentoo.org/~xarthisius/distfiles/insight-6.8.1-patchset-02.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6e796867e18685dfafc5f75f0971bc4a
diff --git a/metadata/md5-cache/dev-util/intel2gas-1.3.3-r3 b/metadata/md5-cache/dev-util/intel2gas-1.3.3-r3
index c549e8a4594d..476b885b3cab 100644
--- a/metadata/md5-cache/dev-util/intel2gas-1.3.3-r3
+++ b/metadata/md5-cache/dev-util/intel2gas-1.3.3-r3
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Converts assembler source from Intel (NASM), to AT&T (gas)
 HOMEPAGE=http://www.niksula.cs.hut.fi/~mtiihone/intel2gas/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.niksula.cs.hut.fi/~mtiihone/intel2gas/intel2gas-1.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=036aca191979da60e082cd0e9ab5bd7e
diff --git a/metadata/md5-cache/dev-util/kbuild-0.1.9998_pre20120806 b/metadata/md5-cache/dev-util/kbuild-0.1.9998_pre20120806
index 87f7b22328e8..bf148f3ad2dd 100644
--- a/metadata/md5-cache/dev-util/kbuild-0.1.9998_pre20120806
+++ b/metadata/md5-cache/dev-util/kbuild-0.1.9998_pre20120806
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=sys-devel/flex sys-devel/gettext virtual/yacc || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-devel/flex sys-devel/gettext virtual/yacc || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A makefile framework for writing simple makefiles for complex tasks
 EAPI=4
 HOMEPAGE=http://svn.netlabs.org/kbuild/wiki
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~polynomial-c/kBuild-0.1.9998-pre20120806-src.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2804a7b601787fba24b00abb8d48fd56
diff --git a/metadata/md5-cache/dev-util/kbuild-9999 b/metadata/md5-cache/dev-util/kbuild-9999
index 30d832ab88c8..7bf47e97897c 100644
--- a/metadata/md5-cache/dev-util/kbuild-9999
+++ b/metadata/md5-cache/dev-util/kbuild-9999
@@ -5,5 +5,5 @@ EAPI=2
 HOMEPAGE=http://svn.netlabs.org/kbuild/wiki
 LICENSE=GPL-3
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=64c49d1f284de85e4bdb0b46b4d98020
diff --git a/metadata/md5-cache/dev-util/ltrace-0.5.3.1 b/metadata/md5-cache/dev-util/ltrace-0.5.3.1
index e6a63501fcd9..cbbca1610d38 100644
--- a/metadata/md5-cache/dev-util/ltrace-0.5.3.1
+++ b/metadata/md5-cache/dev-util/ltrace-0.5.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=dev-libs/elfutils test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/elfutils test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=trace library calls made at runtime
 HOMEPAGE=http://ltrace.alioth.debian.org/
 IUSE=test
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/elfutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/l/ltrace/ltrace_0.5.orig.tar.gz mirror://debian/pool/main/l/ltrace/ltrace_0.5-3.1.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8d2fedf0281fe5f6486993932b878c1f
diff --git a/metadata/md5-cache/dev-util/ltrace-0.7.2 b/metadata/md5-cache/dev-util/ltrace-0.7.2
index fdbd6e6bee9b..8194cd264383 100644
--- a/metadata/md5-cache/dev-util/ltrace-0.7.2
+++ b/metadata/md5-cache/dev-util/ltrace-0.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/elfutils selinux? ( sys-libs/libselinux ) unwind? ( sys-libs/libunwind ) test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/elfutils selinux? ( sys-libs/libselinux ) unwind? ( sys-libs/libunwind ) test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=trace library calls made at runtime
 EAPI=5
 HOMEPAGE=http://ltrace.alioth.debian.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/elfutils selinux? ( sys-libs/libselinux ) unwind? ( sys-libs/libunwind )
 SLOT=0
 SRC_URI=https://alioth.debian.org/frs/download.php/3848/ltrace-0.7.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dacc2f663aa143031adf82a02edc7b59
diff --git a/metadata/md5-cache/dev-util/mingw-runtime-3.20 b/metadata/md5-cache/dev-util/mingw-runtime-3.20
index a193e34c4bbe..e27733cc3864 100644
--- a/metadata/md5-cache/dev-util/mingw-runtime-3.20
+++ b/metadata/md5-cache/dev-util/mingw-runtime-3.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free Win32 runtime and import library definitions
 EAPI=4
 HOMEPAGE=http://www.mingw.org/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/mingw/mingwrt-3.20-mingw32-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=475c71deb1bbe1fb328eea88813448ea
diff --git a/metadata/md5-cache/dev-util/mingw-runtime-3.20.2 b/metadata/md5-cache/dev-util/mingw-runtime-3.20.2
index 728979679b30..e919eaddeecb 100644
--- a/metadata/md5-cache/dev-util/mingw-runtime-3.20.2
+++ b/metadata/md5-cache/dev-util/mingw-runtime-3.20.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=app-arch/xz-utils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/xz-utils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free Win32 runtime and import library definitions
 EAPI=4
 HOMEPAGE=http://www.mingw.org/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/mingw/mingwrt-3.20-2-mingw32-src.tar.lzma
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a72e1726bb022b85e6ba7160b421eb2f
diff --git a/metadata/md5-cache/dev-util/mono-debugger-2.10 b/metadata/md5-cache/dev-util/mono-debugger-2.10
index 17f21216899b..935c6c2156e9 100644
--- a/metadata/md5-cache/dev-util/mono-debugger-2.10
+++ b/metadata/md5-cache/dev-util/mono-debugger-2.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!!=dev-lang/mono-2.2 sys-devel/binutils dev-libs/glib:2 !dev-lang/mercury =dev-lang/mono-2.10* virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!!=dev-lang/mono-2.2 sys-devel/binutils dev-libs/glib:2 !dev-lang/mercury =dev-lang/mono-2.10* virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Debugger for .NET managed and unmanaged applications
 EAPI=4
 HOMEPAGE=http://www.mono-project.com/
@@ -9,5 +9,5 @@ RDEPEND=!!=dev-lang/mono-2.2 sys-devel/binutils dev-libs/glib:2 =dev-lang/mono-2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/mono-debugger/mono-debugger-2.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	go-mono	062f25a198b23a53e074c32c867cc97e	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	go-mono	062f25a198b23a53e074c32c867cc97e	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=73f4fa41818326fed410a7497731b670
diff --git a/metadata/md5-cache/dev-util/mono-tools-2.10 b/metadata/md5-cache/dev-util/mono-tools-2.10
index 5aac30c7e1d1..9cff67b15c36 100644
--- a/metadata/md5-cache/dev-util/mono-tools-2.10
+++ b/metadata/md5-cache/dev-util/mono-tools-2.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND==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 virtual/pkgconfig =dev-lang/mono-2.10* virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==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 virtual/pkgconfig =dev-lang/mono-2.10* virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Set of useful Mono related utilities
 EAPI=4
 HOMEPAGE=http://www.mono-project.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 MIT
 RDEPEND==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*
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/mono-tools/mono-tools-2.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	go-mono	062f25a198b23a53e074c32c867cc97e	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	go-mono	062f25a198b23a53e074c32c867cc97e	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=28666f8d9d7ce06a453bbf928b3a67c2
diff --git a/metadata/md5-cache/dev-util/monodoc-2.0 b/metadata/md5-cache/dev-util/monodoc-2.0
index 3cdc09cd8ac7..364714d721ca 100644
--- a/metadata/md5-cache/dev-util/monodoc-2.0
+++ b/metadata/md5-cache/dev-util/monodoc-2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=>=dev-lang/mono-2.0 www-client/lynx !>=dev-lang/mono-2.2 app-arch/unzip || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-lang/mono-2.0 www-client/lynx !>=dev-lang/mono-2.2 app-arch/unzip || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Documentation for mono's .Net class library
 HOMEPAGE=http://www.go-mono.com
 IUSE=X
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/mono-2.0 www-client/lynx !>=dev-lang/mono-2.2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.novell.com/pub/mono/sources/monodoc/monodoc-2.0.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=0e42dbad7c2eef8643d0101f711bfa1b
diff --git a/metadata/md5-cache/dev-util/open-vcdiff-0.8.3 b/metadata/md5-cache/dev-util/open-vcdiff-0.8.3
index 4fc27a9f2e7f..c2d615991f79 100644
--- a/metadata/md5-cache/dev-util/open-vcdiff-0.8.3
+++ b/metadata/md5-cache/dev-util/open-vcdiff-0.8.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/gflags sys-libs/zlib test? ( dev-cpp/gtest ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-cpp/gflags sys-libs/zlib test? ( dev-cpp/gtest ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An encoder/decoder for the VCDIFF (RFC3284) format
 EAPI=5
 HOMEPAGE=http://code.google.com/p/open-vcdiff/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-cpp/gflags sys-libs/zlib
 SLOT=0/0
 SRC_URI=http://open-vcdiff.googlecode.com/files/open-vcdiff-0.8.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9c97040335e7c53846427ddc2d6ef920
diff --git a/metadata/md5-cache/dev-util/patchelf-0.6-r1 b/metadata/md5-cache/dev-util/patchelf-0.6-r1
index 0ade84cee90b..5b4005fe1e6e 100644
--- a/metadata/md5-cache/dev-util/patchelf-0.6-r1
+++ b/metadata/md5-cache/dev-util/patchelf-0.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Small utility to modify the dynamic linker and RPATH of ELF executables.
 EAPI=5
 HOMEPAGE=http://nixos.org/patchelf.html
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://hydra.nixos.org/build/1524660/download/2/patchelf-0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a159f6711dcccbabcefd6def740912d1
diff --git a/metadata/md5-cache/dev-util/pkgconf-0.8.9 b/metadata/md5-cache/dev-util/pkgconf-0.8.9
index 605768e5a58a..77ec370c69b9 100644
--- a/metadata/md5-cache/dev-util/pkgconf-0.8.9
+++ b/metadata/md5-cache/dev-util/pkgconf-0.8.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=pkg-config compatible replacement with no dependencies other than ANSI C89
 EAPI=4
 HOMEPAGE=https://github.com/pkgconf/pkgconf
@@ -9,5 +9,5 @@ LICENSE=BSD-1
 RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
 SLOT=0
 SRC_URI=https://github.com/pkgconf/pkgconf/tarball/pkgconf-0.8.9 -> pkgconf-0.8.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
 _md5_=69c817e13e3266508d3e382a943bb72d
diff --git a/metadata/md5-cache/dev-util/pkgconf-9999 b/metadata/md5-cache/dev-util/pkgconf-9999
index 1b89622b59a5..05334e6870dd 100644
--- a/metadata/md5-cache/dev-util/pkgconf-9999
+++ b/metadata/md5-cache/dev-util/pkgconf-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=pkg-config compatible replacement with no dependencies other than ANSI C89
 EAPI=4
 HOMEPAGE=https://github.com/pkgconf/pkgconf
@@ -7,5 +7,5 @@ IUSE=+pkg-config strict
 LICENSE=BSD-1
 RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=9e208c0a14379a3ea58966f09b3dba0a
diff --git a/metadata/md5-cache/dev-util/pkgconfig-9999 b/metadata/md5-cache/dev-util/pkgconfig-9999
index 231c7d252545..781060ef88ad 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-9999
+++ b/metadata/md5-cache/dev-util/pkgconfig-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=!internal-glib? ( >=dev-libs/glib-2.30 ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=!internal-glib? ( >=dev-libs/glib-2.30 ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Package config system that manages compile/link flags
 EAPI=5
 HOMEPAGE=http://pkgconfig.freedesktop.org/wiki/
@@ -7,5 +7,5 @@ IUSE=elibc_FreeBSD hardened internal-glib
 LICENSE=GPL-2
 RDEPEND=!internal-glib? ( >=dev-libs/glib-2.30 ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config]
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ccd5abe8f0f64c3285c4c61be31a802f
diff --git a/metadata/md5-cache/dev-util/ragel-6.7-r1 b/metadata/md5-cache/dev-util/ragel-6.7-r1
index 490f5f82980b..6068436cad7c 100644
--- a/metadata/md5-cache/dev-util/ragel-6.7-r1
+++ b/metadata/md5-cache/dev-util/ragel-6.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Compiles finite state machines from regular languages into executable code.
 EAPI=4
 HOMEPAGE=http://www.complang.org/ragel/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.complang.org/ragel/ragel-6.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=46547717decfe100f67a85f72d0c7036
diff --git a/metadata/md5-cache/dev-util/ragel-6.8 b/metadata/md5-cache/dev-util/ragel-6.8
index 4e217d9e8b11..2aaf3faf0fca 100644
--- a/metadata/md5-cache/dev-util/ragel-6.8
+++ b/metadata/md5-cache/dev-util/ragel-6.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Compiles finite state machines from regular languages into executable code.
 EAPI=5
 HOMEPAGE=http://www.complang.org/ragel/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.complang.org/ragel/ragel-6.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f13b20eaa1f3898cd99807aa1e0dcf4d
diff --git a/metadata/md5-cache/dev-util/regexxer-0.10 b/metadata/md5-cache/dev-util/regexxer-0.10
index e0744ffa4a1d..57d09dbef44f 100644
--- a/metadata/md5-cache/dev-util/regexxer-0.10
+++ b/metadata/md5-cache/dev-util/regexxer-0.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-cpp/glibmm-2.28 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 dev-util/intltool virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-cpp/glibmm-2.28 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 dev-util/intltool virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=An interactive tool for performing search and replace operations
 EAPI=4
 HOMEPAGE=http://regexxer.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-cpp/glibmm-2.28 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0
 SLOT=0
 SRC_URI=mirror://sourceforge/regexxer/regexxer-0.10.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=efdd990230eb1589177fba509a1f9d8c
diff --git a/metadata/md5-cache/dev-util/reswrap-3.2.0 b/metadata/md5-cache/dev-util/reswrap-3.2.0
index 52538828e9c1..f705c49b4600 100644
--- a/metadata/md5-cache/dev-util/reswrap-3.2.0
+++ b/metadata/md5-cache/dev-util/reswrap-3.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Utility to wrap icon resources into C++ code, from the FOX Toolkit
 HOMEPAGE=http://www.fox-toolkit.org/
 IUSE=debug doc profile
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.4.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ee31a478d56fee16b73c7d4e6048d4c4
diff --git a/metadata/md5-cache/dev-util/reswrap-4.0.0 b/metadata/md5-cache/dev-util/reswrap-4.0.0
index 8a9a2b0de5da..953f26b4fafc 100644
--- a/metadata/md5-cache/dev-util/reswrap-4.0.0
+++ b/metadata/md5-cache/dev-util/reswrap-4.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Utility to wrap icon resources into C++ code, from the FOX Toolkit
 HOMEPAGE=http://www.fox-toolkit.org/
 IUSE=debug doc profile
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.6.40.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fce0fb26a7246a9336ec7617f15eaa4f
diff --git a/metadata/md5-cache/dev-util/scanmem-0.07 b/metadata/md5-cache/dev-util/scanmem-0.07
index b75f510475c8..741196cc3b45 100644
--- a/metadata/md5-cache/dev-util/scanmem-0.07
+++ b/metadata/md5-cache/dev-util/scanmem-0.07
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=sys-libs/readline || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/readline || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Locate and modify variables in executing processes
 EAPI=4
 HOMEPAGE=http://taviso.decsystem.org/scanmem.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/readline
 SLOT=0
 SRC_URI=http://taviso.decsystem.org/files/scanmem/scanmem-0.07.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=5d528c5f69f7cd6eb8bae016f360e917
diff --git a/metadata/md5-cache/dev-util/scanmem-0.13 b/metadata/md5-cache/dev-util/scanmem-0.13
index 4f133db92c9d..f7067e1d7cb1 100644
--- a/metadata/md5-cache/dev-util/scanmem-0.13
+++ b/metadata/md5-cache/dev-util/scanmem-0.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=sys-libs/readline || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool gui? ( =dev-lang/python-2* )
+DEPEND=sys-libs/readline || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool gui? ( =dev-lang/python-2* )
 DESCRIPTION=Locate and modify variables in executing processes
 EAPI=4
 HOMEPAGE=http://code.google.com/p/scanmem/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/readline gui? ( dev-python/pygtk:2 kde? ( kde-base/kdesu ) !kde? ( x11-libs/gksu ) ) gui? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://scanmem.googlecode.com/files/scanmem-0.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=20d886d26cc38120267327bbb6598d3b
diff --git a/metadata/md5-cache/dev-util/schroot-1.4.23 b/metadata/md5-cache/dev-util/schroot-1.4.23
index 03bb0df02adf..b38d94c1e87e 100644
--- a/metadata/md5-cache/dev-util/schroot-1.4.23
+++ b/metadata/md5-cache/dev-util/schroot-1.4.23
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utility to execute commands in a chroot environment
 EAPI=4
 HOMEPAGE=http://packages.debian.org/source/sid/schroot
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.4.23.orig.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9077010a8b85bc5182da4a8f55dbd2f4
diff --git a/metadata/md5-cache/dev-util/schroot-1.4.23-r1 b/metadata/md5-cache/dev-util/schroot-1.4.23-r1
index 290bc6e11544..310b54a747ff 100644
--- a/metadata/md5-cache/dev-util/schroot-1.4.23-r1
+++ b/metadata/md5-cache/dev-util/schroot-1.4.23-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utility to execute commands in a chroot environment
 EAPI=4
 HOMEPAGE=http://packages.debian.org/source/sid/schroot
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.4.23.orig.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f8214aedf95f279ae740287974c4f7ba
diff --git a/metadata/md5-cache/dev-util/schroot-1.4.25 b/metadata/md5-cache/dev-util/schroot-1.4.25
index 17ef9a6a8ae5..0a19a426a976 100644
--- a/metadata/md5-cache/dev-util/schroot-1.4.25
+++ b/metadata/md5-cache/dev-util/schroot-1.4.25
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utility to execute commands in a chroot environment
 EAPI=4
 HOMEPAGE=http://packages.debian.org/source/sid/schroot
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.4.25.orig.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1f7a7f978475f1dd5d50304886dd84bb
diff --git a/metadata/md5-cache/dev-util/schroot-1.4.26 b/metadata/md5-cache/dev-util/schroot-1.4.26
index 652027de87b6..d6b3aef649f2 100644
--- a/metadata/md5-cache/dev-util/schroot-1.4.26
+++ b/metadata/md5-cache/dev-util/schroot-1.4.26
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=>=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 ) app-arch/xz-utils 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) app-arch/xz-utils 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utility to execute commands in a chroot environment
 EAPI=4
 HOMEPAGE=http://packages.debian.org/source/sid/schroot
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.4.26.orig.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e39e7cd80292feb212cd1eb9e4d24f96
diff --git a/metadata/md5-cache/dev-util/schroot-1.6.3 b/metadata/md5-cache/dev-util/schroot-1.6.3
index ff7afa9e642c..af66aa7135a6 100644
--- a/metadata/md5-cache/dev-util/schroot-1.6.3
+++ b/metadata/md5-cache/dev-util/schroot-1.6.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=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 ) app-arch/xz-utils sys-apps/groff doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( >=app-text/po4a-0.40 sys-devel/gettext ) test? ( >=dev-util/cppunit-1.10.0 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) app-arch/xz-utils sys-apps/groff doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( >=app-text/po4a-0.40 sys-devel/gettext ) test? ( >=dev-util/cppunit-1.10.0 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utility to execute commands in a chroot environment
 EAPI=4
 HOMEPAGE=http://packages.debian.org/source/sid/schroot
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.6.3.orig.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a2f6625c88a29f82cb0212fb47b3d993
diff --git a/metadata/md5-cache/dev-util/schroot-1.6.5 b/metadata/md5-cache/dev-util/schroot-1.6.5
index 9e7b174e5301..b65678974cbd 100644
--- a/metadata/md5-cache/dev-util/schroot-1.6.5
+++ b/metadata/md5-cache/dev-util/schroot-1.6.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=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 ) app-arch/xz-utils sys-apps/groff doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( >=app-text/po4a-0.40 sys-devel/gettext ) test? ( >=dev-util/cppunit-1.10.0 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) app-arch/xz-utils sys-apps/groff doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( >=app-text/po4a-0.40 sys-devel/gettext ) test? ( >=dev-util/cppunit-1.10.0 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utility to execute commands in a chroot environment
 EAPI=4
 HOMEPAGE=http://packages.debian.org/source/sid/schroot
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.6.5.orig.tar.xz mirror://debian/pool/main/s/schroot/schroot_1.6.5-1.debian.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f9839478d54076927ec7e2589420bd2e
diff --git a/metadata/md5-cache/dev-util/strace-4.6 b/metadata/md5-cache/dev-util/strace-4.6
index ab71e201a8ee..0d8e0e5fad2a 100644
--- a/metadata/md5-cache/dev-util/strace-4.6
+++ b/metadata/md5-cache/dev-util/strace-4.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A useful diagnostic, instructional, and debugging tool
 EAPI=3
 HOMEPAGE=http://sourceforge.net/projects/strace/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linu
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/strace/strace-4.6.tar.xz mirror://gentoo/strace-4.6-x32.patch.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a14b1243fa958997a4eb093b464ff40
diff --git a/metadata/md5-cache/dev-util/strace-9999 b/metadata/md5-cache/dev-util/strace-9999
index c64a6b877c2e..bbd5c45abb71 100644
--- a/metadata/md5-cache/dev-util/strace-9999
+++ b/metadata/md5-cache/dev-util/strace-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install prepare unpack
-DEPEND=aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A useful diagnostic, instructional, and debugging tool
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/strace/
 IUSE=static aio
 LICENSE=BSD
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b89e7bc78d813dc2f9bdb0d3b0f92046
diff --git a/metadata/md5-cache/dev-util/systemtap-1.7 b/metadata/md5-cache/dev-util/systemtap-1.7
index 066fef76ba52..79d67a6b1e7d 100644
--- a/metadata/md5-cache/dev-util/systemtap-1.7
+++ b/metadata/md5-cache/dev-util/systemtap-1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare setup
-DEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap sqlite? ( dev-db/sqlite:3 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap sqlite? ( dev-db/sqlite:3 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=A linux trace/probe tool
 EAPI=4
 HOMEPAGE=http://sourceware.org/systemtap/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap sqlite? ( dev-db/sqlite:3 ) virtual/linux-sources =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://sources.redhat.com/systemtap/ftp/releases/systemtap-1.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d1a436ed21f1983c3c87d4a2ba90f373
diff --git a/metadata/md5-cache/dev-util/systemtap-2.0 b/metadata/md5-cache/dev-util/systemtap-2.0
index 1bc8fd3e718d..61278709ce8d 100644
--- a/metadata/md5-cache/dev-util/systemtap-2.0
+++ b/metadata/md5-cache/dev-util/systemtap-2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare setup
-DEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap sqlite? ( dev-db/sqlite:3 ) >=sys-devel/gettext-0.18 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap sqlite? ( dev-db/sqlite:3 ) >=sys-devel/gettext-0.18 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=A linux trace/probe tool
 EAPI=4
 HOMEPAGE=http://sourceware.org/systemtap/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap sqlite? ( dev-db/sqlite:3 ) virtual/linux-sources =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://sources.redhat.com/systemtap/ftp/releases/systemtap-2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=249c4d5196782aee21e73864cb8764de
diff --git a/metadata/md5-cache/dev-util/systemtap-2.1 b/metadata/md5-cache/dev-util/systemtap-2.1
index ed1dd30b6b8d..21ef0e081f74 100644
--- a/metadata/md5-cache/dev-util/systemtap-2.1
+++ b/metadata/md5-cache/dev-util/systemtap-2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare setup
-DEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap sqlite? ( dev-db/sqlite:3 ) >=sys-devel/gettext-0.18 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap sqlite? ( dev-db/sqlite:3 ) >=sys-devel/gettext-0.18 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=A linux trace/probe tool
 EAPI=4
 HOMEPAGE=http://sourceware.org/systemtap/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap sqlite? ( dev-db/sqlite:3 ) virtual/linux-sources =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://sources.redhat.com/systemtap/ftp/releases/systemtap-2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c7abe6c84d27917064ef2cfc19f5c1ad
diff --git a/metadata/md5-cache/dev-util/umockdev-0.2.1 b/metadata/md5-cache/dev-util/umockdev-0.2.1
index 6ef2be3a2ef6..f132568f1153 100644
--- a/metadata/md5-cache/dev-util/umockdev-0.2.1
+++ b/metadata/md5-cache/dev-util/umockdev-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/udev[gudev] >=dev-libs/glib-2.32:2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/umockdev/trunk/0.2.1/+download/umockdev-0.2.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1392501b38617681d5b67aab06f9c8b5
diff --git a/metadata/md5-cache/dev-util/valgrind-3.5.0 b/metadata/md5-cache/dev-util/valgrind-3.5.0
index 4cd45dc9fe47..3fcad9f6da31 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.5.0
+++ b/metadata/md5-cache/dev-util/valgrind-3.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An open-source memory debugger for GNU/Linux
 HOMEPAGE=http://www.valgrind.org
 IUSE=mpi
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5ef0934170cb0f743276eb4e6481d7b0
diff --git a/metadata/md5-cache/dev-util/valgrind-3.6.1 b/metadata/md5-cache/dev-util/valgrind-3.6.1
index b24b607fcb49..65d8e03d21d6 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.6.1
+++ b/metadata/md5-cache/dev-util/valgrind-3.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An open-source memory debugger for GNU/Linux
 EAPI=2
 HOMEPAGE=http://www.valgrind.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.6.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3ddb263dda992cde54ae58d3a527107b
diff --git a/metadata/md5-cache/dev-util/valgrind-3.6.1-r1 b/metadata/md5-cache/dev-util/valgrind-3.6.1-r1
index e57dd5ce2d55..fc1b4b9f7620 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.6.1-r1
+++ b/metadata/md5-cache/dev-util/valgrind-3.6.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An open-source memory debugger for GNU/Linux
 EAPI=2
 HOMEPAGE=http://www.valgrind.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.6.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=146bcb073cf691ff2562362484b18547
diff --git a/metadata/md5-cache/dev-util/valgrind-3.6.1-r3 b/metadata/md5-cache/dev-util/valgrind-3.6.1-r3
index 76d533b40cb9..bceb4c091100 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.6.1-r3
+++ b/metadata/md5-cache/dev-util/valgrind-3.6.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An open-source memory debugger for GNU/Linux
 EAPI=2
 HOMEPAGE=http://www.valgrind.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.6.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0d72df90ccbe91abcff44936c230e04b
diff --git a/metadata/md5-cache/dev-util/valgrind-3.6.1-r4 b/metadata/md5-cache/dev-util/valgrind-3.6.1-r4
index d6fbf8e8a30c..3afab7e6d985 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.6.1-r4
+++ b/metadata/md5-cache/dev-util/valgrind-3.6.1-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An open-source memory debugger for GNU/Linux
 EAPI=2
 HOMEPAGE=http://www.valgrind.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.6.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e6758cd46b2daf74d4df4a1244bdcc34
diff --git a/metadata/md5-cache/dev-util/valgrind-3.7.0-r4 b/metadata/md5-cache/dev-util/valgrind-3.7.0-r4
index bde5c9875f37..60e3d40c8b7b 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.7.0-r4
+++ b/metadata/md5-cache/dev-util/valgrind-3.7.0-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An open-source memory debugger for GNU/Linux
 EAPI=4
 HOMEPAGE=http://www.valgrind.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.7.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5246a10b114061301783edacbc7a9151
diff --git a/metadata/md5-cache/dev-util/valgrind-3.8.0 b/metadata/md5-cache/dev-util/valgrind-3.8.0
index 1e84fbb55375..457aca364499 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.8.0
+++ b/metadata/md5-cache/dev-util/valgrind-3.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An open-source memory debugger for GNU/Linux
 EAPI=4
 HOMEPAGE=http://www.valgrind.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.8.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=97e156b075c1ee37591eaafdc1d1fb31
diff --git a/metadata/md5-cache/dev-util/valgrind-3.8.1 b/metadata/md5-cache/dev-util/valgrind-3.8.1
index fd6aa4128367..5e26a49c312a 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.8.1
+++ b/metadata/md5-cache/dev-util/valgrind-3.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An open-source memory debugger for GNU/Linux
 EAPI=4
 HOMEPAGE=http://www.valgrind.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.8.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=146d3b2bca00b4da681295fe64b8670d
diff --git a/metadata/md5-cache/dev-util/vdkbuilder-2.5.0 b/metadata/md5-cache/dev-util/vdkbuilder-2.5.0
index cff5e1b61cbf..548718e3f00a 100644
--- a/metadata/md5-cache/dev-util/vdkbuilder-2.5.0
+++ b/metadata/md5-cache/dev-util/vdkbuilder-2.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/vdk-2.5.0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/vdk-2.5.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Visual Development Kit used for VDK Builder.
 EAPI=5
 HOMEPAGE=http://vdkbuilder.sf.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/vdk-2.5.0
 SLOT=0
 SRC_URI=mirror://sourceforge/vdkbuilder/vdkbuilder2-2.5.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=51126285adad73ac5a08bb8c0927a207
diff --git a/metadata/md5-cache/dev-util/visualvm-1.3.3-r1 b/metadata/md5-cache/dev-util/visualvm-1.3.3-r1
index b8f799d48362..20b54b744363 100644
--- a/metadata/md5-cache/dev-util/visualvm-1.3.3-r1
+++ b/metadata/md5-cache/dev-util/visualvm-1.3.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-java/icedtea:6 dev-util/netbeans:7.0 dev-java/ant-core dev-java/ant-nodeps || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-java/icedtea:6 dev-util/netbeans:7.0 dev-java/ant-core dev-java/ant-nodeps || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Integrates commandline JDK tools and profiling capabilites.
 EAPI=4
 HOMEPAGE=http://icedtea.classpath.org
@@ -8,5 +8,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=dev-java/icedtea:6 dev-util/netbeans:7.0
 SLOT=6
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5912523891250cb2bc03c3c8b7c0700e
diff --git a/metadata/md5-cache/dev-util/visualvm-1.3.3-r2 b/metadata/md5-cache/dev-util/visualvm-1.3.3-r2
index c972849c4b44..ced6cab77343 100644
--- a/metadata/md5-cache/dev-util/visualvm-1.3.3-r2
+++ b/metadata/md5-cache/dev-util/visualvm-1.3.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-java/icedtea:6 dev-java/netbeans-harness:7.1 dev-java/netbeans-platform:7.1 dev-java/ant-core dev-java/ant-nodeps || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-java/icedtea:6 dev-java/netbeans-harness:7.1 dev-java/netbeans-platform:7.1 dev-java/ant-core dev-java/ant-nodeps || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Integrates commandline JDK tools and profiling capabilites.
 EAPI=4
 HOMEPAGE=http://icedtea.classpath.org
@@ -8,5 +8,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=dev-java/icedtea:6 dev-java/netbeans-harness:7.1 dev-java/netbeans-platform:7.1
 SLOT=6
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1d865c4e7580c90473b945f556127244
diff --git a/metadata/md5-cache/dev-util/visualvm-1.3.3-r8 b/metadata/md5-cache/dev-util/visualvm-1.3.3-r8
index 3587f89a5244..0b30a355a218 100644
--- a/metadata/md5-cache/dev-util/visualvm-1.3.3-r8
+++ b/metadata/md5-cache/dev-util/visualvm-1.3.3-r8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-java/icedtea:7 dev-util/netbeans:7.0 dev-java/ant-core dev-java/ant-nodeps || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-java/icedtea:7 dev-util/netbeans:7.0 dev-java/ant-core dev-java/ant-nodeps || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Integrates commandline JDK tools and profiling capabilites.
 EAPI=4
 HOMEPAGE=http://icedtea.classpath.org
@@ -8,5 +8,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=dev-java/icedtea:7 dev-util/netbeans:7.0
 SLOT=7
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=07c9bbfddf28481ec9def0222198081b
diff --git a/metadata/md5-cache/dev-util/visualvm-1.3.3-r9 b/metadata/md5-cache/dev-util/visualvm-1.3.3-r9
index aeed0dc6863d..28765fea16aa 100644
--- a/metadata/md5-cache/dev-util/visualvm-1.3.3-r9
+++ b/metadata/md5-cache/dev-util/visualvm-1.3.3-r9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-java/icedtea:7 dev-java/netbeans-harness:7.1 dev-java/netbeans-platform:7.1 dev-java/ant-core dev-java/ant-nodeps || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-java/icedtea:7 dev-java/netbeans-harness:7.1 dev-java/netbeans-platform:7.1 dev-java/ant-core dev-java/ant-nodeps || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Integrates commandline JDK tools and profiling capabilites.
 EAPI=4
 HOMEPAGE=http://icedtea.classpath.org
@@ -8,5 +8,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=dev-java/icedtea:7 dev-java/netbeans-harness:7.1 dev-java/netbeans-platform:7.1
 SLOT=7
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6f686c22726ecbcf4a95756427d1260f
diff --git a/metadata/md5-cache/dev-util/xdelta-1.1.4-r1 b/metadata/md5-cache/dev-util/xdelta-1.1.4-r1
index bbe4af32b4e5..0825a87cdfed 100644
--- a/metadata/md5-cache/dev-util/xdelta-1.1.4-r1
+++ b/metadata/md5-cache/dev-util/xdelta-1.1.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-libs/glib-2 >=sys-libs/zlib-1.1.4 virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2 >=sys-libs/zlib-1.1.4 virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Computes changes between binary or text files and creates deltas
 HOMEPAGE=http://xdelta.googlecode.com/
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 >=sys-libs/zlib-1.1.4
 SLOT=0
 SRC_URI=http://xdelta.googlecode.com/files/xdelta-1.1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cef1631d138eb94400ebdee3e4329e41
diff --git a/metadata/md5-cache/dev-util/xdelta-3.0.5 b/metadata/md5-cache/dev-util/xdelta-3.0.5
index 5b356fda18dc..7fc8eb7ac298 100644
--- a/metadata/md5-cache/dev-util/xdelta-3.0.5
+++ b/metadata/md5-cache/dev-util/xdelta-3.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare setup test
-DEPEND=app-arch/xz-utils test? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/xz-utils test? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a binary diff and differential compression tools. VCDIFF (RFC 3284) delta compression.
 EAPI=5
 HOMEPAGE=http://xdelta.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/xz-utils
 SLOT=3
 SRC_URI=http://xdelta.googlecode.com/files/xdelta3-3.0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=d00695404dc28d5717fa22218c5353b5
diff --git a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.10.0 b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.10.0
index 59ba90ad6ccc..06da34ccfee8 100644
--- a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.10.0
+++ b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.10.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfce4-dev-tools/4.10/xfce4-dev-tools-4.10.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=723880845756cb2f85a5c05316647d30
diff --git a/metadata/md5-cache/dev-vcs/giggle-0.6.1 b/metadata/md5-cache/dev-vcs/giggle-0.6.1
index 406f0f873480..cb7212b4f0da 100644
--- a/metadata/md5-cache/dev-vcs/giggle-0.6.1
+++ b/metadata/md5-cache/dev-vcs/giggle-0.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-vcs/git-1.5 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-3.0:3.0 gnome-base/gnome-common eds? ( <gnome-extra/evolution-data-server-3.6 ) >=x11-libs/vte-0.26:2.90 sys-devel/gettext app-text/yelp-tools virtual/pkgconfig >=dev-util/intltool-0.35 >=sys-devel/autoconf-2.64 >=sys-devel/libtool-2 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-vcs/git-1.5 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-3.0:3.0 gnome-base/gnome-common eds? ( <gnome-extra/evolution-data-server-3.6 ) >=x11-libs/vte-0.26:2.90 sys-devel/gettext app-text/yelp-tools virtual/pkgconfig >=dev-util/intltool-0.35 >=sys-devel/autoconf-2.64 >=sys-devel/libtool-2 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK+ Frontend for GIT
 EAPI=3
 HOMEPAGE=http://live.gnome.org/giggle
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-vcs/git-1.5 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-3.0:3.0 gnome-base/gnome-common eds? ( <gnome-extra/evolution-data-server-3.6 ) >=x11-libs/vte-0.26:2.90
 SLOT=0
 SRC_URI=mirror://gnome/sources/giggle/0.6/giggle-0.6.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e8816b57f622f093da637a0f82634d73
diff --git a/metadata/md5-cache/dev-vcs/rapidsvn-0.12.0 b/metadata/md5-cache/dev-vcs/rapidsvn-0.12.0
index 9b7584f8be44..b031fdb7fcf2 100644
--- a/metadata/md5-cache/dev-vcs/rapidsvn-0.12.0
+++ b/metadata/md5-cache/dev-vcs/rapidsvn-0.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=Cross-platform GUI front-end for the Subversion revision system
 EAPI=4
 HOMEPAGE=http://rapidsvn.tigris.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 FDL-1.2
 RDEPEND=dev-libs/apr dev-libs/apr-util <dev-vcs/subversion-1.7 x11-libs/wxGTK:2.8[X] =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://www.rapidsvn.org/download/release/0.12/rapidsvn-0.12.0-1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=193bf3c499d93ce89c7654fff426c6ab
diff --git a/metadata/md5-cache/dev-vcs/rapidsvn-0.12.1 b/metadata/md5-cache/dev-vcs/rapidsvn-0.12.1
index 011afe089825..c1c15bebc343 100644
--- a/metadata/md5-cache/dev-vcs/rapidsvn-0.12.1
+++ b/metadata/md5-cache/dev-vcs/rapidsvn-0.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/apr dev-libs/apr-util dev-vcs/subversion 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=dev-libs/apr dev-libs/apr-util dev-vcs/subversion 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=Cross-platform GUI front-end for the Subversion revision system
 EAPI=4
 HOMEPAGE=http://rapidsvn.tigris.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 FDL-1.2
 RDEPEND=dev-libs/apr dev-libs/apr-util dev-vcs/subversion x11-libs/wxGTK:2.8[X] =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://www.rapidsvn.org/download/release/0.12.1/rapidsvn-0.12.1.tar.gz doc? ( http://dev.gentoo.org/~jlec/distfiles/svncpp.dox.xz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=c0d04ff9ca44edb426ec3d0c6da67cb8
diff --git a/metadata/md5-cache/dev-vcs/rsvndump-0.5.2-r3 b/metadata/md5-cache/dev-vcs/rsvndump-0.5.2-r3
index f88b7665d9a0..1e5b5ca75768 100644
--- a/metadata/md5-cache/dev-vcs/rsvndump-0.5.2-r3
+++ b/metadata/md5-cache/dev-vcs/rsvndump-0.5.2-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-vcs/subversion doc? ( app-text/xmlto >=app-text/asciidoc-8.4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-vcs/subversion doc? ( app-text/xmlto >=app-text/asciidoc-8.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Dump a remote Subversion repository
 EAPI=2
 HOMEPAGE=http://rsvndump.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-vcs/subversion
 SLOT=0
 SRC_URI=mirror://sourceforge/rsvndump/rsvndump-0.5.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2e0883177700e899e148d59366e4e900
diff --git a/metadata/md5-cache/dev-vcs/rsvndump-0.5.6 b/metadata/md5-cache/dev-vcs/rsvndump-0.5.6
index c5733ef944cd..0a2b0071eda0 100644
--- a/metadata/md5-cache/dev-vcs/rsvndump-0.5.6
+++ b/metadata/md5-cache/dev-vcs/rsvndump-0.5.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Dump a remote Subversion repository
 EAPI=2
 HOMEPAGE=http://rsvndump.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-vcs/subversion dev-libs/apr dev-libs/apr-util sys-devel/gettext
 SLOT=0
 SRC_URI=mirror://sourceforge/rsvndump/rsvndump-0.5.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d1fd859614917a653dfd72414a8522ed
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.6.17-r7 b/metadata/md5-cache/dev-vcs/subversion-1.6.17-r7
index 99611b3bdb7e..189711c2e302 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.6.17-r7
+++ b/metadata/md5-cache/dev-vcs/subversion-1.6.17-r7
@@ -10,5 +10,5 @@ PDEPEND=bash-completion? ( app-shells/bash-completion )
 RDEPEND=>=dev-db/sqlite-3.4 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-python? ( =dev-lang/python-2* ) emacs? ( virtual/emacs ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) perl? ( dev-lang/perl ) python? ( =dev-lang/python-2* ) ruby? ( >=dev-lang/ruby-1.8.2 ) sasl? ( dev-libs/cyrus-sasl ) webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0:0 ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kde? ( kde-base/kwalletd ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) bash-completion? ( app-admin/eselect ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion	003731da0df19d26955927bd534f3058	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion	003731da0df19d26955927bd534f3058	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2fa6c6f480570a20be319341791335d4
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.7.6 b/metadata/md5-cache/dev-vcs/subversion-1.7.6
index c0993c8282de..db35bc779633 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.7.6
+++ b/metadata/md5-cache/dev-vcs/subversion-1.7.6
@@ -9,5 +9,5 @@ LICENSE=Subversion GPL-2
 RDEPEND=>=dev-db/sqlite-3.4 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-python? ( =dev-lang/python-2* ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) perl? ( dev-lang/perl ) python? ( =dev-lang/python-2* ) ruby? ( >=dev-lang/ruby-1.8.2:1.8 ) sasl? ( dev-libs/cyrus-sasl ) webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0 ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kde? ( kde-base/kwalletd ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://www.apache.org/dist/subversion/subversion-1.7.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c3cf8e1b1849d01e2edc612b058bb4f1
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.7.7 b/metadata/md5-cache/dev-vcs/subversion-1.7.7
index c9ddcdd8fcce..fe6d5c137361 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.7.7
+++ b/metadata/md5-cache/dev-vcs/subversion-1.7.7
@@ -9,5 +9,5 @@ LICENSE=Subversion GPL-2
 RDEPEND=>=dev-db/sqlite-3.4 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-python? ( =dev-lang/python-2* ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) perl? ( dev-lang/perl ) python? ( =dev-lang/python-2* ) ruby? ( >=dev-lang/ruby-1.8.2:1.8 ) sasl? ( dev-libs/cyrus-sasl ) webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0 ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kde? ( kde-base/kwalletd ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.7.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=061c4219be55803ceff38f44a83fa359
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.7.8 b/metadata/md5-cache/dev-vcs/subversion-1.7.8
index 03a43e18e812..a8ee4d98dcf3 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.7.8
+++ b/metadata/md5-cache/dev-vcs/subversion-1.7.8
@@ -9,5 +9,5 @@ LICENSE=Subversion GPL-2
 RDEPEND=>=dev-db/sqlite-3.4 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-python? ( python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) perl? ( dev-lang/perl ) python? ( python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) ruby? ( >=dev-lang/ruby-1.8.2:1.8 ) sasl? ( dev-libs/cyrus-sasl ) webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0 ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kde? ( kde-base/kwalletd ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.7.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils-r1	28f569122728e4a4b52d45c00fc45fff	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils-r1	28f569122728e4a4b52d45c00fc45fff	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=25aaa0ceac716960d43da2bcba3170a1
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.7.9 b/metadata/md5-cache/dev-vcs/subversion-1.7.9
index a5850a17beec..c9f3225cda66 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.7.9
+++ b/metadata/md5-cache/dev-vcs/subversion-1.7.9
@@ -9,5 +9,5 @@ LICENSE=Subversion GPL-2
 RDEPEND=>=dev-db/sqlite-3.4[threadsafe(+)] >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-python? ( python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) perl? ( dev-lang/perl ) python? ( python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) ruby? ( >=dev-lang/ruby-1.8.2:1.8 dev-ruby/rubygems[ruby_targets_ruby18] ) sasl? ( dev-libs/cyrus-sasl ) webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0 ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kde? ( kde-base/kwalletd ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.7.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils-r1	28f569122728e4a4b52d45c00fc45fff	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils-r1	28f569122728e4a4b52d45c00fc45fff	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6443de3af4b9d4e5781be4c054f2e4c6
diff --git a/metadata/md5-cache/games-action/0verkill-0.16-r3 b/metadata/md5-cache/games-action/0verkill-0.16-r3
index 915f075d3861..617416e719c2 100644
--- a/metadata/md5-cache/games-action/0verkill-0.16-r3
+++ b/metadata/md5-cache/games-action/0verkill-0.16-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=X? ( x11-libs/libXpm ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=X? ( x11-libs/libXpm ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a bloody 2D action deathmatch-like game in ASCII-ART
 EAPI=2
 HOMEPAGE=http://artax.karlin.mff.cuni.cz/~brain/0verkill/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/0verkill-0.16.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e9f3a238474ee1be06fc6d0258d4b233
diff --git a/metadata/md5-cache/games-action/abuse-0.8 b/metadata/md5-cache/games-action/abuse-0.8
index b064e7ee660d..81c32e1a53a5 100644
--- a/metadata/md5-cache/games-action/abuse-0.8
+++ b/metadata/md5-cache/games-action/abuse-0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=media-libs/libsdl-1.1.6[audio,opengl,video] media-libs/sdl-mixer virtual/opengl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libsdl-1.1.6[audio,opengl,video] media-libs/sdl-mixer virtual/opengl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=port of Abuse by Crack Dot Com
 EAPI=2
 HOMEPAGE=http://abuse.zoy.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2 WTFPL-2
 RDEPEND=>=media-libs/libsdl-1.1.6[audio,opengl,video] media-libs/sdl-mixer virtual/opengl
 SLOT=0
 SRC_URI=http://abuse.zoy.org/raw-attachment/wiki/download/abuse-0.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aaefc43bd9935e7a469bbe9ae4d28e89
diff --git a/metadata/md5-cache/games-action/bomberclone-0.11.8 b/metadata/md5-cache/games-action/bomberclone-0.11.8
index 659e3f00f895..31e8343b2f25 100644
--- a/metadata/md5-cache/games-action/bomberclone-0.11.8
+++ b/metadata/md5-cache/games-action/bomberclone-0.11.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=media-libs/libsdl-1.1.0 media-libs/sdl-image[png] media-libs/sdl-mixer[mod] X? ( x11-libs/libXt ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libsdl-1.1.0 media-libs/sdl-image[png] media-libs/sdl-mixer[mod] X? ( x11-libs/libXt ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=BomberMan clone with network game support
 EAPI=2
 HOMEPAGE=http://www.bomberclone.de/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libsdl-1.1.0 media-libs/sdl-image[png] media-libs/sdl-mixer[mod] X? ( x11-libs/libXt )
 SLOT=0
 SRC_URI=mirror://sourceforge/bomberclone/bomberclone-0.11.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=483573e77e322d22c6b24092cdf72683
diff --git a/metadata/md5-cache/games-action/bzflag-2.4.2 b/metadata/md5-cache/games-action/bzflag-2.4.2
index 58556787e05d..f6fd760958d1 100644
--- a/metadata/md5-cache/games-action/bzflag-2.4.2
+++ b/metadata/md5-cache/games-action/bzflag-2.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=net-misc/curl-7.15.0 sys-libs/ncurses net-dns/c-ares upnp? ( net-libs/miniupnpc ) sdl? ( virtual/opengl virtual/glu media-libs/libsdl[audio,joystick,video] media-libs/glew x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm ) !sdl? ( !dedicated? ( virtual/opengl virtual/glu media-libs/libsdl[audio,joystick,video] media-libs/glew x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-misc/curl-7.15.0 sys-libs/ncurses net-dns/c-ares upnp? ( net-libs/miniupnpc ) sdl? ( virtual/opengl virtual/glu media-libs/libsdl[audio,joystick,video] media-libs/glew x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm ) !sdl? ( !dedicated? ( virtual/opengl virtual/glu media-libs/libsdl[audio,joystick,video] media-libs/glew x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=3D tank combat simulator game
 EAPI=4
 HOMEPAGE=http://www.bzflag.org/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/bzflag/bzflag-2.4.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5f3c06ea7ad128e65d863b64be1f91b7
diff --git a/metadata/md5-cache/games-action/clanbomber-2.1.1 b/metadata/md5-cache/games-action/clanbomber-2.1.1
index fceec3ad9656..b1fec74af676 100644
--- a/metadata/md5-cache/games-action/clanbomber-2.1.1
+++ b/metadata/md5-cache/games-action/clanbomber-2.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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 media-fonts/dejavu virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 media-fonts/dejavu virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Bomberman-like multiplayer game
 EAPI=2
 HOMEPAGE=http://savannah.nongnu.org/projects/clanbomber/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=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 media-fonts/dejavu
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/clanbomber/clanbomber-2.1.1.tar.lzma
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7507743d5bc079f161ea6463cc45b705
diff --git a/metadata/md5-cache/games-action/cylindrix-1.0 b/metadata/md5-cache/games-action/cylindrix-1.0
index 4df69560cfbf..30762680ec2b 100644
--- a/metadata/md5-cache/games-action/cylindrix-1.0
+++ b/metadata/md5-cache/games-action/cylindrix-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=media-libs/allegro-4.0.3 <media-libs/allegro-5 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/allegro-4.0.3 <media-libs/allegro-5 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Action game in a tube
 EAPI=2
 HOMEPAGE=http://www.hardgeus.com/cylindrix/
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/allegro-4.0.3 <media-libs/allegro-5
 SLOT=0
 SRC_URI=http://www.hardgeus.com/cylindrix/cylindrix-1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=26cd037b02aaa9d7cd1c356877f0125f
diff --git a/metadata/md5-cache/games-action/d2x-rebirth-0.50 b/metadata/md5-cache/games-action/d2x-rebirth-0.50
index 78604f1ca92e..5f4325e60a2d 100644
--- a/metadata/md5-cache/games-action/d2x-rebirth-0.50
+++ b/metadata/md5-cache/games-action/d2x-rebirth-0.50
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Descent Rebirth - enhanced Descent 2 client
 EAPI=2
 HOMEPAGE=http://www.dxx-rebirth.de/
@@ -9,5 +9,5 @@ LICENSE=D1X GPL-2 as-is
 RDEPEND=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
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=11209cf684e069cfb301041f0445abd1
diff --git a/metadata/md5-cache/games-action/garden-1.0.8 b/metadata/md5-cache/games-action/garden-1.0.8
index 2008a5824eb3..d64c5343f79d 100644
--- a/metadata/md5-cache/games-action/garden-1.0.8
+++ b/metadata/md5-cache/games-action/garden-1.0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=<media-libs/allegro-5 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=<media-libs/allegro-5 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Multiplatform vertical shoot-em-up with non-traditional elements
 EAPI=2
 HOMEPAGE=http://garden.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=<media-libs/allegro-5
 SLOT=0
 SRC_URI=mirror://sourceforge/garden/garden-1.0.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2dd1fe999be15f68f27c1fe31f3fcb7b
diff --git a/metadata/md5-cache/games-action/geki2-KXL-2.0.3-r2 b/metadata/md5-cache/games-action/geki2-KXL-2.0.3-r2
index ecf8fac81689..aa73d75aad34 100644
--- a/metadata/md5-cache/games-action/geki2-KXL-2.0.3-r2
+++ b/metadata/md5-cache/games-action/geki2-KXL-2.0.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-games/KXL || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-games/KXL || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=2D length scroll shooting game
 EAPI=4
 HOMEPAGE=http://triring.net/ps2linux/games/kxl/kxlgames.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-games/KXL media-fonts/font-adobe-100dpi
 SLOT=0
 SRC_URI=mirror://gentoo/geki2-KXL-2.0.3.tar.gz mirror://gentoo/geki2-KXL.png
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2cedf1c668ee4fa80143b4c5c05deb29
diff --git a/metadata/md5-cache/games-action/geki3-KXL-1.0.3-r2 b/metadata/md5-cache/games-action/geki3-KXL-1.0.3-r2
index 98479ce7c625..96b90251f6cf 100644
--- a/metadata/md5-cache/games-action/geki3-KXL-1.0.3-r2
+++ b/metadata/md5-cache/games-action/geki3-KXL-1.0.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-games/KXL || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-games/KXL || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=2D length scroll shooting game
 EAPI=2
 HOMEPAGE=http://triring.net/ps2linux/games/kxl/kxlgames.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-games/KXL media-fonts/font-adobe-100dpi
 SLOT=0
 SRC_URI=mirror://gentoo/geki3-KXL-1.0.3.tar.gz mirror://gentoo/geki3-KXL.png
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=74bca7b0df559d4a060218defdbeec9d
diff --git a/metadata/md5-cache/games-action/heroes-0.21-r1 b/metadata/md5-cache/games-action/heroes-0.21-r1
index 4147de9688c9..97713064bf06 100644
--- a/metadata/md5-cache/games-action/heroes-0.21-r1
+++ b/metadata/md5-cache/games-action/heroes-0.21-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Heroes Enjoy Riding Over Empty Slabs: similar to Tron and Nibbles
 EAPI=2
 HOMEPAGE=http://heroes.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=nls? ( virtual/libintl ) sdl? ( media-libs/libsdl media-libs/sdl-mixer )
 RESTRICT=test
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8e8b1c8bac46ff10653f186d6391fc35
diff --git a/metadata/md5-cache/games-action/luola-1.3.0-r1 b/metadata/md5-cache/games-action/luola-1.3.0-r1
index 4a9137a97f7f..aaf4580bad9d 100644
--- a/metadata/md5-cache/games-action/luola-1.3.0-r1
+++ b/metadata/md5-cache/games-action/luola-1.3.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl media-libs/sdl-gfx media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-ttf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl media-libs/sdl-gfx media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-ttf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A 2D multiplayer arcade game resembling V-Wing
 EAPI=2
 HOMEPAGE=http://luolamies.org/software/luola/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl media-libs/sdl-gfx media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-ttf
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e93f830799124df8527836eabdebcc2e
diff --git a/metadata/md5-cache/games-action/luola-1.3.2 b/metadata/md5-cache/games-action/luola-1.3.2
index 45af89ddd94c..8cf005a6d927 100644
--- a/metadata/md5-cache/games-action/luola-1.3.2
+++ b/metadata/md5-cache/games-action/luola-1.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=media-libs/libsdl[X,audio,joystick,video] media-libs/sdl-gfx media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer media-libs/sdl-ttf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=media-libs/libsdl[X,audio,joystick,video] media-libs/sdl-gfx media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer media-libs/sdl-ttf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A 2D multiplayer arcade game resembling V-Wing
 EAPI=5
 HOMEPAGE=http://luolamies.org/software/luola/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[X,audio,joystick,video] media-libs/sdl-gfx media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer media-libs/sdl-ttf
 SLOT=0
 SRC_URI=http://luolamies.org/software/luola/luola-1.3.2.tar.gz http://www.luolamies.org/software/luola/stdlevels-6.0.tar.gz http://www.luolamies.org/software/luola/nostalgia-1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5690554c3cede9d263242150cc1123df
diff --git a/metadata/md5-cache/games-action/moon-buggy-1.0.51 b/metadata/md5-cache/games-action/moon-buggy-1.0.51
index c85e210d0681..cead336763d4 100644
--- a/metadata/md5-cache/games-action/moon-buggy-1.0.51
+++ b/metadata/md5-cache/games-action/moon-buggy-1.0.51
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=sys-libs/ncurses virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A simple console game, where you drive a car across the moon's surface
 EAPI=2
 HOMEPAGE=http://www.seehuhn.de/comp/moon-buggy.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.seehuhn.de/data/moon-buggy-1.0.51.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=47647b6c81f0d22754f26eb767afeb0d
diff --git a/metadata/md5-cache/games-action/openclonk-5.2.2 b/metadata/md5-cache/games-action/openclonk-5.2.2
index ddc5cfbff174..80b4d38f0828 100644
--- a/metadata/md5-cache/games-action/openclonk-5.2.2
+++ b/metadata/md5-cache/games-action/openclonk-5.2.2
@@ -9,5 +9,5 @@ LICENSE=BSD ISC CLONK-trademark LGPL-2.1 POSTGRESQL
 RDEPEND=media-libs/libpng:0 sys-libs/zlib virtual/jpeg !dedicated? ( media-libs/freetype:2 media-libs/glew media-libs/libsdl[X,opengl,video] virtual/opengl virtual/glu x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libXpm x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/libX11 sound? ( media-libs/libsdl[audio] media-libs/sdl-mixer[mp3?,vorbis,wav] ) ) dedicated? ( sys-libs/readline:0 )
 SLOT=0
 SRC_URI=http://hg.openclonk.org/openclonk/archive/openclonk-release-5.2.2-src.tar.gz http://openclonk.org/homepage/icon.png -> openclonk.png
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=62ea2d306b6358cd692627d5924de64f
diff --git a/metadata/md5-cache/games-action/openclonk-5.3.3 b/metadata/md5-cache/games-action/openclonk-5.3.3
index 5f0dffcf2196..cd78b93554e3 100644
--- a/metadata/md5-cache/games-action/openclonk-5.3.3
+++ b/metadata/md5-cache/games-action/openclonk-5.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=media-libs/libpng:0 sys-libs/zlib virtual/jpeg !dedicated? ( media-libs/freetype:2 media-libs/glew media-libs/libsdl[X,opengl,video] virtual/opengl virtual/glu x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libXrandr x11-libs/libX11 sound? ( media-libs/libsdl[audio] media-libs/sdl-mixer[mp3?,vorbis,wav] ) ) dedicated? ( sys-libs/readline:0 ) upnp? ( net-libs/libupnp ) >=dev-libs/boost-1.40 virtual/pkgconfig doc? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 ) dev-libs/libxml2[python] sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=media-libs/libpng:0 sys-libs/zlib virtual/jpeg !dedicated? ( media-libs/freetype:2 media-libs/glew media-libs/libsdl[X,opengl,video] virtual/opengl virtual/glu x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libXrandr x11-libs/libX11 sound? ( media-libs/libsdl[audio] media-libs/sdl-mixer[mp3?,vorbis,wav] ) ) dedicated? ( sys-libs/readline:0 ) upnp? ( net-libs/libupnp ) >=dev-libs/boost-1.40 virtual/pkgconfig doc? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 ) dev-libs/libxml2[python] sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A free multiplayer action game where you control clonks
 EAPI=5
 HOMEPAGE=http://openclonk.org/
@@ -9,5 +9,5 @@ LICENSE=BSD ISC CLONK-trademark LGPL-2.1 POSTGRESQL
 RDEPEND=media-libs/libpng:0 sys-libs/zlib virtual/jpeg !dedicated? ( media-libs/freetype:2 media-libs/glew media-libs/libsdl[X,opengl,video] virtual/opengl virtual/glu x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libXrandr x11-libs/libX11 sound? ( media-libs/libsdl[audio] media-libs/sdl-mixer[mp3?,vorbis,wav] ) ) dedicated? ( sys-libs/readline:0 ) upnp? ( net-libs/libupnp )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/openclonk-5.3.3.tar.xz http://openclonk.org/homepage/icon.png -> openclonk.png
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2776f13025c16861ecf0e7f56261a935
diff --git a/metadata/md5-cache/games-action/orbital-eunuchs-sniper-1.30 b/metadata/md5-cache/games-action/orbital-eunuchs-sniper-1.30
index 43cb5997047c..64bab55304ca 100644
--- a/metadata/md5-cache/games-action/orbital-eunuchs-sniper-1.30
+++ b/metadata/md5-cache/games-action/orbital-eunuchs-sniper-1.30
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst preinst setup unpack
-DEPEND=media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Snipe terrorists from your orbital base
 HOMEPAGE=http://icculus.org/oes/
 KEYWORDS=~amd64 ppc x86
@@ -7,5 +7,5 @@ LICENSE=ZLIB
 RDEPEND=media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image
 SLOT=0
 SRC_URI=http://filesingularity.timedoctor.org/orbital_eunuchs_sniper-1.30.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1b9b6885dfb15a71b4c946468a616656
diff --git a/metadata/md5-cache/games-action/powermanga-0.90 b/metadata/md5-cache/games-action/powermanga-0.90
index d00a3d01c495..be068a5c4466 100644
--- a/metadata/md5-cache/games-action/powermanga-0.90
+++ b/metadata/md5-cache/games-action/powermanga-0.90
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=media-libs/libsdl-1.2[audio,joystick,video] media-libs/libpng x11-libs/libXext x11-libs/libXxf86dga media-libs/sdl-mixer[mod] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libsdl-1.2[audio,joystick,video] media-libs/libpng x11-libs/libXext x11-libs/libXxf86dga media-libs/sdl-mixer[mod] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An arcade 2D shoot-em-up game
 EAPI=2
 HOMEPAGE=http://linux.tlk.fr/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=media-libs/libsdl-1.2[audio,joystick,video] media-libs/libpng x11-libs/libXext x11-libs/libXxf86dga media-libs/sdl-mixer[mod]
 SLOT=0
 SRC_URI=http://linux.tlk.fr/games/Powermanga/download/powermanga-0.90.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d47f3ca7c6fe72322525435415d859f1
diff --git a/metadata/md5-cache/games-action/powermanga-0.91 b/metadata/md5-cache/games-action/powermanga-0.91
index 27b7d9e6efd4..be64b755c679 100644
--- a/metadata/md5-cache/games-action/powermanga-0.91
+++ b/metadata/md5-cache/games-action/powermanga-0.91
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=media-libs/libsdl-1.2[audio,joystick,video] media-libs/libpng:0 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga media-libs/sdl-mixer[mod] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libsdl-1.2[audio,joystick,video] media-libs/libpng:0 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga media-libs/sdl-mixer[mod] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An arcade 2D shoot-em-up game
 EAPI=5
 HOMEPAGE=http://linux.tlk.fr/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=media-libs/libsdl-1.2[audio,joystick,video] media-libs/libpng:0 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga media-libs/sdl-mixer[mod]
 SLOT=0
 SRC_URI=http://linux.tlk.fr/games/Powermanga/download/powermanga-0.91.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=576fbf4414ab201abd9ee8561531bc7e
diff --git a/metadata/md5-cache/games-action/spacearyarya-kxl-1.0.2-r1 b/metadata/md5-cache/games-action/spacearyarya-kxl-1.0.2-r1
index 3c6d10fe0b05..dbed180bed21 100644
--- a/metadata/md5-cache/games-action/spacearyarya-kxl-1.0.2-r1
+++ b/metadata/md5-cache/games-action/spacearyarya-kxl-1.0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst preinst setup unpack
-DEPEND=dev-games/KXL || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-games/KXL || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A 2D/3D shooting game
 HOMEPAGE=http://triring.net/ps2linux/games/kxl/kxlgames.html
 KEYWORDS=~amd64 ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-games/KXL media-fonts/font-adobe-100dpi media-fonts/font-bitstream-100dpi
 SLOT=0
 SRC_URI=mirror://gentoo/SpaceAryarya-KXL-1.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d3c2e05e4e5a1e350f488894e54864af
diff --git a/metadata/md5-cache/games-action/xblast-2.10.4 b/metadata/md5-cache/games-action/xblast-2.10.4
index f207a290a3d4..12153927b19d 100644
--- a/metadata/md5-cache/games-action/xblast-2.10.4
+++ b/metadata/md5-cache/games-action/xblast-2.10.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/libICE x11-libs/libX11 media-libs/libpng x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libICE x11-libs/libX11 media-libs/libpng x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Bomberman clone w/network support for up to 6 players
 EAPI=2
 HOMEPAGE=http://xblast.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libICE x11-libs/libX11 media-libs/libpng
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=af96977ef134ed2178c5307026d14d3e
diff --git a/metadata/md5-cache/games-arcade/afternoonstalker-1.1.5 b/metadata/md5-cache/games-arcade/afternoonstalker-1.1.5
index 941b4e0ecccc..6efda02316a9 100644
--- a/metadata/md5-cache/games-arcade/afternoonstalker-1.1.5
+++ b/metadata/md5-cache/games-arcade/afternoonstalker-1.1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=dev-games/flatzebra-0.1.6 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-games/flatzebra-0.1.6 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Clone of the 1981 Night Stalker video game by Mattel Electronics
 EAPI=2
 HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev/afternoonstalker.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-games/flatzebra-0.1.6
 SLOT=0
 SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/afternoonstalker-1.1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b8f6db211e86c312897904d57dca257
diff --git a/metadata/md5-cache/games-arcade/apricots-0.2.6-r1 b/metadata/md5-cache/games-arcade/apricots-0.2.6-r1
index 7f050b84d852..324e4c8b0855 100644
--- a/metadata/md5-cache/games-arcade/apricots-0.2.6-r1
+++ b/metadata/md5-cache/games-arcade/apricots-0.2.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl media-libs/openal media-libs/freealut || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl media-libs/openal media-libs/freealut || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Fly a plane around bomb/shoot the enemy. Port of Planegame from Amiga.
 EAPI=2
 HOMEPAGE=http://www.fishies.org.uk/apricots.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl media-libs/openal media-libs/freealut
 SLOT=0
 SRC_URI=http://www.fishies.org.uk/apricots-0.2.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=34de0e7474c8f2df3729c66b6780c165
diff --git a/metadata/md5-cache/games-arcade/batrachians-0.1.5 b/metadata/md5-cache/games-arcade/batrachians-0.1.5
index 337c208755f5..d65daf28b8d8 100644
--- a/metadata/md5-cache/games-arcade/batrachians-0.1.5
+++ b/metadata/md5-cache/games-arcade/batrachians-0.1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=dev-games/flatzebra-0.1.5 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-games/flatzebra-0.1.5 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fly-eating frog video game
 EAPI=2
 HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev/batrachians.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-games/flatzebra-0.1.5
 SLOT=0
 SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/batrachians-0.1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=71442d7797537f538feb0541d337a48e
diff --git a/metadata/md5-cache/games-arcade/batrachians-0.1.6 b/metadata/md5-cache/games-arcade/batrachians-0.1.6
index bf01ba0ce9d7..71bf5c6fcac4 100644
--- a/metadata/md5-cache/games-arcade/batrachians-0.1.6
+++ b/metadata/md5-cache/games-arcade/batrachians-0.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-games/flatzebra-0.1.5 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=dev-games/flatzebra-0.1.5 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A fly-eating frog video game
 EAPI=5
 HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev/batrachians.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-games/flatzebra-0.1.5
 SLOT=0
 SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/batrachians-0.1.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dba5c480b9b7939b85c71b8e15d899c0
diff --git a/metadata/md5-cache/games-arcade/berusky-1.4 b/metadata/md5-cache/games-arcade/berusky-1.4
index 4f5374bc8669..006c8138cf50 100644
--- a/metadata/md5-cache/games-arcade/berusky-1.4
+++ b/metadata/md5-cache/games-arcade/berusky-1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[video] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl[video] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=free logic game based on an ancient puzzle named Sokoban.
 EAPI=2
 HOMEPAGE=http://anakreon.cz/?q=node/1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video]
 SLOT=0
 SRC_URI=http://www.anakreon.cz/download/berusky-1.4.tar.gz http://www.anakreon.cz/download/berusky-data-1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5ea8296d592381d2ec6042ab9df2a208
diff --git a/metadata/md5-cache/games-arcade/berusky-1.6 b/metadata/md5-cache/games-arcade/berusky-1.6
index 73e22b476802..4dad213ab788 100644
--- a/metadata/md5-cache/games-arcade/berusky-1.6
+++ b/metadata/md5-cache/games-arcade/berusky-1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=media-libs/libsdl[X,video] media-libs/sdl-image[png] x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=media-libs/libsdl[X,video] media-libs/sdl-image[png] x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=free logic game based on an ancient puzzle named Sokoban
 EAPI=5
 HOMEPAGE=http://anakreon.cz/?q=node/1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[X,video] media-libs/sdl-image[png] x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://www.anakreon.cz/download/berusky-1.6.tar.gz http://www.anakreon.cz/download/berusky-data-1.6.tar.gz http://dev.gentoo.org/~hasufell/distfiles/berusky.png
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7fd8be586edc34ab57aedec7946522fc
diff --git a/metadata/md5-cache/games-arcade/bomns-0.99.2 b/metadata/md5-cache/games-arcade/bomns-0.99.2
index cc61d08d5edc..c6a1f89eecde 100644
--- a/metadata/md5-cache/games-arcade/bomns-0.99.2
+++ b/metadata/md5-cache/games-arcade/bomns-0.99.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fast-paced multiplayer deathmatch arcade game.
 EAPI=2
 HOMEPAGE=http://greenridge.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/greenridge/bomns-0.99.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0c1a01c5cd294ab328a106ae752ae2a4
diff --git a/metadata/md5-cache/games-arcade/burgerspace-1.9.1 b/metadata/md5-cache/games-arcade/burgerspace-1.9.1
index 8b67e7dbd308..aed446e257a2 100644
--- a/metadata/md5-cache/games-arcade/burgerspace-1.9.1
+++ b/metadata/md5-cache/games-arcade/burgerspace-1.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=dev-games/flatzebra-0.1.6 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-games/flatzebra-0.1.6 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Clone of the 1982 BurgerTime video game by Data East
 EAPI=2
 HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev/burgerspace.html
@@ -10,5 +10,5 @@ RDEPEND=>=dev-games/flatzebra-0.1.6
 RESTRICT=test
 SLOT=0
 SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/burgerspace-1.9.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5d47c6cc8c7767a69a17b1623dd7641e
diff --git a/metadata/md5-cache/games-arcade/burgerspace-1.9.2 b/metadata/md5-cache/games-arcade/burgerspace-1.9.2
index debd4b8a3d02..d687f0702fce 100644
--- a/metadata/md5-cache/games-arcade/burgerspace-1.9.2
+++ b/metadata/md5-cache/games-arcade/burgerspace-1.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=dev-games/flatzebra-0.1.6 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-games/flatzebra-0.1.6 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Clone of the 1982 BurgerTime video game by Data East
 EAPI=5
 HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev/burgerspace.html
@@ -10,5 +10,5 @@ RDEPEND=>=dev-games/flatzebra-0.1.6
 RESTRICT=test
 SLOT=0
 SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/burgerspace-1.9.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=80529ec806346f921ba81f0d14f5b4ee
diff --git a/metadata/md5-cache/games-arcade/cosmosmash-1.4.6 b/metadata/md5-cache/games-arcade/cosmosmash-1.4.6
index d94f4e418541..65a4939924f6 100644
--- a/metadata/md5-cache/games-arcade/cosmosmash-1.4.6
+++ b/metadata/md5-cache/games-arcade/cosmosmash-1.4.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=dev-games/flatzebra-0.1.6 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-games/flatzebra-0.1.6 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A space rock shooting video game
 EAPI=2
 HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev/cosmosmash.html
@@ -9,5 +9,5 @@ RDEPEND=>=dev-games/flatzebra-0.1.6
 RESTRICT=test
 SLOT=0
 SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/cosmosmash-1.4.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c31a7c35d71345c105ffd2dadaea3150
diff --git a/metadata/md5-cache/games-arcade/cosmosmash-1.4.7 b/metadata/md5-cache/games-arcade/cosmosmash-1.4.7
index bcb363bfe512..0bd59a537758 100644
--- a/metadata/md5-cache/games-arcade/cosmosmash-1.4.7
+++ b/metadata/md5-cache/games-arcade/cosmosmash-1.4.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=dev-games/flatzebra-0.1.6 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-games/flatzebra-0.1.6 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A space rock shooting video game
 EAPI=2
 HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev/cosmosmash.html
@@ -9,5 +9,5 @@ RDEPEND=>=dev-games/flatzebra-0.1.6
 RESTRICT=test
 SLOT=0
 SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/cosmosmash-1.4.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=48c52d11b53cb956afcbc067ef6a676b
diff --git a/metadata/md5-cache/games-arcade/criticalmass-1.0.2 b/metadata/md5-cache/games-arcade/criticalmass-1.0.2
index b24336051014..4aaeb3e3f0ab 100644
--- a/metadata/md5-cache/games-arcade/criticalmass-1.0.2
+++ b/metadata/md5-cache/games-arcade/criticalmass-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libpng virtual/opengl net-misc/curl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libpng virtual/opengl net-misc/curl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=SDL/OpenGL space shoot'em up game
 EAPI=2
 HOMEPAGE=http://criticalmass.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libpng virtual/opengl net-misc/curl
 SLOT=0
 SRC_URI=mirror://sourceforge/criticalmass/CriticalMass-1.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d95459d74a11227b21f10950749f9404
diff --git a/metadata/md5-cache/games-arcade/diameter-0.4.0.3 b/metadata/md5-cache/games-arcade/diameter-0.4.0.3
index 5ac062ff1bb0..be658b603505 100644
--- a/metadata/md5-cache/games-arcade/diameter-0.4.0.3
+++ b/metadata/md5-cache/games-arcade/diameter-0.4.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=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 virtual/pkgconfig =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Arcade game with elements of economy and adventure
 EAPI=2
 HOMEPAGE=http://gamediameter.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=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*
 SLOT=0
 SRC_URI=mirror://sourceforge/gamediameter/diameter-0.4.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=afdcadb0997db5444b36bcba3ae22de5
diff --git a/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r1 b/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r1
index 68bb69c03002..06f4d5af6690 100644
--- a/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r1
+++ b/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl x11-libs/libSM media-libs/libsdl[joystick,opengl,video,X] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] >=sys-devel/libtool-2.2.6b x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/opengl x11-libs/libSM media-libs/libsdl[joystick,opengl,video,X] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] >=sys-devel/libtool-2.2.6b x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=SDL OpenGL pinball game
 EAPI=2
 HOMEPAGE=http://pinball.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/opengl x11-libs/libSM media-libs/libsdl[joystick,opengl,video,X] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] >=sys-devel/libtool-2.2.6b
 SLOT=0
 SRC_URI=mirror://sourceforge/pinball/pinball-0.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7bd782ae1ea13edb2f41f8c9ecc5f104
diff --git a/metadata/md5-cache/games-arcade/fishsupper-0.1.6 b/metadata/md5-cache/games-arcade/fishsupper-0.1.6
index b9942ac53feb..1010bdf1776f 100644
--- a/metadata/md5-cache/games-arcade/fishsupper-0.1.6
+++ b/metadata/md5-cache/games-arcade/fishsupper-0.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[audio,video,opengl,X] media-libs/sdl-image[png] media-libs/sdl-mixer[wav] virtual/opengl dev-libs/boost || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl[audio,video,opengl,X] media-libs/sdl-image[png] media-libs/sdl-mixer[wav] virtual/opengl dev-libs/boost || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A simple arcade/puzzle game, loosely based on the retro classic Frogger
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/fishsupper/
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-2.5 GPL-3
 RDEPEND=media-libs/libsdl[audio,video,opengl,X] media-libs/sdl-image[png] media-libs/sdl-mixer[wav] virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/fishsupper/fishsupper-0.1.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=988e20ca4413f4805fd31123f622d87a
diff --git a/metadata/md5-cache/games-arcade/grande-KXL-0.6 b/metadata/md5-cache/games-arcade/grande-KXL-0.6
index e36f754caeb0..6dd6aa398466 100644
--- a/metadata/md5-cache/games-arcade/grande-KXL-0.6
+++ b/metadata/md5-cache/games-arcade/grande-KXL-0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst preinst setup unpack
-DEPEND=dev-games/KXL || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-games/KXL || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ZANAC type game
 HOMEPAGE=http://triring.net/ps2linux/games/kxl/kxlgames.html
 KEYWORDS=amd64 ~ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-games/KXL media-fonts/font-adobe-100dpi
 SLOT=0
 SRC_URI=mirror://gentoo/grande-KXL-0.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ca76aadb4c0d3314058566247b21aef5
diff --git a/metadata/md5-cache/games-arcade/jumpnbump-1.50-r1 b/metadata/md5-cache/games-arcade/jumpnbump-1.50-r1
index 4012cea8e9d1..c4338bf2fcf8 100644
--- a/metadata/md5-cache/games-arcade/jumpnbump-1.50-r1
+++ b/metadata/md5-cache/games-arcade/jumpnbump-1.50-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=X? ( x11-libs/libXext ) kde? ( kde-base/kdialog ) media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) media-libs/libsdl[audio,joystick,video] media-libs/sdl-net || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=X? ( x11-libs/libXext ) kde? ( kde-base/kdialog ) media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) media-libs/libsdl[audio,joystick,video] media-libs/sdl-net || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a funny multiplayer game about cute little fluffy bunnies
 EAPI=2
 HOMEPAGE=http://www.jumpbump.mine.nu/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libXext ) kde? ( kde-base/kdialog ) media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) media-libs/libsdl[audio,joystick,video] media-libs/sdl-net tk? ( dev-lang/tcl dev-lang/tk )
 SLOT=0
 SRC_URI=http://www.jumpbump.mine.nu/port/jumpnbump-1.50.tar.gz mirror://gentoo/jumpnbump-1.50-autotool.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a17272ea72e043b263fd505156cdca6b
diff --git a/metadata/md5-cache/games-arcade/lbreakout2-2.6.3 b/metadata/md5-cache/games-arcade/lbreakout2-2.6.3
index 1b59e42bd46d..fb38696488e3 100644
--- a/metadata/md5-cache/games-arcade/lbreakout2-2.6.3
+++ b/metadata/md5-cache/games-arcade/lbreakout2-2.6.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Breakout clone written with the SDL library
 EAPI=2
 HOMEPAGE=http://lgames.sourceforge.net/index.php?project=LBreakout2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng sys-libs/zlib media-libs/libsdl[audio,joystick,video] media-libs/sdl-net media-libs/sdl-mixer nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=799e18320eff089d6d73dbfa37b045b5
diff --git a/metadata/md5-cache/games-arcade/lbreakout2-2.6.4 b/metadata/md5-cache/games-arcade/lbreakout2-2.6.4
index ab24ee6606ca..79dd64958c81 100644
--- a/metadata/md5-cache/games-arcade/lbreakout2-2.6.4
+++ b/metadata/md5-cache/games-arcade/lbreakout2-2.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=media-libs/libpng:0 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=media-libs/libpng:0 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Breakout clone written with the SDL library
 EAPI=5
 HOMEPAGE=http://lgames.sourceforge.net/index.php?project=LBreakout2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0 sys-libs/zlib media-libs/libsdl[audio,joystick,video] media-libs/sdl-net media-libs/sdl-mixer nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/lgames/lbreakout2-2.6.4.tar.gz mirror://sourceforge/lgames/lbreakout2-levelsets-20120815.tar.gz themes? ( mirror://sourceforge/lgames/lbreakout2-themes-20111026.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9a7382be011773d2decb1bbfcf423d50
diff --git a/metadata/md5-cache/games-arcade/monkey-bubble-0.4.0 b/metadata/md5-cache/games-arcade/monkey-bubble-0.4.0
index 52b6d9e6b1c1..2bb0875c7013 100644
--- a/metadata/md5-cache/games-arcade/monkey-bubble-0.4.0
+++ b/metadata/md5-cache/games-arcade/monkey-bubble-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A Puzzle Bobble clone
 EAPI=4
 HOMEPAGE=http://www.monkey-bubble.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=http://home.gna.org/monkeybubble/downloads/monkey-bubble-0.4.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=43ab923a225e83e0fce7acbef76c472d
diff --git a/metadata/md5-cache/games-arcade/monster-masher-1.8.1-r1 b/metadata/md5-cache/games-arcade/monster-masher-1.8.1-r1
index 560e1aa8188d..24f4910ff577 100644
--- a/metadata/md5-cache/games-arcade/monster-masher-1.8.1-r1
+++ b/metadata/md5-cache/games-arcade/monster-masher-1.8.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=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 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=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 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Squash the monsters with your levitation worker gnome
 EAPI=3
 HOMEPAGE=http://people.iola.dk/olau/monster-masher/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=http://people.iola.dk/olau/monster-masher/source/monster-masher-1.8.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=20672f4198bde060611efb8b0ba21043
diff --git a/metadata/md5-cache/games-arcade/pachi-1.0 b/metadata/md5-cache/games-arcade/pachi-1.0
index f938f19aec77..5e30d8ea6a21 100644
--- a/metadata/md5-cache/games-arcade/pachi-1.0
+++ b/metadata/md5-cache/games-arcade/pachi-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst preinst setup unpack
-DEPEND=media-libs/libsdl media-libs/sdl-mixer || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl media-libs/sdl-mixer || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=platform game inspired by games like Manic Miner and Jet Set Willy
 HOMEPAGE=http://dragontech.sourceforge.net/index.php?main=pachi&lang=en
 KEYWORDS=amd64 ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl media-libs/sdl-mixer
 SLOT=0
 SRC_URI=mirror://gentoo/pachi-1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dbe7268ac7c37893f574cc1c3b35c2fd
diff --git a/metadata/md5-cache/games-arcade/pacmanarena-0.15 b/metadata/md5-cache/games-arcade/pacmanarena-0.15
index acdc0003d3e2..6649208b0daf 100644
--- a/metadata/md5-cache/games-arcade/pacmanarena-0.15
+++ b/metadata/md5-cache/games-arcade/pacmanarena-0.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl virtual/glu media-libs/libsdl media-libs/sdl-mixer[vorbis] media-libs/sdl-net app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/opengl virtual/glu media-libs/libsdl media-libs/sdl-mixer[vorbis] media-libs/sdl-net app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a Pacman clone in full 3D with a few surprises. Rockets, bombs and explosions abound.
 EAPI=2
 HOMEPAGE=http://pacmanarena.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/opengl virtual/glu media-libs/libsdl media-libs/sdl-mixer[vorbis] media-libs/sdl-net
 SLOT=0
 SRC_URI=mirror://sourceforge/pacmanarena/pacman-arena-0.15.tar.bz2 mirror://sourceforge/pacmanarena/pacman-data-0.0.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b8916bfcf4386097165716b415b0cef3
diff --git a/metadata/md5-cache/games-arcade/pengupop-2.2.5 b/metadata/md5-cache/games-arcade/pengupop-2.2.5
index 260cc39c29f9..263132efd727 100644
--- a/metadata/md5-cache/games-arcade/pengupop-2.2.5
+++ b/metadata/md5-cache/games-arcade/pengupop-2.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[audio,video] sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl[audio,video] sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Networked multiplayer-only Puzzle Bubble clone
 EAPI=2
 HOMEPAGE=http://freshmeat.net/projects/pengupop
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[audio,video] sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://gentoo/pengupop-2.2.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e96e591f2b7caf97e1679bc29b8103ae
diff --git a/metadata/md5-cache/games-arcade/ri-li-2.0.1 b/metadata/md5-cache/games-arcade/ri-li-2.0.1
index 4585671d56de..3a90844dc0da 100644
--- a/metadata/md5-cache/games-arcade/ri-li-2.0.1
+++ b/metadata/md5-cache/games-arcade/ri-li-2.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[audio,video] media-libs/sdl-mixer[mod] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl[audio,video] media-libs/sdl-mixer[mod] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Drive a toy wood engine and collect all the coaches
 EAPI=2
 HOMEPAGE=http://ri-li.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsdl[audio,video] media-libs/sdl-mixer[mod]
 SLOT=0
 SRC_URI=mirror://sourceforge/ri-li/Ri-li-2.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b3e1e1b789c3150acb4b1ffbfef8370
diff --git a/metadata/md5-cache/games-arcade/sdl-sopwith-1.7.5-r1 b/metadata/md5-cache/games-arcade/sdl-sopwith-1.7.5-r1
index 1e9cca85c5ec..df29e5c3fcae 100644
--- a/metadata/md5-cache/games-arcade/sdl-sopwith-1.7.5-r1
+++ b/metadata/md5-cache/games-arcade/sdl-sopwith-1.7.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=media-libs/libsdl-1.1.3[video] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libsdl-1.1.3[video] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Port of the classic Sopwith game using LibSDL
 EAPI=5
 HOMEPAGE=http://sdl-sopwith.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libsdl-1.1.3[video]
 SLOT=0
 SRC_URI=mirror://sourceforge/sdl-sopwith/sopwith-1.7.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a970fa91f44c6baabf10d2ef5a7aa289
diff --git a/metadata/md5-cache/games-arcade/tecnoballz-0.92 b/metadata/md5-cache/games-arcade/tecnoballz-0.92
index eaf0e4898fde..317868095fbe 100644
--- a/metadata/md5-cache/games-arcade/tecnoballz-0.92
+++ b/metadata/md5-cache/games-arcade/tecnoballz-0.92
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libmikmod:0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libmikmod:0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An exciting Brick Breaker
 EAPI=2
 HOMEPAGE=http://linux.tlk.fr/games/TecnoballZ/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libmikmod:0
 SLOT=0
 SRC_URI=http://linux.tlk.fr/games/TecnoballZ/download/tecnoballz-0.92.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=af5ddf29b97f2e25d5202116f92c7cab
diff --git a/metadata/md5-cache/games-arcade/xbill-2.1-r2 b/metadata/md5-cache/games-arcade/xbill-2.1-r2
index 27db8c296b82..e244fe4c02d6 100644
--- a/metadata/md5-cache/games-arcade/xbill-2.1-r2
+++ b/metadata/md5-cache/games-arcade/xbill-2.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=gtk? ( x11-libs/gtk+:2 ) !gtk? ( x11-libs/libXaw ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gtk? ( x11-libs/gtk+:2 ) !gtk? ( x11-libs/libXaw ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A game about an evil hacker called Bill!
 EAPI=2
 HOMEPAGE=http://www.xbill.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-1
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) !gtk? ( x11-libs/libXaw )
 SLOT=0
 SRC_URI=http://www.xbill.org/download/xbill-2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ca60ea2995038b7ec811a6cc0e5adb96
diff --git a/metadata/md5-cache/games-board/ace-1.4 b/metadata/md5-cache/games-board/ace-1.4
index 7e7bf3f0c834..0b5f402b52d0 100644
--- a/metadata/md5-cache/games-board/ace-1.4
+++ b/metadata/md5-cache/games-board/ace-1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/libX11 media-libs/libpng:0 x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 media-libs/libpng:0 x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=DJ Delorie's Ace of Penguins solitaire games
 EAPI=2
 HOMEPAGE=http://www.delorie.com/store/ace/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 media-libs/libpng:0
 SLOT=0
 SRC_URI=http://www.delorie.com/store/ace/ace-1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aa4743f5b7ca1664d85769c7b01c1578
diff --git a/metadata/md5-cache/games-board/ascal-0.1.1 b/metadata/md5-cache/games-board/ascal-0.1.1
index 2ea10d9bd730..515d5e0bde98 100644
--- a/metadata/md5-cache/games-board/ascal-0.1.1
+++ b/metadata/md5-cache/games-board/ascal-0.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-cpp/libgnomecanvasmm dev-cpp/libglademm virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-cpp/libgnomecanvasmm dev-cpp/libglademm virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A game similar to Draughts but with some really cool enhancements
 EAPI=2
 HOMEPAGE=http://ascal.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/libgnomecanvasmm dev-cpp/libglademm virtual/libintl
 SLOT=0
 SRC_URI=mirror://sourceforge/ascal/ascal-0.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9095b9d8b5afc377098034ee1d4d28f1
diff --git a/metadata/md5-cache/games-board/awale-1.5 b/metadata/md5-cache/games-board/awale-1.5
index 4060bf455a82..46b186183d88 100644
--- a/metadata/md5-cache/games-board/awale-1.5
+++ b/metadata/md5-cache/games-board/awale-1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Free Awale - The game of all Africa
 EAPI=5
 HOMEPAGE=http://www.nongnu.org/awale/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=tk? ( dev-lang/tcl dev-lang/tk )
 SLOT=0
 SRC_URI=mirror://nongnu/awale/awale-1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1c9e8a93ac9d7a89faae6cc521c2bf56
diff --git a/metadata/md5-cache/games-board/biloba-0.9.3 b/metadata/md5-cache/games-board/biloba-0.9.3
index b745049705bc..37b57ee44180 100644
--- a/metadata/md5-cache/games-board/biloba-0.9.3
+++ b/metadata/md5-cache/games-board/biloba-0.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[X,video,audio] media-libs/sdl-image[png] media-libs/sdl-mixer || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl[X,video,audio] media-libs/sdl-image[png] media-libs/sdl-mixer || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a board game, up to 4 players, with AI and network.
 EAPI=2
 HOMEPAGE=http://biloba.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[X,video,audio] media-libs/sdl-image[png] media-libs/sdl-mixer
 SLOT=0
 SRC_URI=mirror://sourceforge/biloba/biloba-0.9.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=86fc8890a98b27314ca55f68397661a8
diff --git a/metadata/md5-cache/games-board/blokish-0.9.4-r1 b/metadata/md5-cache/games-board/blokish-0.9.4-r1
index f90a1b0127d3..deb95af3df5a 100644
--- a/metadata/md5-cache/games-board/blokish-0.9.4-r1
+++ b/metadata/md5-cache/games-board/blokish-0.9.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/wxGTK:2.8[X,opengl] virtual/glu virtual/opengl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/wxGTK:2.8[X,opengl] virtual/glu virtual/opengl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open source clone of the four-player board game Blokus
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/blokish/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/wxGTK:2.8[X,opengl] virtual/glu virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/blokish/blokish_v0.9.4.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=82984168d091630ad0ebdc8668ecfc97
diff --git a/metadata/md5-cache/games-board/ccgo-0.3.6.4 b/metadata/md5-cache/games-board/ccgo-0.3.6.4
index f13d1d332330..1756a4a523b3 100644
--- a/metadata/md5-cache/games-board/ccgo-0.3.6.4
+++ b/metadata/md5-cache/games-board/ccgo-0.3.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=dev-cpp/gtkmm-2.4:2.4 >=dev-cpp/gconfmm-2.6 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-cpp/gtkmm-2.4:2.4 >=dev-cpp/gconfmm-2.6 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An IGS client written in C++
 EAPI=2
 HOMEPAGE=http://ccdw.org/~cjj/prog/ccgo/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-cpp/gtkmm-2.4:2.4 >=dev-cpp/gconfmm-2.6 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://ccdw.org/~cjj/prog/ccgo/src/ccgo-0.3.6.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=24bc7aec95f433a1d12ecab9fce53ba9
diff --git a/metadata/md5-cache/games-board/cgoban-1.9.14 b/metadata/md5-cache/games-board/cgoban-1.9.14
index 6bdd1991a560..adcabd6819a7 100644
--- a/metadata/md5-cache/games-board/cgoban-1.9.14
+++ b/metadata/md5-cache/games-board/cgoban-1.9.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) x11-libs/libX11 x11-libs/libXt x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) x11-libs/libX11 x11-libs/libXt x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Go-frontend
 EAPI=2
 HOMEPAGE=http://cgoban1.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) x11-libs/libX11 x11-libs/libXt
 SLOT=0
 SRC_URI=mirror://sourceforge/cgoban1/cgoban-1.9.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2d046b9ec0ff9ecb5796d482c609d4ad
diff --git a/metadata/md5-cache/games-board/ggz-gtk-client-0.0.14.1 b/metadata/md5-cache/games-board/ggz-gtk-client-0.0.14.1
index b43e49dfb939..5b7b86937f8c 100644
--- a/metadata/md5-cache/games-board/ggz-gtk-client-0.0.14.1
+++ b/metadata/md5-cache/games-board/ggz-gtk-client-0.0.14.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=~dev-games/libggz-0.0.14.1 ~dev-games/ggz-client-libs-0.0.14.1 x11-libs/gtk+:2 virtual/libintl virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=~dev-games/libggz-0.0.14.1 ~dev-games/ggz-client-libs-0.0.14.1 x11-libs/gtk+:2 virtual/libintl virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The GTK+ client for GGZ Gaming Zone
 EAPI=2
 HOMEPAGE=http://www.ggzgamingzone.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=~dev-games/libggz-0.0.14.1 ~dev-games/ggz-client-libs-0.0.14.1 x11-libs/gtk+:2 virtual/libintl
 SLOT=0
 SRC_URI=mirror://ggz/0.0.14.1/ggz-gtk-client-0.0.14.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games-ggz	7957d0a0b68d2703b8bb71ec7ddd87a8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games-ggz	7957d0a0b68d2703b8bb71ec7ddd87a8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=305c7eccba48456742483576172ae904
diff --git a/metadata/md5-cache/games-board/gnome-hearts-0.3 b/metadata/md5-cache/games-board/gnome-hearts-0.3
index 1aa47eef1686..b2c2ea95446f 100644
--- a/metadata/md5-cache/games-board/gnome-hearts-0.3
+++ b/metadata/md5-cache/games-board/gnome-hearts-0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=x11-libs/gtk+:2 >=gnome-base/libglade-2 >=gnome-base/libgnomeui-2 app-text/rarian dev-util/intltool virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* >=sys-apps/sed-4
+DEPEND=x11-libs/gtk+:2 >=gnome-base/libglade-2 >=gnome-base/libgnomeui-2 app-text/rarian dev-util/intltool virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* >=sys-apps/sed-4
 DESCRIPTION=A clone of classic hearts card game
 EAPI=2
 HOMEPAGE=http://www.gnome-hearts.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=x11-libs/gtk+:2 >=gnome-base/libglade-2 >=gnome-base/libgnomeui-2 =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://www.jejik.com/files/gnome-hearts/gnome-hearts-0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a1693e55c1535bc6ef64ac644a436961
diff --git a/metadata/md5-cache/games-board/gnono-1.9.1 b/metadata/md5-cache/games-board/gnono-1.9.1
index 255555417874..8bbcb151aa06 100644
--- a/metadata/md5-cache/games-board/gnono-1.9.1
+++ b/metadata/md5-cache/games-board/gnono-1.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=gnome-base/libgnomeui virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=gnome-base/libgnomeui virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A rewrite for GNOME of the Windows card game WUNO
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/gnono/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=gnome-base/libgnomeui virtual/libintl
 SLOT=0
 SRC_URI=mirror://sourceforge/gnono/gnono-1.9.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=632c08c209a9840de3c14f5727151817
diff --git a/metadata/md5-cache/games-board/gnubg-20121201 b/metadata/md5-cache/games-board/gnubg-20121201
index 9466ab8c3c16..81ea4d1d6a54 100644
--- a/metadata/md5-cache/games-board/gnubg-20121201
+++ b/metadata/md5-cache/games-board/gnubg-20121201
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 media-libs/libpng:0 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 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) >=sys-apps/sed-4
+DEPEND=dev-libs/glib:2 media-libs/libpng:0 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 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) >=sys-apps/sed-4
 DESCRIPTION=GNU BackGammon
 EAPI=4
 HOMEPAGE=http://www.gnubg.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 media-libs/libpng:0 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* )
 SLOT=0
 SRC_URI=http://www.gnubg.org/media/sources/gnubg-source-SNAPSHOT-20121201.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1549d503cf650f991b4c51d1adef4df3
diff --git a/metadata/md5-cache/games-board/gnubg-20130203 b/metadata/md5-cache/games-board/gnubg-20130203
index d5c3cab6599e..ce5c3d75712c 100644
--- a/metadata/md5-cache/games-board/gnubg-20130203
+++ b/metadata/md5-cache/games-board/gnubg-20130203
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 media-libs/libpng:0 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? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) media-fonts/ttf-bitstream-vera virtual/libintl dev-db/sqlite:3 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-libs/glib:2 media-libs/libpng:0 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? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) media-fonts/ttf-bitstream-vera virtual/libintl dev-db/sqlite:3 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=GNU BackGammon
 EAPI=5
 HOMEPAGE=http://www.gnubg.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 media-libs/libpng:0 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? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) media-fonts/ttf-bitstream-vera virtual/libintl dev-db/sqlite:3
 SLOT=0
 SRC_URI=http://www.gnubg.org/media/sources/gnubg-source-SNAPSHOT-20130203.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a2a76a5d8964fad9ba3711363462aa0c
diff --git a/metadata/md5-cache/games-board/gtkatlantic-0.4.3 b/metadata/md5-cache/games-board/gtkatlantic-0.4.3
index e3d024ebcc08..debe55c94769 100644
--- a/metadata/md5-cache/games-board/gtkatlantic-0.4.3
+++ b/metadata/md5-cache/games-board/gtkatlantic-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=x11-libs/gtk+:2 dev-libs/libxml2 media-libs/libpng:0 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=x11-libs/gtk+:2 dev-libs/libxml2 media-libs/libpng:0 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Monopoly-like game that works with the monopd server
 EAPI=5
 HOMEPAGE=http://gtkatlantic.gradator.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 dev-libs/libxml2 media-libs/libpng:0
 SLOT=0
 SRC_URI=http://gtkatlantic.gradator.net/downloads/v0.4/gtkatlantic-0.4.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0aedc83f10b5c7653fbb56a7433e353f
diff --git a/metadata/md5-cache/games-board/xboard-4.6.2 b/metadata/md5-cache/games-board/xboard-4.6.2
index 4d367b9fbf4f..399394f8e264 100644
--- a/metadata/md5-cache/games-board/xboard-4.6.2
+++ b/metadata/md5-cache/games-board/xboard-4.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=Xaw3d? ( x11-libs/libXaw3d ) x11-libs/libXpm !Xaw3d? ( x11-libs/libXaw ) x11-libs/libX11 x11-libs/libXt x11-libs/libXmu default-font? ( media-fonts/font-adobe-100dpi[nls] media-fonts/font-misc-misc[nls] ) x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=Xaw3d? ( x11-libs/libXaw3d ) x11-libs/libXpm !Xaw3d? ( x11-libs/libXaw ) x11-libs/libX11 x11-libs/libXt x11-libs/libXmu default-font? ( media-fonts/font-adobe-100dpi[nls] media-fonts/font-misc-misc[nls] ) x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GUI for gnuchess and for internet chess servers
 EAPI=2
 HOMEPAGE=http://www.gnu.org/software/xboard/
@@ -10,5 +10,5 @@ RDEPEND=Xaw3d? ( x11-libs/libXaw3d ) x11-libs/libXpm !Xaw3d? ( x11-libs/libXaw )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/xboard/xboard-4.6.2.tar.gz mirror://gentoo/xboard.png
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=300f7990c4c649f790fe48560dedc578
diff --git a/metadata/md5-cache/games-emulation/advancemenu-2.6 b/metadata/md5-cache/games-emulation/advancemenu-2.6
index e816e5c5090a..43ed3b4a8eb0 100644
--- a/metadata/md5-cache/games-emulation/advancemenu-2.6
+++ b/metadata/md5-cache/games-emulation/advancemenu-2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-libs/expat alsa? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses ) sdl? ( media-libs/libsdl ) slang? ( >=sys-libs/slang-1.4 ) svga? ( >=media-libs/svgalib-1.9 ) !sdl? ( !svga? ( !fbcon? ( media-libs/libsdl ) ) ) truetype? ( >=media-libs/freetype-2 ) x86? ( >=dev-lang/nasm-0.98 ) fbcon? ( virtual/os-headers ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/expat alsa? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses ) sdl? ( media-libs/libsdl ) slang? ( >=sys-libs/slang-1.4 ) svga? ( >=media-libs/svgalib-1.9 ) !sdl? ( !svga? ( !fbcon? ( media-libs/libsdl ) ) ) truetype? ( >=media-libs/freetype-2 ) x86? ( >=dev-lang/nasm-0.98 ) fbcon? ( virtual/os-headers ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Frontend for AdvanceMAME, MAME, MESS, RAINE and any other emulator
 EAPI=5
 HOMEPAGE=http://advancemame.sourceforge.net/menu-readme.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat alsa? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses ) sdl? ( media-libs/libsdl ) slang? ( >=sys-libs/slang-1.4 ) svga? ( >=media-libs/svgalib-1.9 ) !sdl? ( !svga? ( !fbcon? ( media-libs/libsdl ) ) ) truetype? ( >=media-libs/freetype-2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/advancemame/advancemenu-2.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=84493c5b5355a09d2176b923ea980983
diff --git a/metadata/md5-cache/games-emulation/advancescan-1.14 b/metadata/md5-cache/games-emulation/advancescan-1.14
index 960e6fe13e1e..31eceaea4f47 100644
--- a/metadata/md5-cache/games-emulation/advancescan-1.14
+++ b/metadata/md5-cache/games-emulation/advancescan-1.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-libs/expat || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/expat || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A command line rom manager for MAME, MESS, AdvanceMAME, AdvanceMESS and Raine
 EAPI=2
 HOMEPAGE=http://advancemame.sourceforge.net/scan-readme.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat
 SLOT=0
 SRC_URI=mirror://sourceforge/advancemame/advancescan-1.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a16b96d661be656323be328f546b1725
diff --git a/metadata/md5-cache/games-emulation/advancescan-1.16 b/metadata/md5-cache/games-emulation/advancescan-1.16
index 514f30e26be7..cd07a3b93727 100644
--- a/metadata/md5-cache/games-emulation/advancescan-1.16
+++ b/metadata/md5-cache/games-emulation/advancescan-1.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-libs/expat sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/expat sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A command line rom manager for MAME, MESS, AdvanceMAME, AdvanceMESS and Raine
 EAPI=2
 HOMEPAGE=http://advancemame.sourceforge.net/scan-readme.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/advancemame/advancescan-1.16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9fd8c5b467e96a3c4f3129bec2c851b5
diff --git a/metadata/md5-cache/games-emulation/dosbox-9999 b/metadata/md5-cache/games-emulation/dosbox-9999
index a35612b35e69..f7a4c9089f0e 100644
--- a/metadata/md5-cache/games-emulation/dosbox-9999
+++ b/metadata/md5-cache/games-emulation/dosbox-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=alsa? ( media-libs/alsa-lib ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses ) media-libs/libpng:0 media-libs/libsdl[joystick,video,X] media-libs/sdl-net media-libs/sdl-sound || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=alsa? ( media-libs/alsa-lib ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses ) media-libs/libpng:0 media-libs/libsdl[joystick,video,X] media-libs/sdl-net media-libs/sdl-sound || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=DOS emulator
 EAPI=2
 HOMEPAGE=http://dosbox.sourceforge.net/
@@ -7,5 +7,5 @@ IUSE=alsa debug hardened opengl
 LICENSE=GPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses ) media-libs/libpng:0 media-libs/libsdl[joystick,video,X] media-libs/sdl-net media-libs/sdl-sound
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9440161b2719a1984ced2da58194f4bd
diff --git a/metadata/md5-cache/games-emulation/generator-0.35_p3 b/metadata/md5-cache/games-emulation/generator-0.35_p3
index 662db9442804..79acfc332ebf 100644
--- a/metadata/md5-cache/games-emulation/generator-0.35_p3
+++ b/metadata/md5-cache/games-emulation/generator-0.35_p3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/jpeg media-libs/libsdl[joystick,video] sdlaudio? ( media-libs/libsdl[audio] ) svga? ( media-libs/svgalib ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/jpeg media-libs/libsdl[joystick,video] sdlaudio? ( media-libs/libsdl[audio] ) svga? ( media-libs/svgalib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Sega Genesis / Mega Drive emulator
 EAPI=2
 HOMEPAGE=http://www.ghostwhitecrab.com/generator/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg media-libs/libsdl[joystick,video] sdlaudio? ( media-libs/libsdl[audio] ) svga? ( media-libs/svgalib )
 SLOT=0
 SRC_URI=http://www.ghostwhitecrab.com/generator/generator-0.35-cbiere-r3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9947540c7401775d5c0b9ba642e5559d
diff --git a/metadata/md5-cache/games-emulation/gngeo-0.7 b/metadata/md5-cache/games-emulation/gngeo-0.7
index df2bdba4e4b6..d30ac7266b2c 100644
--- a/metadata/md5-cache/games-emulation/gngeo-0.7
+++ b/metadata/md5-cache/games-emulation/gngeo-0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl media-libs/sdl-image media-libs/libsdl sys-libs/zlib[minizip] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/opengl media-libs/sdl-image media-libs/libsdl sys-libs/zlib[minizip] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A NeoGeo emulator
 EAPI=2
 HOMEPAGE=http://m.peponas.free.fr/gngeo/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/opengl media-libs/sdl-image media-libs/libsdl sys-libs/zlib[minizip]
 SLOT=0
 SRC_URI=mirror://berlios/gngeo/gngeo-0.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2089100e2e85d59e3a0942176958fe23
diff --git a/metadata/md5-cache/games-emulation/gnuboy-1.0.3 b/metadata/md5-cache/games-emulation/gnuboy-1.0.3
index 593083de121a..9ae5b664a9e7 100644
--- a/metadata/md5-cache/games-emulation/gnuboy-1.0.3
+++ b/metadata/md5-cache/games-emulation/gnuboy-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Gameboy emulator with multiple renderers
 EAPI=2
 HOMEPAGE=http://code.google.com/p/gnuboy/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sdl? ( media-libs/libsdl ) !X? ( !svga? ( !fbcon? ( media-libs/libsdl ) ) ) X? ( x11-libs/libXext ) fbcon? ( sys-apps/fbset )
 SLOT=0
 SRC_URI=mirror://gentoo/gnuboy-1.0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed41576c419af29c076265df37da81f3
diff --git a/metadata/md5-cache/games-emulation/mamory-0.2.25 b/metadata/md5-cache/games-emulation/mamory-0.2.25
index 739a84831803..9e6f52d98c16 100644
--- a/metadata/md5-cache/games-emulation/mamory-0.2.25
+++ b/metadata/md5-cache/games-emulation/mamory-0.2.25
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst preinst setup unpack
-DEPEND=dev-libs/expat || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/expat || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ROM management tools and library
 HOMEPAGE=http://mamory.sourceforge.net/
 KEYWORDS=~amd64 ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat
 SLOT=0
 SRC_URI=mirror://sourceforge/mamory/mamory-0.2.25.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9415fdb0be03a1ab3bd193e1f864f454
diff --git a/metadata/md5-cache/games-emulation/mednafen-0.9.21 b/metadata/md5-cache/games-emulation/mednafen-0.9.21
index eebb23bf3580..8fc7d5459d1e 100644
--- a/metadata/md5-cache/games-emulation/mednafen-0.9.21
+++ b/metadata/md5-cache/games-emulation/mednafen-0.9.21
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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 ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An advanced NES, GB/GBC/GBA, TurboGrafx 16/CD, NGPC and Lynx emulator
 EAPI=2
 HOMEPAGE=http://mednafen.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mednafen/mednafen-0.9.21-wip.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f8a5ebc745be464c621085fc3cbb0576
diff --git a/metadata/md5-cache/games-emulation/mednafen-0.9.28 b/metadata/md5-cache/games-emulation/mednafen-0.9.28
index feb016b17045..090a8d45a8a4 100644
--- a/metadata/md5-cache/games-emulation/mednafen-0.9.28
+++ b/metadata/md5-cache/games-emulation/mednafen-0.9.28
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl media-libs/libsndfile dev-libs/libcdio media-libs/libsdl[audio,joystick,opengl,video] media-libs/sdl-net sys-libs/zlib[minizip] alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/opengl media-libs/libsndfile dev-libs/libcdio media-libs/libsdl[audio,joystick,opengl,video] media-libs/sdl-net sys-libs/zlib[minizip] alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An advanced NES, GB/GBC/GBA, TurboGrafx 16/CD, NGPC and Lynx emulator
 EAPI=5
 HOMEPAGE=http://mednafen.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/opengl media-libs/libsndfile dev-libs/libcdio media-libs/libsdl[audio,joystick,opengl,video] media-libs/sdl-net sys-libs/zlib[minizip] alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/mednafen/mednafen-0.9.28-wip.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=af0765901eb70d907e8bc7ac4de23c81
diff --git a/metadata/md5-cache/games-emulation/psemu-peopsspu-1.0.9 b/metadata/md5-cache/games-emulation/psemu-peopsspu-1.0.9
index 6f41e5f61b72..49ace61b1718 100644
--- a/metadata/md5-cache/games-emulation/psemu-peopsspu-1.0.9
+++ b/metadata/md5-cache/games-emulation/psemu-peopsspu-1.0.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst preinst setup unpack
-DEPEND=alsa? ( media-libs/alsa-lib ) =x11-libs/gtk+-1* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=alsa? ( media-libs/alsa-lib ) =x11-libs/gtk+-1* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=P.E.Op.S Sound Emulation (SPU) PSEmu Plugin
 HOMEPAGE=http://sourceforge.net/projects/peops/
 IUSE=alsa oss
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib ) =x11-libs/gtk+-1*
 SLOT=0
 SRC_URI=mirror://sourceforge/peops/PeopsSpu109.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3fbe76e458e3be175c4ddb414ce1c044
diff --git a/metadata/md5-cache/games-emulation/snes9x-1.53 b/metadata/md5-cache/games-emulation/snes9x-1.53
index 4ae83a4ca87f..40f3a184e015 100644
--- a/metadata/md5-cache/games-emulation/snes9x-1.53
+++ b/metadata/md5-cache/games-emulation/snes9x-1.53
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=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? ( virtual/pkgconfig xv? ( x11-proto/videoproto ) ) nls? ( dev-util/intltool ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=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? ( virtual/pkgconfig xv? ( x11-proto/videoproto ) ) nls? ( dev-util/intltool ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Super Nintendo Entertainment System (SNES) emulator
 EAPI=2
 HOMEPAGE=http://code.google.com/p/snes9x-gtk/
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext png? ( >=media-libs/libpng-1.2.43:0 ) g
 RESTRICT=bindist
 SLOT=0
 SRC_URI=http://snes9x-gtk.googlecode.com/files/snes9x-1.53-src.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fcfce8de9f72dd065404f64a60852f4b
diff --git a/metadata/md5-cache/games-emulation/tuxnes-0.75-r1 b/metadata/md5-cache/games-emulation/tuxnes-0.75-r1
index 69bd7da248df..f3978fbe4848 100644
--- a/metadata/md5-cache/games-emulation/tuxnes-0.75-r1
+++ b/metadata/md5-cache/games-emulation/tuxnes-0.75-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=emulator for the 8-bit Nintendo Entertainment System
 EAPI=2
 HOMEPAGE=http://tuxnes.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libXext x11-libs/libICE x11-libs/libX11 x11-libs/libXpm x11-libs/libSM ) ggi? ( >=media-libs/libggi-2.0.1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/tuxnes/tuxnes-0.75.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1992b590ffa1c772ee94659829991489
diff --git a/metadata/md5-cache/games-emulation/visualboyadvance-1.7.2-r3 b/metadata/md5-cache/games-emulation/visualboyadvance-1.7.2-r3
index b0356415086e..6fe29d4ee947 100644
--- a/metadata/md5-cache/games-emulation/visualboyadvance-1.7.2-r3
+++ b/metadata/md5-cache/games-emulation/visualboyadvance-1.7.2-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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 ) virtual/pkgconfig mmx? ( dev-lang/nasm ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig mmx? ( dev-lang/nasm ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=gameboy, gameboy color, and gameboy advance emulator
 EAPI=2
 HOMEPAGE=http://vba.ngemu.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vba/VisualBoyAdvance-src-1.7.2.tar.gz mirror://gentoo/visualboyadvance-1.7.2-deprecatedsigc++.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=54c4f1a491c84f6733ca6e2f6855d00b
diff --git a/metadata/md5-cache/games-emulation/zsnes-1.51-r4 b/metadata/md5-cache/games-emulation/zsnes-1.51-r4
index 05a7793c0968..ced739572e39 100644
--- a/metadata/md5-cache/games-emulation/zsnes-1.51-r4
+++ b/metadata/md5-cache/games-emulation/zsnes-1.51-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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 ) debug? ( sys-libs/ncurses ) opengl? ( virtual/opengl ) png? ( media-libs/libpng ) dev-lang/nasm amd64? ( >=sys-apps/portage-2.1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) debug? ( sys-libs/ncurses ) opengl? ( virtual/opengl ) png? ( media-libs/libpng ) dev-lang/nasm amd64? ( >=sys-apps/portage-2.1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=SNES (Super Nintendo) emulator that uses x86 assembly
 EAPI=2
 HOMEPAGE=http://www.zsnes.com/ http://ipherswipsite.com/zsnes/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 ) debug? ( sys-libs/ncurses ) opengl? ( virtual/opengl ) png? ( media-libs/libpng )
 SLOT=0
 SRC_URI=mirror://sourceforge/zsnes/zsnes151src.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3700f622203a9d849532e65a643604df
diff --git a/metadata/md5-cache/games-engines/exult-1.2 b/metadata/md5-cache/games-engines/exult-1.2
index 672f592da981..b89bc8973478 100644
--- a/metadata/md5-cache/games-engines/exult-1.2
+++ b/metadata/md5-cache/games-engines/exult-1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=an Ultima 7 game engine that runs on modern operating systems
 EAPI=2
 HOMEPAGE=http://exult.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=83b48249b3949730698ad89823211ccc
diff --git a/metadata/md5-cache/games-engines/love-9999 b/metadata/md5-cache/games-engines/love-9999
index 6454697c8795..4e00e1c8a196 100644
--- a/metadata/md5-cache/games-engines/love-9999
+++ b/metadata/md5-cache/games-engines/love-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-games/physfs dev-lang/lua[deprecated] media-libs/devil[mng,png,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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/mercurial
+DEPEND=dev-games/physfs dev-lang/lua[deprecated] media-libs/devil[mng,png,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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/mercurial
 DESCRIPTION=A framework for 2D games in Lua
 EAPI=5
 HOMEPAGE=http://love2d.org/
 LICENSE=ZLIB
 RDEPEND=dev-games/physfs dev-lang/lua[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	mercurial	7e8c2c49cfd90701e20a78850f066802	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	mercurial	7e8c2c49cfd90701e20a78850f066802	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6a5ac7709ede93402f844dc8f69ed190
diff --git a/metadata/md5-cache/games-engines/stratagus-2.2.5.5 b/metadata/md5-cache/games-engines/stratagus-2.2.5.5
index a8f7bfc36e49..f9c80d942729 100644
--- a/metadata/md5-cache/games-engines/stratagus-2.2.5.5
+++ b/metadata/md5-cache/games-engines/stratagus-2.2.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A realtime strategy game engine
 EAPI=2
 HOMEPAGE=http://stratagus.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://launchpad.net/stratagus/trunk/2.2.5.5/+download/stratagus_2.2.5.5.orig.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8b1e680aec89d4a2edf654cc7515c7d1
diff --git a/metadata/md5-cache/games-fps/alephone-20100424 b/metadata/md5-cache/games-fps/alephone-20100424
index 90ed724b0ed3..a7b88067193e 100644
--- a/metadata/md5-cache/games-fps/alephone-20100424
+++ b/metadata/md5-cache/games-fps/alephone-20100424
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/sdl-net media-libs/sdl-image media-libs/libsdl[video] dev-libs/expat dev-libs/zziplib media-libs/libpng:0 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/sdl-net media-libs/sdl-image media-libs/libsdl[video] dev-libs/expat dev-libs/zziplib media-libs/libpng:0 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An enhanced version of the game engine from the classic Mac game, Marathon
 EAPI=4
 HOMEPAGE=http://source.bungie.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 BitstreamVera
 RDEPEND=media-libs/sdl-net media-libs/sdl-image media-libs/libsdl[video] dev-libs/expat dev-libs/zziplib media-libs/libpng:0 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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/marathon/AlephOne-20100424.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=071f2b4ef0d485b61260d262dfe1b816
diff --git a/metadata/md5-cache/games-fps/alephone-20120514 b/metadata/md5-cache/games-fps/alephone-20120514
index 6600d1c5c7e5..6bd0346504eb 100644
--- a/metadata/md5-cache/games-fps/alephone-20120514
+++ b/metadata/md5-cache/games-fps/alephone-20120514
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/sdl-net media-libs/sdl-image media-libs/libsdl[video] dev-libs/expat dev-libs/zziplib media-libs/libpng:0 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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/sdl-net media-libs/sdl-image media-libs/libsdl[video] dev-libs/expat dev-libs/zziplib media-libs/libpng:0 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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An enhanced version of the game engine from the classic Mac game, Marathon
 EAPI=5
 HOMEPAGE=http://source.bungie.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 BitstreamVera
 RDEPEND=media-libs/sdl-net media-libs/sdl-image media-libs/libsdl[video] dev-libs/expat dev-libs/zziplib media-libs/libpng:0 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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/marathon/AlephOne-20120514.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f20db1999236510fb260d0c27537db94
diff --git a/metadata/md5-cache/games-fps/alienarena-20120629 b/metadata/md5-cache/games-fps/alienarena-20120629
index 551fa05d7554..108f6aef171a 100644
--- a/metadata/md5-cache/games-fps/alienarena-20120629
+++ b/metadata/md5-cache/games-fps/alienarena-20120629
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=!dedicated? ( virtual/jpeg media-libs/openal media-libs/libvorbis media-libs/freetype:2 virtual/glu virtual/opengl dga? ( x11-libs/libXxf86dga ) vidmode? ( x11-libs/libXxf86vm ) net-misc/curl ) !dedicated? ( dga? ( x11-proto/xf86dgaproto ) vidmode? ( x11-proto/xf86vidmodeproto ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!dedicated? ( virtual/jpeg media-libs/openal media-libs/libvorbis media-libs/freetype:2 virtual/glu virtual/opengl dga? ( x11-libs/libXxf86dga ) vidmode? ( x11-libs/libXxf86vm ) net-misc/curl ) !dedicated? ( dga? ( x11-proto/xf86dgaproto ) vidmode? ( x11-proto/xf86vidmodeproto ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Fast-paced multiplayer deathmatch game
 EAPI=2
 HOMEPAGE=http://red.planetarena.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 free-noncomm
 RDEPEND=!dedicated? ( virtual/jpeg media-libs/openal media-libs/libvorbis media-libs/freetype:2 virtual/glu virtual/opengl dga? ( x11-libs/libXxf86dga ) vidmode? ( x11-libs/libXxf86vm ) net-misc/curl )
 SLOT=0
 SRC_URI=http://icculus.org/alienarena/Files/alienarena-7.60-linux20120629.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5ff742e32df21f91dbd83109d0c71989
diff --git a/metadata/md5-cache/games-fps/quakeforge-0.5.5-r2 b/metadata/md5-cache/games-fps/quakeforge-0.5.5-r2
index 83f9236cd82b..919412966bd9 100644
--- a/metadata/md5-cache/games-fps/quakeforge-0.5.5-r2
+++ b/metadata/md5-cache/games-fps/quakeforge-0.5.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A new 3d engine based off of id Softwares's legendary Quake and QuakeWorld game engine
 EAPI=2
 HOMEPAGE=http://www.quakeforge.net/
@@ -10,5 +10,5 @@ RDEPEND=opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl ) svga? ( media-libs
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/quake/quakeforge-0.5.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2a131fc066fd4e79d0aaf5f992e8625a
diff --git a/metadata/md5-cache/games-fps/quakeforge-0.7.0 b/metadata/md5-cache/games-fps/quakeforge-0.7.0
index ad71c6b149ab..3e2819d26838 100644
--- a/metadata/md5-cache/games-fps/quakeforge-0.7.0
+++ b/metadata/md5-cache/games-fps/quakeforge-0.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsamplerate net-misc/curl png? ( media-libs/libpng ) flac? ( media-libs/flac ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) X? ( x11-libs/libX11 x11-libs/libXext ) 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsamplerate net-misc/curl png? ( media-libs/libpng ) flac? ( media-libs/flac ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) X? ( x11-libs/libX11 x11-libs/libXext ) 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A new 3d engine based off of id Softwares's legendary Quake and QuakeWorld game engine
 EAPI=4
 HOMEPAGE=http://www.quakeforge.net/
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsamplerate net-misc/curl png? ( media-libs/libpng ) flac?
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/quake/quakeforge-0.7.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d567e9b023975d369ca483cc2ebfa660
diff --git a/metadata/md5-cache/games-fps/quakeforge-0.7.2 b/metadata/md5-cache/games-fps/quakeforge-0.7.2
index 080f1c9fc694..a0242e56e17f 100644
--- a/metadata/md5-cache/games-fps/quakeforge-0.7.2
+++ b/metadata/md5-cache/games-fps/quakeforge-0.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsamplerate net-misc/curl virtual/opengl png? ( media-libs/libpng:0 ) flac? ( media-libs/flac ) 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 ) wildmidi? ( media-sound/wildmidi ) cdinstall? ( games-fps/quake1-data ) >=sys-devel/bison-2.6 sys-devel/flex virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsamplerate net-misc/curl virtual/opengl png? ( media-libs/libpng:0 ) flac? ( media-libs/flac ) 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 ) wildmidi? ( media-sound/wildmidi ) cdinstall? ( games-fps/quake1-data ) >=sys-devel/bison-2.6 sys-devel/flex virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A new 3d engine based off of id Softwares's legendary Quake and QuakeWorld game engine
 EAPI=5
 HOMEPAGE=http://www.quakeforge.net/
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsamplerate net-misc/curl virtual/opengl png? ( media-libs/
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/quake/quakeforge-0.7.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5ecced24adedc75e10c697a35d93b136
diff --git a/metadata/md5-cache/games-kids/gcompris-12.11 b/metadata/md5-cache/games-kids/gcompris-12.11
index 5598612f3fe3..b66e4812ff0d 100644
--- a/metadata/md5-cache/games-kids/gcompris-12.11
+++ b/metadata/md5-cache/games-kids/gcompris-12.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/gtk+:2 gnome-base/librsvg[gtk] gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-good:0.10 media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-alsa:0.10 media-plugins/gst-plugins-vorbis:0.10 ) !gstreamer? ( media-libs/sdl-mixer media-libs/libsdl ) dev-libs/libxml2 dev-libs/popt virtual/libintl games-board/gnuchess dev-db/sqlite:3 dev-python/pygtk gnome-base/gnome-common dev-perl/XML-Parser sys-devel/gettext sys-apps/texinfo app-text/texi2html virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] )
+DEPEND=x11-libs/gtk+:2 gnome-base/librsvg[gtk] gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-good:0.10 media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-alsa:0.10 media-plugins/gst-plugins-vorbis:0.10 ) !gstreamer? ( media-libs/sdl-mixer media-libs/libsdl ) dev-libs/libxml2 dev-libs/popt virtual/libintl games-board/gnuchess dev-db/sqlite:3 dev-python/pygtk gnome-base/gnome-common dev-perl/XML-Parser sys-devel/gettext sys-apps/texinfo app-text/texi2html virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] )
 DESCRIPTION=full featured educational application for children from 2 to 10
 EAPI=5
 HOMEPAGE=http://gcompris.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:2 gnome-base/librsvg[gtk] gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-good:0.10 media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-alsa:0.10 media-plugins/gst-plugins-vorbis:0.10 ) !gstreamer? ( media-libs/sdl-mixer media-libs/libsdl ) dev-libs/libxml2 dev-libs/popt virtual/libintl games-board/gnuchess dev-db/sqlite:3 dev-python/pygtk media-gfx/tuxpaint sci-electronics/gnucap || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] )
 SLOT=0
 SRC_URI=mirror://sourceforge/gcompris/gcompris-12.11.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c4aaf3783e96851913c707eac45afd15
diff --git a/metadata/md5-cache/games-misc/lucidlife-0.9.2 b/metadata/md5-cache/games-misc/lucidlife-0.9.2
index ac6fa8e9d7ce..f45d4960b358 100644
--- a/metadata/md5-cache/games-misc/lucidlife-0.9.2
+++ b/metadata/md5-cache/games-misc/lucidlife-0.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-util/intltool virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-util/intltool virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Conway's Life simulator written in GTK+2 - fork from Gtklife
 EAPI=2
 HOMEPAGE=http://linux.softpedia.com/get/GAMES-ENTERTAINMENT/Simulation/LucidLife-26633.shtml
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://gentoo/lucidlife-0.9.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c874dfb657c3ce39912e51858362b3ce
diff --git a/metadata/md5-cache/games-misc/typespeed-0.6.5 b/metadata/md5-cache/games-misc/typespeed-0.6.5
index 20c9a8fd2dcd..9b42f7303e7b 100644
--- a/metadata/md5-cache/games-misc/typespeed-0.6.5
+++ b/metadata/md5-cache/games-misc/typespeed-0.6.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=sys-libs/ncurses nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Test your typing speed, and get your fingers CPS
 EAPI=2
 HOMEPAGE=http://typespeed.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/typespeed/typespeed-0.6.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f09ae7050c027b84ca3e855392972145
diff --git a/metadata/md5-cache/games-mud/gmudix-1.0 b/metadata/md5-cache/games-mud/gmudix-1.0
index 158da1d8f9f0..55bdf7f8c32f 100644
--- a/metadata/md5-cache/games-mud/gmudix-1.0
+++ b/metadata/md5-cache/games-mud/gmudix-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK+ MUD client with ANSI color, macros, timers, triggers, variables, and an easy scripting language
 EAPI=2
 HOMEPAGE=http://dw.nl.eu.org/mudix.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://dw.nl.eu.org/gmudix/gmudix-1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=23a3162533a1ab42eabef7d775893bfe
diff --git a/metadata/md5-cache/games-mud/kildclient-2.9.0 b/metadata/md5-cache/games-mud/kildclient-2.9.0
index 7f3100495225..11c8eae87718 100644
--- a/metadata/md5-cache/games-mud/kildclient-2.9.0
+++ b/metadata/md5-cache/games-mud/kildclient-2.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Powerful MUD client with a built-in PERL interpreter
 EAPI=2
 HOMEPAGE=http://kildclient.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:2 gnome-base/libglade dev-lang/perl sys-libs/zlib virtual/libintl spell? ( app-text/gtkspell:2 ) gnutls? ( net-libs/gnutls )
 SLOT=0
 SRC_URI=mirror://sourceforge/kildclient/kildclient-2.9.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b9be8913fbb67a412a5d548a3ff52fdb
diff --git a/metadata/md5-cache/games-mud/powwow-1.2.16 b/metadata/md5-cache/games-mud/powwow-1.2.16
index ce54a0490597..40f6863ee801 100644
--- a/metadata/md5-cache/games-mud/powwow-1.2.16
+++ b/metadata/md5-cache/games-mud/powwow-1.2.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=PowWow Console MUD Client
 EAPI=2
 HOMEPAGE=http://hoopajoo.net/projects/powwow.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://hoopajoo.net/static/projects/powwow-1.2.16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=da3d81fe7d3c814906a7b423207d10b6
diff --git a/metadata/md5-cache/games-mud/wxmud-9999 b/metadata/md5-cache/games-mud/wxmud-9999
index 3d9b972e8ef8..2ec2fa24b7a7 100644
--- a/metadata/md5-cache/games-mud/wxmud-9999
+++ b/metadata/md5-cache/games-mud/wxmud-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/wxGTK:2.8 >=x11-libs/gtk+-2.4:2 python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/wxGTK:2.8 >=x11-libs/gtk+-2.4:2 python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Cross-platform MUD client
 EAPI=5
 HOMEPAGE=http://wxmud.sourceforge.net/
@@ -7,5 +7,5 @@ IUSE=python python_targets_python2_5 python_targets_python2_6 python_targets_pyt
 LICENSE=GPL-2
 RDEPEND=x11-libs/wxGTK:2.8 >=x11-libs/gtk+-2.4:2 python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=1652489efe1790e80203535535a80566
diff --git a/metadata/md5-cache/games-puzzle/amoebax-0.2.0 b/metadata/md5-cache/games-puzzle/amoebax-0.2.0
index 7e053701716e..3c4e35b65a88 100644
--- a/metadata/md5-cache/games-puzzle/amoebax-0.2.0
+++ b/metadata/md5-cache/games-puzzle/amoebax-0.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[audio,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl[audio,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a cute and addictive action-puzzle game, similar to tetris
 EAPI=2
 HOMEPAGE=http://www.emma-soft.com/games/amoebax/
@@ -8,5 +8,5 @@ LICENSE=FreeArt GPL-2
 RDEPEND=media-libs/libsdl[audio,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis]
 SLOT=0
 SRC_URI=http://www.emma-soft.com/games/amoebax/download/amoebax-0.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b9363a13bb301fea4715a44d449a6a7b
diff --git a/metadata/md5-cache/games-puzzle/construo-0.2.2 b/metadata/md5-cache/games-puzzle/construo-0.2.2
index e7ceb5ff2d4d..349843ae608f 100644
--- a/metadata/md5-cache/games-puzzle/construo-0.2.2
+++ b/metadata/md5-cache/games-puzzle/construo-0.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl virtual/glu media-libs/freeglut x11-libs/libXxf86vm x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/opengl virtual/glu media-libs/freeglut x11-libs/libXxf86vm x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=2d construction toy with objects that react on physical forces
 EAPI=2
 HOMEPAGE=http://www.nongnu.org/construo/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/opengl virtual/glu media-libs/freeglut x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=http://freesoftware.fsf.org/download/construo/construo.pkg/0.2.2/construo-0.2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b6c851d2514e18d2f34093e4937b25c9
diff --git a/metadata/md5-cache/games-puzzle/cuyo-2.1.1 b/metadata/md5-cache/games-puzzle/cuyo-2.1.1
index af468a7d1b17..f8c8296e2765 100644
--- a/metadata/md5-cache/games-puzzle/cuyo-2.1.1
+++ b/metadata/md5-cache/games-puzzle/cuyo-2.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=sys-libs/zlib media-libs/libsdl[audio,video] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) media-libs/sdl-image || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=sys-libs/zlib media-libs/libsdl[audio,video] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) media-libs/sdl-image || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=highly addictive and remotely related to tetris
 EAPI=2
 HOMEPAGE=http://www.karimmi.de/cuyo/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib media-libs/libsdl[audio,video] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) media-libs/sdl-image
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/cuyo/cuyo-2.~-1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b044b730b37de71cada6f66aa1c9d098
diff --git a/metadata/md5-cache/games-puzzle/enigma-1.01 b/metadata/md5-cache/games-puzzle/enigma-1.01
index 1bd6348b95fc..0be59e57b7bb 100644
--- a/metadata/md5-cache/games-puzzle/enigma-1.01
+++ b/metadata/md5-cache/games-puzzle/enigma-1.01
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/sdl-ttf media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image[jpeg,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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/sdl-ttf media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image[jpeg,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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=puzzle game similar to Oxyd
 EAPI=2
 HOMEPAGE=http://www.nongnu.org/enigma/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/sdl-ttf media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image[jpeg,png] media-libs/libpng || ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] ) net-libs/enet:0 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://berlios/enigma-game/enigma-1.01-64bit.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=96817a32ee7d3825cb5007cac6c58eba
diff --git a/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1 b/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1
index 28710ba91728..af6701b29add 100644
--- a/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1
+++ b/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Underwater puzzle game - find a safe way out
 EAPI=2
 HOMEPAGE=http://fillets.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://sourceforge/fillets/fillets-ng-1.0.1.tar.gz mirror://sourceforge/fillets/fillets-ng-data-1.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6f33f8270e463394377a5a3bd70581ad
diff --git a/metadata/md5-cache/games-puzzle/groundhog-1.4 b/metadata/md5-cache/games-puzzle/groundhog-1.4
index eb14d740b63f..4736f762c4df 100644
--- a/metadata/md5-cache/games-puzzle/groundhog-1.4
+++ b/metadata/md5-cache/games-puzzle/groundhog-1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Put the balls in the pockets of the same color by manipulating a maze of tubes
 EAPI=2
 HOMEPAGE=http://home-2.consunet.nl/~cb007736/groundhog.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://home-2.consunet.nl/~cb007736/groundhog-1.4.tar.gz mirror://debian/pool/main/g/groundhog/groundhog_1.4-9.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9d67d22d539b7828dd56106dc2174729
diff --git a/metadata/md5-cache/games-puzzle/gtetrinet-0.7.11-r1 b/metadata/md5-cache/games-puzzle/gtetrinet-0.7.11-r1
index c669ce88ef98..92a9a72af4e0 100644
--- a/metadata/md5-cache/games-puzzle/gtetrinet-0.7.11-r1
+++ b/metadata/md5-cache/games-puzzle/gtetrinet-0.7.11-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/libxml2 media-libs/libcanberra >=gnome-base/gconf-2 >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-libs/libxml2 media-libs/libcanberra >=gnome-base/gconf-2 >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Tetrinet Clone for GNOME 2
 EAPI=2
 HOMEPAGE=http://gtetrinet.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 media-libs/libcanberra >=gnome-base/gconf-2 >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtetrinet/0.7/gtetrinet-0.7.11.tar.bz2 mirror://gentoo/gtetrinet-gentoo-theme-0.1.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6637f12e945ac5a3eb1e1bdc557e5078
diff --git a/metadata/md5-cache/games-puzzle/lmarbles-1.0.8 b/metadata/md5-cache/games-puzzle/lmarbles-1.0.8
index 0ca6b2305942..3501a84f5891 100644
--- a/metadata/md5-cache/games-puzzle/lmarbles-1.0.8
+++ b/metadata/md5-cache/games-puzzle/lmarbles-1.0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=puzzle game inspired by Atomix and written in SDL
 EAPI=2
 HOMEPAGE=http://lgames.sourceforge.net/index.php?project=LMarbles
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer
 SLOT=0
 SRC_URI=mirror://sourceforge/lgames/lmarbles-1.0.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8630fc6439e3e9a9ce66397d65bd1187
diff --git a/metadata/md5-cache/games-puzzle/ltris-1.0.18 b/metadata/md5-cache/games-puzzle/ltris-1.0.18
index 0e3782d614b2..984a817c8f3f 100644
--- a/metadata/md5-cache/games-puzzle/ltris-1.0.18
+++ b/metadata/md5-cache/games-puzzle/ltris-1.0.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=very polished Tetris clone
 EAPI=2
 HOMEPAGE=http://lgames.sourceforge.net/index.php?project=LTris
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/lgames/ltris-1.0.18.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=34a20533d24c1204843650932e291fdc
diff --git a/metadata/md5-cache/games-puzzle/mures-0.5 b/metadata/md5-cache/games-puzzle/mures-0.5
index 4f4d11d57d67..799112eb103b 100644
--- a/metadata/md5-cache/games-puzzle/mures-0.5
+++ b/metadata/md5-cache/games-puzzle/mures-0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl media-libs/sdl-image media-libs/sdl-net media-libs/sdl-ttf opengl? ( virtual/opengl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl media-libs/sdl-image media-libs/sdl-net media-libs/sdl-ttf opengl? ( virtual/opengl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A clone of Sega's Chu Chu Rocket
 EAPI=2
 HOMEPAGE=http://mures.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl media-libs/sdl-image media-libs/sdl-net media-libs/sdl-ttf opengl? ( virtual/opengl )
 SLOT=0
 SRC_URI=mirror://sourceforge/mures/mures-0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8aaf240aa809cd99a8a5dce05e3934b3
diff --git a/metadata/md5-cache/games-puzzle/shaaft-0.5.0 b/metadata/md5-cache/games-puzzle/shaaft-0.5.0
index 49a3ffcb1d66..5c0dcb39e4f5 100644
--- a/metadata/md5-cache/games-puzzle/shaaft-0.5.0
+++ b/metadata/md5-cache/games-puzzle/shaaft-0.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl sys-libs/zlib media-libs/libpng:0 media-libs/libsdl[audio,opengl,video] media-libs/sdl-mixer[mod] media-libs/sdl-image[png] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/opengl sys-libs/zlib media-libs/libpng:0 media-libs/libsdl[audio,opengl,video] media-libs/sdl-mixer[mod] media-libs/sdl-image[png] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A falling block game similar to Blockout
 EAPI=2
 HOMEPAGE=http://packages.gentoo.org/package/games-puzzle/shaaft
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/opengl sys-libs/zlib media-libs/libpng:0 media-libs/libsdl[audio,opengl,video] media-libs/sdl-mixer[mod] media-libs/sdl-image[png]
 SLOT=0
 SRC_URI=mirror://sourceforge/criticalmass/Shaaft-0.5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=64a886842ea5c6a34fac7b66f9622253
diff --git a/metadata/md5-cache/games-puzzle/xlogical-1.0.7 b/metadata/md5-cache/games-puzzle/xlogical-1.0.7
index 5702c305396a..482d93b4e390 100644
--- a/metadata/md5-cache/games-puzzle/xlogical-1.0.7
+++ b/metadata/md5-cache/games-puzzle/xlogical-1.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod] alt_gfx? ( app-arch/unzip ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod] alt_gfx? ( app-arch/unzip ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=SDL logical clone
 EAPI=2
 HOMEPAGE=http://changeling.ixionstudios.com/xlogical/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod]
 SLOT=0
 SRC_URI=http://changeling.ixionstudios.com/xlogical/downloads/xlogical-1.0-7.tar.bz2 alt_gfx? ( http://changeling.ixionstudios.com/xlogical/downloads/xlogical_gfx.zip )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a98c3d02730979598193306fffe4b003
diff --git a/metadata/md5-cache/games-puzzle/xye-0.12.0 b/metadata/md5-cache/games-puzzle/xye-0.12.0
index 1df25932a94f..c1f87ccbf06b 100644
--- a/metadata/md5-cache/games-puzzle/xye-0.12.0
+++ b/metadata/md5-cache/games-puzzle/xye-0.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-image[png] media-fonts/dejavu || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-image[png] media-fonts/dejavu || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free version of the classic game Kye
 EAPI=4
 HOMEPAGE=http://xye.sourceforge.net/
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=mirror://sourceforge/xye/xye-0.12.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e886485c1419ba11c3d87a4d3768bd3a
diff --git a/metadata/md5-cache/games-puzzle/xye-0.12.1 b/metadata/md5-cache/games-puzzle/xye-0.12.1
index 3c4573bbfa4c..1395a009972d 100644
--- a/metadata/md5-cache/games-puzzle/xye-0.12.1
+++ b/metadata/md5-cache/games-puzzle/xye-0.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-image[png] media-fonts/dejavu || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-image[png] media-fonts/dejavu || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free version of the classic game Kye
 EAPI=5
 HOMEPAGE=http://xye.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-image[png] media-fonts/dejavu
 SLOT=0
 SRC_URI=mirror://sourceforge/xye/xye-0.12.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3325bfa0388c7b7012fd19a7a1115a49
diff --git a/metadata/md5-cache/games-puzzle/zaz-1.0.0 b/metadata/md5-cache/games-puzzle/zaz-1.0.0
index 7e769f6b59bc..44e066ab5897 100644
--- a/metadata/md5-cache/games-puzzle/zaz-1.0.0
+++ b/metadata/md5-cache/games-puzzle/zaz-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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 virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A puzzle game where the player has to arrange balls in triplets
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/zaz/
@@ -9,5 +9,5 @@ LICENSE=GPL-3 CC-BY-SA-3.0
 RDEPEND=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
 SLOT=0
 SRC_URI=mirror://sourceforge/zaz/zaz-1.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7db044320cfb345508bc4c7c47c888bf
diff --git a/metadata/md5-cache/games-roguelike/crossfire-client-1.12.0 b/metadata/md5-cache/games-roguelike/crossfire-client-1.12.0
index 665380aaa442..7b181eeaec52 100644
--- a/metadata/md5-cache/games-roguelike/crossfire-client-1.12.0
+++ b/metadata/md5-cache/games-roguelike/crossfire-client-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Client for the nethack-style but more in the line of UO
 EAPI=2
 HOMEPAGE=http://crossfire.real-time.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=mirror://sourceforge/crossfire/crossfire-client-1.12.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c82713f6726d3eb926ac5c82de944e79
diff --git a/metadata/md5-cache/games-roguelike/crossfire-client-1.70.0-r1 b/metadata/md5-cache/games-roguelike/crossfire-client-1.70.0-r1
index 4627a652f3a7..006d1059a9a7 100644
--- a/metadata/md5-cache/games-roguelike/crossfire-client-1.70.0-r1
+++ b/metadata/md5-cache/games-roguelike/crossfire-client-1.70.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=alsa? ( media-libs/alsa-lib ) virtual/opengl x11-libs/gtk+:2 gnome-base/libglade sdl? ( media-libs/libsdl[video] media-libs/sdl-image ) lua? ( dev-lang/lua ) net-misc/curl media-libs/freeglut media-libs/libpng:0 sys-libs/zlib virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=alsa? ( media-libs/alsa-lib ) virtual/opengl x11-libs/gtk+:2 gnome-base/libglade sdl? ( media-libs/libsdl[video] media-libs/sdl-image ) lua? ( dev-lang/lua ) net-misc/curl media-libs/freeglut media-libs/libpng:0 sys-libs/zlib virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Client for the nethack-style but more in the line of UO
 EAPI=5
 HOMEPAGE=http://crossfire.real-time.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib ) virtual/opengl x11-libs/gtk+:2 gnome-base/libglade sdl? ( media-libs/libsdl[video] media-libs/sdl-image ) lua? ( dev-lang/lua ) net-misc/curl media-libs/freeglut media-libs/libpng:0 sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/crossfire/crossfire-client-1.70.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ffa847ec16fdf870c3746e72c7a4d828
diff --git a/metadata/md5-cache/games-roguelike/hengband-1.6.2-r1 b/metadata/md5-cache/games-roguelike/hengband-1.6.2-r1
index 7b9cbe3958d1..a75d9d28f5b7 100644
--- a/metadata/md5-cache/games-roguelike/hengband-1.6.2-r1
+++ b/metadata/md5-cache/games-roguelike/hengband-1.6.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=sys-libs/ncurses-5 X? ( x11-libs/libX11 ) X? ( x11-libs/libXt ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5 X? ( x11-libs/libX11 ) X? ( x11-libs/libXt ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An Angband variant, with a Japanese/fantasy theme
 EAPI=2
 HOMEPAGE=http://hengband.sourceforge.jp/en/
@@ -9,5 +9,5 @@ LICENSE=Moria
 RDEPEND=>=sys-libs/ncurses-5 X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/hengband/10331/hengband-1.6.2.tar.bz2 mirror://gentoo/hengband-1.6.2-mispellings.patch.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0c3c139565a20f2267b61b622ba8b2f9
diff --git a/metadata/md5-cache/games-roguelike/scourge-0.21.1 b/metadata/md5-cache/games-roguelike/scourge-0.21.1
index 8833eee2b6b7..f962e3a5a228 100644
--- a/metadata/md5-cache/games-roguelike/scourge-0.21.1
+++ b/metadata/md5-cache/games-roguelike/scourge-0.21.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A graphical rogue-like adventure game
 EAPI=2
 HOMEPAGE=http://scourgeweb.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=mirror://sourceforge/scourge/scourge-0.21.1.src.tar.gz mirror://sourceforge/scourge/scourge-0.21.1.data.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=89dce9c2bc5faef1bfe141c89189d40f
diff --git a/metadata/md5-cache/games-roguelike/zangband-2.7.4c b/metadata/md5-cache/games-roguelike/zangband-2.7.4c
index 3d043ec97917..20c12d8b2e9d 100644
--- a/metadata/md5-cache/games-roguelike/zangband-2.7.4c
+++ b/metadata/md5-cache/games-roguelike/zangband-2.7.4c
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=tk? ( dev-lang/tcl dev-lang/tk ) x11-libs/libXaw x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=tk? ( dev-lang/tcl dev-lang/tk ) x11-libs/libXaw x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An enhanced version of the Roguelike game Angband
 EAPI=2
 HOMEPAGE=http://www.zangband.org/
@@ -9,5 +9,5 @@ LICENSE=Moria
 RDEPEND=tk? ( dev-lang/tcl dev-lang/tk ) x11-libs/libXaw
 SLOT=0
 SRC_URI=ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/zangband-2.7.4c.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d857d3ed982a17d9a6946918df7ad0a4
diff --git a/metadata/md5-cache/games-rpg/adonthell-0.3.5 b/metadata/md5-cache/games-rpg/adonthell-0.3.5
index afe6682ea15d..dd67c6a85161 100644
--- a/metadata/md5-cache/games-rpg/adonthell-0.3.5
+++ b/metadata/md5-cache/games-rpg/adonthell-0.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=roleplaying game engine
 EAPI=2
 HOMEPAGE=http://adonthell.linuxgames.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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*
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/adonthell/adonthell-src-0.3.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=44d26e866b6e15fe36d5b85353fbfca2
diff --git a/metadata/md5-cache/games-rpg/adonthell-0.3.5-r1 b/metadata/md5-cache/games-rpg/adonthell-0.3.5-r1
index 04448108b208..35b4560252a9 100644
--- a/metadata/md5-cache/games-rpg/adonthell-0.3.5-r1
+++ b/metadata/md5-cache/games-rpg/adonthell-0.3.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=roleplaying game engine
 EAPI=5
 HOMEPAGE=http://adonthell.linuxgames.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] 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 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/adonthell/adonthell-src-0.3.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=43fca9f38a51b9afbfea86ca5b935018
diff --git a/metadata/md5-cache/games-rpg/daimonin-client-0.10.5 b/metadata/md5-cache/games-rpg/daimonin-client-0.10.5
index 0c486daf038a..26f1f9bb8b75 100644
--- a/metadata/md5-cache/games-rpg/daimonin-client-0.10.5
+++ b/metadata/md5-cache/games-rpg/daimonin-client-0.10.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a graphical 2D tile-based MMORPG
 EAPI=2
 HOMEPAGE=http://daimonin.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[audio,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] dev-games/physfs net-misc/curl
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=52ea798e08e22d58c7986b99bcde1b49
diff --git a/metadata/md5-cache/games-rpg/manaplus-1.3.2.3 b/metadata/md5-cache/games-rpg/manaplus-1.3.2.3
index d7a0dba8cb4d..8741b2699665 100644
--- a/metadata/md5-cache/games-rpg/manaplus-1.3.2.3
+++ b/metadata/md5-cache/games-rpg/manaplus-1.3.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=dev-games/physfs-1.0.0 dev-libs/libxml2 media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-ttf net-misc/curl sys-libs/zlib media-libs/libpng:0 media-fonts/dejavu >=dev-games/guichan-0.8.1[sdl] media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils x11-misc/xsel nls? ( virtual/libintl ) opengl? ( virtual/opengl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-games/physfs-1.0.0 dev-libs/libxml2 media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-ttf net-misc/curl sys-libs/zlib media-libs/libpng:0 media-fonts/dejavu >=dev-games/guichan-0.8.1[sdl] media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils x11-misc/xsel nls? ( virtual/libintl ) opengl? ( virtual/opengl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenSource 2D MMORPG client for Evol Online and The Mana World
 EAPI=5
 HOMEPAGE=http://manaplus.evolonline.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-games/physfs-1.0.0 dev-libs/libxml2 media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-ttf net-misc/curl sys-libs/zlib media-libs/libpng:0 media-fonts/dejavu >=dev-games/guichan-0.8.1[sdl] media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils x11-misc/xsel nls? ( virtual/libintl ) opengl? ( virtual/opengl )
 SLOT=0
 SRC_URI=http://download.evolonline.org/manaplus/download/1.3.2.3/manaplus-1.3.2.3.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=09329219469ab114247099a7c10b3a36
diff --git a/metadata/md5-cache/games-server/cyphesis-0.6.0 b/metadata/md5-cache/games-server/cyphesis-0.6.0
index 84410beacf33..70cbe201665b 100644
--- a/metadata/md5-cache/games-server/cyphesis-0.6.0
+++ b/metadata/md5-cache/games-server/cyphesis-0.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=media-libs/skstream-0.3.9 >=dev-games/wfmath-1.0.1 >=dev-games/mercator-0.3.1 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/boost-1.40 dev-libs/libxml2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=>=media-libs/skstream-0.3.9 >=dev-games/wfmath-1.0.1 >=dev-games/mercator-0.3.1 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/boost-1.40 dev-libs/libxml2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=WorldForge server running small games
 EAPI=5
 HOMEPAGE=http://worldforge.org/dev/eng/servers/cyphesis
@@ -9,5 +9,5 @@ RDEPEND=>=media-libs/skstream-0.3.9 >=dev-games/wfmath-1.0.1 >=dev-games/mercato
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/worldforge/cyphesis-0.6.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1016670c0d42c3b0c4c17e018b8fd26e
diff --git a/metadata/md5-cache/games-simulation/crrcsim-0.9.12 b/metadata/md5-cache/games-simulation/crrcsim-0.9.12
index cb657beeeb4f..2c32da24cbf1 100644
--- a/metadata/md5-cache/games-simulation/crrcsim-0.9.12
+++ b/metadata/md5-cache/games-simulation/crrcsim-0.9.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-mathematics/cgal media-libs/plib media-libs/libsdl[X,audio,joystick,opengl,video] portaudio? ( media-libs/portaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/crrcsim/crrcsim-0.9.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fd4c2c43bb433c7047d72bb7feeb86df
diff --git a/metadata/md5-cache/games-simulation/fgrun-1.6.0 b/metadata/md5-cache/games-simulation/fgrun-1.6.0
index 94184f3b234d..73044e45427e 100644
--- a/metadata/md5-cache/games-simulation/fgrun-1.6.0
+++ b/metadata/md5-cache/games-simulation/fgrun-1.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A graphical frontend for the FlightGear Flight Simulator
 EAPI=3
 HOMEPAGE=http://sourceforge.net/projects/fgrun
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-games/openscenegraph-3.0.1 sys-libs/zlib x11-libs/fltk:1[opengl,threads] >=games-simulation/flightgear-2
 SLOT=0
 SRC_URI=mirror://sourceforge/fgrun/fgrun-1.6.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a2b604edc9c3604fa2141a681629d967
diff --git a/metadata/md5-cache/games-sports/foobillard-3.0a b/metadata/md5-cache/games-sports/foobillard-3.0a
index 9553975fbf8f..024805d61645 100644
--- a/metadata/md5-cache/games-sports/foobillard-3.0a
+++ b/metadata/md5-cache/games-sports/foobillard-3.0a
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=8ball, 9ball, snooker and carambol game
 EAPI=2
 HOMEPAGE=http://foobillard.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://gentoo/foobillard-3.0a.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=312928c40c952269e7b0d0af855dec20
diff --git a/metadata/md5-cache/games-sports/speed-dreams-1.4.0 b/metadata/md5-cache/games-sports/speed-dreams-1.4.0
index 552a156c4368..cf5b84ef8ea4 100644
--- a/metadata/md5-cache/games-sports/speed-dreams-1.4.0
+++ b/metadata/md5-cache/games-sports/speed-dreams-1.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fork of the famous open racing car simulator TORCS
 EAPI=2
 HOMEPAGE=http://speed-dreams.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=mirror://sourceforge/speed-dreams/speed-dreams-1.4.0-r2307-src.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=788926612f015885afdbb415d4030bcf
diff --git a/metadata/md5-cache/games-sports/torcs-1.3.4 b/metadata/md5-cache/games-sports/torcs-1.3.4
index 14a38283b36e..5aa60c117e95 100644
--- a/metadata/md5-cache/games-sports/torcs-1.3.4
+++ b/metadata/md5-cache/games-sports/torcs-1.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/freealut media-libs/freeglut media-libs/libpng:0 media-libs/libvorbis media-libs/openal >=media-libs/plib-1.8.4 sys-libs/zlib virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXrandr x11-libs/libXt x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/freealut media-libs/freeglut media-libs/libpng:0 media-libs/libvorbis media-libs/openal >=media-libs/plib-1.8.4 sys-libs/zlib virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXrandr x11-libs/libXt x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Open Racing Car Simulator
 EAPI=5
 HOMEPAGE=http://torcs.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2 FreeArt
 RDEPEND=media-libs/freealut media-libs/freeglut media-libs/libpng:0 media-libs/libvorbis media-libs/openal >=media-libs/plib-1.8.4 sys-libs/zlib virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXrandr x11-libs/libXt
 SLOT=0
 SRC_URI=mirror://sourceforge/torcs/torcs-1.3.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=17f318010d9c4f7a249a4c9aca9d16e8
diff --git a/metadata/md5-cache/games-sports/trophy-1.1.5 b/metadata/md5-cache/games-sports/trophy-1.1.5
index 2b165c9c67bc..18e6026e6dc2 100644
--- a/metadata/md5-cache/games-sports/trophy-1.1.5
+++ b/metadata/md5-cache/games-sports/trophy-1.1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-games/clanlib:0.8[opengl] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-games/clanlib:0.8[opengl] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=2D Racing Game
 EAPI=2
 HOMEPAGE=http://trophy.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-games/clanlib:0.8[opengl]
 SLOT=0
 SRC_URI=mirror://sourceforge/trophy/trophy-1.1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2db2da2cc705d1d7fe56dd6c57d53f5c
diff --git a/metadata/md5-cache/games-sports/ultimatestunts-0.7.6 b/metadata/md5-cache/games-sports/ultimatestunts-0.7.6
index af0dd48f8722..c0bb9b825c5e 100644
--- a/metadata/md5-cache/games-sports/ultimatestunts-0.7.6
+++ b/metadata/md5-cache/games-sports/ultimatestunts-0.7.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Remake of the famous Stunts game
 EAPI=2
 HOMEPAGE=http://www.ultimatestunts.nl/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ultimatestunts/ultimatestunts-srcdata-0761.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f245a3b7c6dda1ad2a71a16cbab86303
diff --git a/metadata/md5-cache/games-strategy/dunelegacy-0.96.2 b/metadata/md5-cache/games-strategy/dunelegacy-0.96.2
index 18f61168eb40..329877b4ca75 100644
--- a/metadata/md5-cache/games-strategy/dunelegacy-0.96.2
+++ b/metadata/md5-cache/games-strategy/dunelegacy-0.96.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=media-libs/libsdl[X,alsa?,audio,pulseaudio?,video] media-libs/sdl-mixer[midi,mp3,vorbis] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=media-libs/libsdl[X,alsa?,audio,pulseaudio?,video] media-libs/sdl-mixer[midi,mp3,vorbis] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Updated clone of Westood Studios' Dune2
 EAPI=4
 HOMEPAGE=http://dunelegacy.sourceforge.net
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsdl[X,alsa?,audio,pulseaudio?,video] media-libs/sdl-mixer[
 REQUIRED_USE=|| ( alsa pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/dunelegacy/dunelegacy-0.96.2-src.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fc90d9fe7caad322f4466abafb5a2813
diff --git a/metadata/md5-cache/games-strategy/dunelegacy-0.96.3 b/metadata/md5-cache/games-strategy/dunelegacy-0.96.3
index 6a3973bb1877..6a18a982a117 100644
--- a/metadata/md5-cache/games-strategy/dunelegacy-0.96.3
+++ b/metadata/md5-cache/games-strategy/dunelegacy-0.96.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=media-libs/libsdl[X,alsa?,audio,pulseaudio?,video] media-libs/sdl-mixer[midi,mp3,vorbis] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=media-libs/libsdl[X,alsa?,audio,pulseaudio?,video] media-libs/sdl-mixer[midi,mp3,vorbis] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Updated clone of Westood Studios' Dune2
 EAPI=5
 HOMEPAGE=http://dunelegacy.sourceforge.net
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsdl[X,alsa?,audio,pulseaudio?,video] media-libs/sdl-mixer[
 REQUIRED_USE=|| ( alsa pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/dunelegacy/dunelegacy-0.96.3-src.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=14e94026aaf56c5538e3076ceba1ac6a
diff --git a/metadata/md5-cache/games-strategy/lgeneral-1.2.3 b/metadata/md5-cache/games-strategy/lgeneral-1.2.3
index 08e4ea02d63f..9bb14c948ce4 100644
--- a/metadata/md5-cache/games-strategy/lgeneral-1.2.3
+++ b/metadata/md5-cache/games-strategy/lgeneral-1.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[audio,video] media-libs/sdl-mixer nls? ( virtual/libintl ) sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl[audio,video] media-libs/sdl-mixer nls? ( virtual/libintl ) sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Panzer General clone written in SDL
 EAPI=2
 HOMEPAGE=http://lgames.sourceforge.net/index.php?project=LGeneral
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[audio,video] media-libs/sdl-mixer nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/lgeneral/lgeneral-1.2.3.tar.gz mirror://sourceforge/lgeneral/pg-data.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2129aad37163f1f8894e089d2271bca0
diff --git a/metadata/md5-cache/games-strategy/scorched3d-43.3d b/metadata/md5-cache/games-strategy/scorched3d-43.3d
index 894e4dd4be3a..cbf4d5242fa4 100644
--- a/metadata/md5-cache/games-strategy/scorched3d-43.3d
+++ b/metadata/md5-cache/games-strategy/scorched3d-43.3d
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Multi-player tank battle in 3D (OpenGL)
 EAPI=2
 HOMEPAGE=http://www.scorched3d.co.uk/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/scorched3d/Scorched3D-43.3d-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=b3b092e4dbb417996407c9796a4de3ad
diff --git a/metadata/md5-cache/games-strategy/seven-kingdoms-2.14.3 b/metadata/md5-cache/games-strategy/seven-kingdoms-2.14.3
index cf17d5ab2867..d4409f2f5b79 100644
--- a/metadata/md5-cache/games-strategy/seven-kingdoms-2.14.3
+++ b/metadata/md5-cache/games-strategy/seven-kingdoms-2.14.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=media-libs/libsdl[X,video] media-libs/sdl-net media-libs/openal || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl[X,video] media-libs/sdl-net media-libs/openal || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Seven Kingdoms: Ancient Adversaries
 EAPI=4
 HOMEPAGE=http://7kfans.com/
@@ -9,5 +9,5 @@ PDEPEND=games-strategy/seven-kingdoms-data
 RDEPEND=media-libs/libsdl[X,video] media-libs/sdl-net media-libs/openal
 SLOT=0
 SRC_URI=mirror://sourceforge/skfans/7kaa-source-2.14.3.tar.bz2 http://dev.gentoo.org/~pinkbyte/distfiles/7kaa.png
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=30382925c9769e7a53d43c477249e889
diff --git a/metadata/md5-cache/games-strategy/seven-kingdoms-2.14.4 b/metadata/md5-cache/games-strategy/seven-kingdoms-2.14.4
index fc4f6fc1237e..a64b8ef55c46 100644
--- a/metadata/md5-cache/games-strategy/seven-kingdoms-2.14.4
+++ b/metadata/md5-cache/games-strategy/seven-kingdoms-2.14.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=media-libs/libsdl[X,video] media-libs/openal network? ( media-libs/sdl-net ) !games-strategy/seven-kingdoms-data || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl[X,video] media-libs/openal network? ( media-libs/sdl-net ) !games-strategy/seven-kingdoms-data || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Seven Kingdoms: Ancient Adversaries
 EAPI=5
 HOMEPAGE=http://7kfans.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[X,video] media-libs/openal network? ( media-libs/sdl-net ) !games-strategy/seven-kingdoms-data
 SLOT=0
 SRC_URI=mirror://sourceforge/skfans/7kaa-source-2.14.4.tar.bz2 http://dev.gentoo.org/~pinkbyte/distfiles/7kaa.png
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f1eed573d80ff9c39148a5b437a470e2
diff --git a/metadata/md5-cache/games-strategy/warmux-11.04.1 b/metadata/md5-cache/games-strategy/warmux-11.04.1
index d9a1ffc89b88..4cfc5768e549 100644
--- a/metadata/md5-cache/games-strategy/warmux-11.04.1
+++ b/metadata/md5-cache/games-strategy/warmux-11.04.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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-2.0.22 net-misc/curl media-fonts/dejavu dev-libs/libxml2 x11-libs/libX11 nls? ( virtual/libintl ) unicode? ( dev-libs/fribidi ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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-2.0.22 net-misc/curl media-fonts/dejavu dev-libs/libxml2 x11-libs/libX11 nls? ( virtual/libintl ) unicode? ( dev-libs/fribidi ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free Worms clone
 EAPI=2
 HOMEPAGE=http://gna.org/projects/warmux/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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-2.0.22 net-misc/curl media-fonts/dejavu dev-libs/libxml2 x11-libs/libX11 nls? ( virtual/libintl ) unicode? ( dev-libs/fribidi )
 SLOT=0
 SRC_URI=http://download.gna.org/warmux/warmux-11.04.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a5a3082a374f4ae865f13585d20db173
diff --git a/metadata/md5-cache/games-strategy/warzone2100-2.3.9 b/metadata/md5-cache/games-strategy/warzone2100-2.3.9
index db78c026bcae..73c5255abcbf 100644
--- a/metadata/md5-cache/games-strategy/warzone2100-2.3.9
+++ b/metadata/md5-cache/games-strategy/warzone2100-2.3.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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 virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=3D real-time strategy game
 EAPI=2
 HOMEPAGE=http://wz2100.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 CC-BY-SA-3.0 public-domain
 RDEPEND=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
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bc366f002778fa8c417ae1b63d1c7033
diff --git a/metadata/md5-cache/games-strategy/warzone2100-3.1.0 b/metadata/md5-cache/games-strategy/warzone2100-3.1.0
index 1a310d7cebb8..ba8c250470c0 100644
--- a/metadata/md5-cache/games-strategy/warzone2100-3.1.0
+++ b/metadata/md5-cache/games-strategy/warzone2100-3.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-games/physfs-2[zip] dev-libs/fribidi media-libs/fontconfig media-libs/freetype:2 media-libs/glew media-libs/libogg media-libs/libpng:0 media-libs/libtheora media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXrandr dev-qt/qtcore:4 dev-qt/qtscript:4 nls? ( virtual/libintl ) qt4? ( dev-qt/qtgui:4 dev-qt/qtopengl:4 ) !qt4? ( media-libs/libsdl[opengl,video] ) sys-devel/bison sys-devel/flex app-arch/zip virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=dev-games/physfs-2[zip] dev-libs/fribidi media-libs/fontconfig media-libs/freetype:2 media-libs/glew media-libs/libogg media-libs/libpng:0 media-libs/libtheora media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXrandr dev-qt/qtcore:4 dev-qt/qtscript:4 nls? ( virtual/libintl ) qt4? ( dev-qt/qtgui:4 dev-qt/qtopengl:4 ) !qt4? ( media-libs/libsdl[opengl,video] ) sys-devel/bison sys-devel/flex app-arch/zip virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=3D real-time strategy game
 EAPI=5
 HOMEPAGE=http://wz2100.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 CC-BY-SA-3.0 public-domain
 RDEPEND=>=dev-games/physfs-2[zip] dev-libs/fribidi media-libs/fontconfig media-libs/freetype:2 media-libs/glew media-libs/libogg media-libs/libpng:0 media-libs/libtheora media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXrandr dev-qt/qtcore:4 dev-qt/qtscript:4 nls? ( virtual/libintl ) qt4? ( dev-qt/qtgui:4 dev-qt/qtopengl:4 ) !qt4? ( media-libs/libsdl[opengl,video] ) media-fonts/dejavu
 SLOT=0
 SRC_URI=mirror://sourceforge/warzone2100/warzone2100-3.1.0.tar.xz videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/2.2/high-quality-en/sequences.wz -> warzone2100-videos-2.2.wz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3515465b88896ce47566fc6aaf3c7a11
diff --git a/metadata/md5-cache/games-util/atlas-0.3.1_p20101101 b/metadata/md5-cache/games-util/atlas-0.3.1_p20101101
index 676ecf14604c..b70416930eb0 100644
--- a/metadata/md5-cache/games-util/atlas-0.3.1_p20101101
+++ b/metadata/md5-cache/games-util/atlas-0.3.1_p20101101
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Chart Program to use with Flightgear Flight Simulator
 EAPI=2
 HOMEPAGE=http://atlas.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://gentoo/atlas-0.3.1_p20101101.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1ed56b568116642b61254b24b02afaae
diff --git a/metadata/md5-cache/games-util/atlas-0.3.1_p20101101-r1 b/metadata/md5-cache/games-util/atlas-0.3.1_p20101101-r1
index 690014b03a9f..0250fd248845 100644
--- a/metadata/md5-cache/games-util/atlas-0.3.1_p20101101-r1
+++ b/metadata/md5-cache/games-util/atlas-0.3.1_p20101101-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Chart Program to use with Flightgear Flight Simulator
 EAPI=3
 HOMEPAGE=http://atlas.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=mirror://gentoo/atlas-0.3.1_p20101101.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	games	0fb7637597e0869f6c8be79b11d0135a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=54343235dd38b5fbbcc60269c9fb6ee3
diff --git a/metadata/md5-cache/games-util/loki_patch-20091105 b/metadata/md5-cache/games-util/loki_patch-20091105
index 5ec0d59684d2..e80aa8ef2871 100644
--- a/metadata/md5-cache/games-util/loki_patch-20091105
+++ b/metadata/md5-cache/games-util/loki_patch-20091105
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-util/xdelta:0 dev-libs/libxml2 dev-libs/glib:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-util/xdelta:0 dev-libs/libxml2 dev-libs/glib:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Loki Software binary patch tool
 EAPI=2
 HOMEPAGE=http://www.icculus.org/loki_setup/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-util/xdelta:0 dev-libs/libxml2 dev-libs/glib:2
 SLOT=0
 SRC_URI=mirror://gentoo/loki_patch-20091105.tar.bz2 mirror://gentoo/loki_setupdb-20091105.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=24080a10e82728411599e64b4e70462a
diff --git a/metadata/md5-cache/gnome-base/gdm-3.6.2 b/metadata/md5-cache/gnome-base/gdm-3.6.2
index fb6390ad346b..4ab0b5b0f0b9 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.6.2
+++ b/metadata/md5-cache/gnome-base/gdm-3.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=app-text/iso-codes >=dev-libs/glib-2.33.2:2 >=x11-libs/gtk+-2.91.1:3 dev-libs/libdaemon >=x11-libs/pango-1.3 dev-libs/nspr >=dev-libs/nss-3.11.1 >=gnome-base/dconf-0.11.6 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.12 >=sys-power/upower-0.9 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXrandr >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam sys-auth/pambase[systemd?] accessibility? ( x11-libs/libXevie ) audit? ( sys-process/audit ) consolekit? ( sys-auth/consolekit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-186[pam] ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig x11-proto/inputproto x11-proto/randrproto test? ( >=dev-libs/check-0.9.4 ) xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.33.2:2 >=x11-libs/gtk+-2.91.1:3 dev-libs/libdaemon >=x11-libs/pango-1.3 dev-libs/nspr >=dev-libs/nss-3.11.1 >=gnome-base/dconf-0.11.6 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.12 >=sys-power/upower-0.9 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXrandr >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam sys-auth/pambase[systemd?] accessibility? ( x11-libs/libXevie ) audit? ( sys-process/audit ) consolekit? ( sys-auth/consolekit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-186[pam] ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig x11-proto/inputproto x11-proto/randrproto test? ( >=dev-libs/check-0.9.4 ) xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig
 DESCRIPTION=GNOME Display Manager
 EAPI=5
 HOMEPAGE=https://live.gnome.org/GDM
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.33.2:2 >=x11-libs/gtk+-2.91.1:3 dev-libs/libdaemon >=x11-libs/pango-1.3 dev-libs/nspr >=dev-libs/nss-3.11.1 >=gnome-base/dconf-0.11.6 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.12 >=sys-power/upower-0.9 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXrandr >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam sys-auth/pambase[systemd?] accessibility? ( x11-libs/libXevie ) audit? ( sys-process/audit ) consolekit? ( sys-auth/consolekit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-186[pam] ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) >=gnome-base/gnome-session-3.6 x11-apps/xhost x11-themes/gnome-icon-theme-symbolic accessibility? ( app-accessibility/gnome-mag app-accessibility/gok app-accessibility/orca gnome-extra/at-spi:1 ) consolekit? ( gnome-extra/polkit-gnome ) fallback? ( x11-wm/metacity ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 ) !gnome-shell? ( x11-wm/metacity ) smartcard? ( app-crypt/coolkey sys-auth/pam_pkcs11 ) !gnome-extra/fast-user-switch-applet
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.6/gdm-3.6.2.tar.xz http://dev.gentoo.org/~tetromino/distfiles/gdm/gdm-gentoo-2012.09.25.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8ae9ee451b751fa165ba7dbabe80ae28
diff --git a/metadata/md5-cache/gnome-base/gdm-3.8.0 b/metadata/md5-cache/gnome-base/gdm-3.8.0
index bb712476ffb1..21edab93b102 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.8.0
+++ b/metadata/md5-cache/gnome-base/gdm-3.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=app-text/iso-codes >=dev-libs/glib-2.35:2 >=x11-libs/gtk+-2.91.1:3 dev-libs/libdaemon >=x11-libs/pango-1.3 dev-libs/nspr >=dev-libs/nss-3.11.1 >=gnome-base/dconf-0.11.6 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.12 >=sys-power/upower-0.9 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXrandr >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam sys-auth/pambase[consolekit?,systemd?] accessibility? ( x11-libs/libXevie ) audit? ( sys-process/audit ) consolekit? ( >=sys-auth/consolekit-0.4.5_p20120320-r2[pam] ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-186[pam] ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig x11-proto/inputproto x11-proto/randrproto test? ( >=dev-libs/check-0.9.4 ) xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.35:2 >=x11-libs/gtk+-2.91.1:3 dev-libs/libdaemon >=x11-libs/pango-1.3 dev-libs/nspr >=dev-libs/nss-3.11.1 >=gnome-base/dconf-0.11.6 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.12 >=sys-power/upower-0.9 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXrandr >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam sys-auth/pambase[consolekit?,systemd?] accessibility? ( x11-libs/libXevie ) audit? ( sys-process/audit ) consolekit? ( >=sys-auth/consolekit-0.4.5_p20120320-r2[pam] ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-186[pam] ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig x11-proto/inputproto x11-proto/randrproto test? ( >=dev-libs/check-0.9.4 ) xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig
 DESCRIPTION=GNOME Display Manager
 EAPI=5
 HOMEPAGE=https://live.gnome.org/GDM
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.35:2 >=x11-libs/gtk+-2.91.1:3 dev-libs/libdaemon >=x11-libs/pango-1.3 dev-libs/nspr >=dev-libs/nss-3.11.1 >=gnome-base/dconf-0.11.6 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.12 >=sys-power/upower-0.9 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXrandr >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam sys-auth/pambase[consolekit?,systemd?] accessibility? ( x11-libs/libXevie ) audit? ( sys-process/audit ) consolekit? ( >=sys-auth/consolekit-0.4.5_p20120320-r2[pam] ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-186[pam] ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) >=gnome-base/gnome-session-3.6 x11-apps/xhost x11-themes/gnome-icon-theme-symbolic accessibility? ( app-accessibility/gnome-mag app-accessibility/gok app-accessibility/orca gnome-extra/at-spi:1 ) consolekit? ( gnome-extra/polkit-gnome ) fallback? ( x11-wm/metacity ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 ) !gnome-shell? ( x11-wm/metacity ) smartcard? ( app-crypt/coolkey sys-auth/pam_pkcs11 ) !gnome-extra/fast-user-switch-applet
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.8/gdm-3.8.0.tar.xz http://dev.gentoo.org/~tetromino/distfiles/gdm/gdm-gentoo-2012.09.25.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=450a6880dbfd9972d1a46be22daf56b2
diff --git a/metadata/md5-cache/gnome-base/gnome-applets-2.32.1.1-r1 b/metadata/md5-cache/gnome-base/gnome-applets-2.32.1.1-r1
index e9e6dc57adc3..7a50f3e96713 100644
--- a/metadata/md5-cache/gnome-base/gnome-applets-2.32.1.1-r1
+++ b/metadata/md5-cache/gnome-base/gnome-applets-2.32.1.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=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-base/gnome-settings-daemon gnome-base/libgnome >=gnome-extra/gucharmap-2.23:0 >=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 cpufreq? ( sys-power/cpufrequtils ) 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 virtual/pkgconfig >=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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-base/gnome-settings-daemon gnome-base/libgnome >=gnome-extra/gucharmap-2.23:0 >=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 cpufreq? ( sys-power/cpufrequtils ) 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 virtual/pkgconfig >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Applets for the GNOME Desktop and Panel
 EAPI=4
 HOMEPAGE=http://www.gnome.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.1 LGPL-2
 RDEPEND=>=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-base/gnome-settings-daemon gnome-base/libgnome >=gnome-extra/gucharmap-2.23:0 >=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 cpufreq? ( sys-power/cpufrequtils ) 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* )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-applets/2.32/gnome-applets-2.32.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=87b38699bfe707151bfb63b8f868ae1d
diff --git a/metadata/md5-cache/gnome-base/gnome-applets-2.32.1.1-r2 b/metadata/md5-cache/gnome-base/gnome-applets-2.32.1.1-r2
index a4cd33b0eda5..1c4191366d60 100644
--- a/metadata/md5-cache/gnome-base/gnome-applets-2.32.1.1-r2
+++ b/metadata/md5-cache/gnome-base/gnome-applets-2.32.1.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=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-base/gnome-settings-daemon gnome-base/libgnome >=gnome-extra/gucharmap-2.23:0 >=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 cpufreq? ( sys-power/cpufrequtils ) 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 virtual/pkgconfig >=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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-base/gnome-settings-daemon gnome-base/libgnome >=gnome-extra/gucharmap-2.23:0 >=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 cpufreq? ( sys-power/cpufrequtils ) 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 virtual/pkgconfig >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Applets for the GNOME Desktop and Panel
 EAPI=4
 HOMEPAGE=http://www.gnome.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.1 LGPL-2
 RDEPEND=>=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-base/gnome-settings-daemon gnome-base/libgnome >=gnome-extra/gucharmap-2.23:0 >=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 cpufreq? ( sys-power/cpufrequtils ) 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* )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-applets/2.32/gnome-applets-2.32.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aa0a87ac6925e29bb4404913f63e709e
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-3.6.3-r1 b/metadata/md5-cache/gnome-base/gnome-control-center-3.6.3-r1
index 40a66c4fdd3c..f79be2d04973 100644
--- a/metadata/md5-cache/gnome-base/gnome-control-center-3.6.3-r1
+++ b/metadata/md5-cache/gnome-base/gnome-control-center-3.6.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.31:2 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.5.13:3 >=gnome-base/gsettings-desktop-schemas-3.5.91 >=gnome-base/gnome-desktop-3.5.91:3= >=gnome-base/gnome-settings-daemon-3.6[colord?,policykit] >=gnome-base/libgnomekbd-2.91.91 app-text/iso-codes dev-libs/libpwquality dev-libs/libxml2:2 gnome-base/gnome-menus:3 gnome-base/libgtop:2 media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[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/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5:= ) colord? ( >=x11-misc/colord-0.1.8 ) cups? ( >=net-print/cups-1.4[dbus] ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 ) i18n? ( >=app-i18n/ibus-1.4.99 ) input_devices_wacom? ( >=dev-libs/libwacom-0.6 >=x11-libs/libXi-1.2 ) kerberos? ( virtual/krb5 ) networkmanager? ( >=gnome-extra/nm-applet-0.9.1.90 >=net-misc/networkmanager-0.8.997 ) socialweb? ( net-libs/libsocialweb ) systemd? ( >=sys-apps/systemd-31 ) v4l? ( media-libs/gstreamer:1.0 media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto dev-libs/libxml2:2 dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig cups? ( sys-apps/sed ) gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.31:2 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.5.13:3 >=gnome-base/gsettings-desktop-schemas-3.5.91 >=gnome-base/gnome-desktop-3.5.91:3= >=gnome-base/gnome-settings-daemon-3.6[colord?,policykit] >=gnome-base/libgnomekbd-2.91.91 app-text/iso-codes dev-libs/libpwquality dev-libs/libxml2:2 gnome-base/gnome-menus:3 gnome-base/libgtop:2 media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[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/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5:= ) colord? ( >=x11-misc/colord-0.1.8 ) cups? ( >=net-print/cups-1.4[dbus] ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 ) i18n? ( >=app-i18n/ibus-1.4.99 ) input_devices_wacom? ( >=dev-libs/libwacom-0.6 >=x11-libs/libXi-1.2 ) kerberos? ( virtual/krb5 ) networkmanager? ( >=gnome-extra/nm-applet-0.9.1.90 >=net-misc/networkmanager-0.8.997 ) socialweb? ( net-libs/libsocialweb ) systemd? ( >=sys-apps/systemd-31 ) v4l? ( media-libs/gstreamer:1.0 media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto dev-libs/libxml2:2 dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig cups? ( sys-apps/sed ) gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GNOME Desktop Configuration Tool
 EAPI=5
 HOMEPAGE=http://www.gnome.org/
@@ -10,5 +10,5 @@ PDEPEND=>=gnome-base/gnome-session-2.91.6-r1
 RDEPEND=>=dev-libs/glib-2.31:2 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.5.13:3 >=gnome-base/gsettings-desktop-schemas-3.5.91 >=gnome-base/gnome-desktop-3.5.91:3= >=gnome-base/gnome-settings-daemon-3.6[colord?,policykit] >=gnome-base/libgnomekbd-2.91.91 app-text/iso-codes dev-libs/libpwquality dev-libs/libxml2:2 gnome-base/gnome-menus:3 gnome-base/libgtop:2 media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[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/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5:= ) colord? ( >=x11-misc/colord-0.1.8 ) cups? ( >=net-print/cups-1.4[dbus] ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 ) i18n? ( >=app-i18n/ibus-1.4.99 ) input_devices_wacom? ( >=dev-libs/libwacom-0.6 >=x11-libs/libXi-1.2 ) kerberos? ( virtual/krb5 ) networkmanager? ( >=gnome-extra/nm-applet-0.9.1.90 >=net-misc/networkmanager-0.8.997 ) socialweb? ( net-libs/libsocialweb ) systemd? ( >=sys-apps/systemd-31 ) v4l? ( media-libs/gstreamer:1.0 media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) gnome-base/gnome-settings-daemon[input_devices_wacom?] sys-apps/accountsservice x11-themes/gnome-icon-theme-symbolic colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( >=app-admin/system-config-printer-gnome-1.3.5 net-print/cups-pk-helper ) !systemd? ( app-admin/openrc-settingsd sys-auth/consolekit ) !<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 !<net-wireless/gnome-bluetooth-3.3.2
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-control-center/3.6/gnome-control-center-3.6.3.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f82e3f92e10afe3ce41dda82247500de
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-3.8.0 b/metadata/md5-cache/gnome-base/gnome-control-center-3.8.0
index fc31496e2f5b..7bb246de4a9a 100644
--- a/metadata/md5-cache/gnome-base/gnome-control-center-3.8.0
+++ b/metadata/md5-cache/gnome-base/gnome-control-center-3.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.35.1:2 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.7.7:3 >=gnome-base/gsettings-desktop-schemas-3.7.2.2 >=gnome-base/gnome-desktop-3.7.5:3= >=gnome-base/gnome-settings-daemon-3.6[colord?,policykit] >=gnome-base/libgnomekbd-2.91.91 app-text/iso-codes dev-libs/libpwquality dev-libs/libxml2:2 gnome-base/gnome-menus:3 gnome-base/libgtop:2 media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[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/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5:= ) colord? ( >=x11-misc/colord-0.1.29 ) cups? ( >=net-print/cups-1.4[dbus] ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 ) i18n? ( >=app-i18n/ibus-1.4.99 ) kerberos? ( virtual/krb5 ) networkmanager? ( >=gnome-extra/nm-applet-0.9.7.995 >=net-misc/networkmanager-0.9.8[modemmanager] ) socialweb? ( net-libs/libsocialweb ) systemd? ( >=sys-apps/systemd-31 ) v4l? ( media-libs/gstreamer:1.0 media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.6 >=x11-libs/libXi-1.2 ) x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto dev-libs/libxml2:2 dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig cups? ( sys-apps/sed ) gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.35.1:2 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.7.7:3 >=gnome-base/gsettings-desktop-schemas-3.7.2.2 >=gnome-base/gnome-desktop-3.7.5:3= >=gnome-base/gnome-settings-daemon-3.6[colord?,policykit] >=gnome-base/libgnomekbd-2.91.91 app-text/iso-codes dev-libs/libpwquality dev-libs/libxml2:2 gnome-base/gnome-menus:3 gnome-base/libgtop:2 media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[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/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5:= ) colord? ( >=x11-misc/colord-0.1.29 ) cups? ( >=net-print/cups-1.4[dbus] ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 ) i18n? ( >=app-i18n/ibus-1.4.99 ) kerberos? ( virtual/krb5 ) networkmanager? ( >=gnome-extra/nm-applet-0.9.7.995 >=net-misc/networkmanager-0.9.8[modemmanager] ) socialweb? ( net-libs/libsocialweb ) systemd? ( >=sys-apps/systemd-31 ) v4l? ( media-libs/gstreamer:1.0 media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.6 >=x11-libs/libXi-1.2 ) x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto dev-libs/libxml2:2 dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig cups? ( sys-apps/sed ) gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GNOME Desktop Configuration Tool
 EAPI=5
 HOMEPAGE=http://www.gnome.org/
@@ -10,5 +10,5 @@ PDEPEND=>=gnome-base/gnome-session-2.91.6-r1
 RDEPEND=>=dev-libs/glib-2.35.1:2 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.7.7:3 >=gnome-base/gsettings-desktop-schemas-3.7.2.2 >=gnome-base/gnome-desktop-3.7.5:3= >=gnome-base/gnome-settings-daemon-3.6[colord?,policykit] >=gnome-base/libgnomekbd-2.91.91 app-text/iso-codes dev-libs/libpwquality dev-libs/libxml2:2 gnome-base/gnome-menus:3 gnome-base/libgtop:2 media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[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/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5:= ) colord? ( >=x11-misc/colord-0.1.29 ) cups? ( >=net-print/cups-1.4[dbus] ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 ) i18n? ( >=app-i18n/ibus-1.4.99 ) kerberos? ( virtual/krb5 ) networkmanager? ( >=gnome-extra/nm-applet-0.9.7.995 >=net-misc/networkmanager-0.9.8[modemmanager] ) socialweb? ( net-libs/libsocialweb ) systemd? ( >=sys-apps/systemd-31 ) v4l? ( media-libs/gstreamer:1.0 media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.6 >=x11-libs/libXi-1.2 ) >=sys-apps/accountsservice-0.6.30 x11-themes/gnome-icon-theme-symbolic colord? ( >=gnome-extra/gnome-color-manager-3 >=x11-misc/colord-0.1.29 ) cups? ( >=app-admin/system-config-printer-gnome-1.3.5 net-print/cups-pk-helper ) !systemd? ( app-admin/openrc-settingsd sys-auth/consolekit ) input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) !<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 !<net-wireless/gnome-bluetooth-3.3.2
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-control-center/3.8/gnome-control-center-3.8.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ffcb1a7df90149df6fa5426078ef5d01
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-3.8.0-r1 b/metadata/md5-cache/gnome-base/gnome-control-center-3.8.0-r1
index 0da413a13f8b..4a73fe03821c 100644
--- a/metadata/md5-cache/gnome-base/gnome-control-center-3.8.0-r1
+++ b/metadata/md5-cache/gnome-base/gnome-control-center-3.8.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.35.1:2 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.7.7:3 >=gnome-base/gsettings-desktop-schemas-3.7.2.2 >=gnome-base/gnome-desktop-3.7.5:3= >=gnome-base/gnome-settings-daemon-3.6[colord?,policykit] >=gnome-base/libgnomekbd-2.91.91 app-text/iso-codes dev-libs/libpwquality dev-libs/libxml2:2 gnome-base/gnome-menus:3 gnome-base/libgtop:2 media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.9.1 >=x11-libs/libnotify-0.7.3 >=gnome-extra/nm-applet-0.9.7.995 >=net-misc/networkmanager-0.9.8[modemmanager] x11-apps/xmodmap x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5:= ) colord? ( >=x11-misc/colord-0.1.29 ) cups? ( >=net-print/cups-1.4[dbus] ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 ) i18n? ( >=app-i18n/ibus-1.4.99 ) kerberos? ( virtual/krb5 ) socialweb? ( net-libs/libsocialweb ) systemd? ( >=sys-apps/systemd-31 ) v4l? ( media-libs/gstreamer:1.0 media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.6 >=x11-libs/libXi-1.2 ) x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto dev-libs/libxml2:2 dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig cups? ( sys-apps/sed ) gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.35.1:2 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.7.7:3 >=gnome-base/gsettings-desktop-schemas-3.7.2.2 >=gnome-base/gnome-desktop-3.7.5:3= >=gnome-base/gnome-settings-daemon-3.6[colord?,policykit] >=gnome-base/libgnomekbd-2.91.91 app-text/iso-codes dev-libs/libpwquality dev-libs/libxml2:2 gnome-base/gnome-menus:3 gnome-base/libgtop:2 media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.9.1 >=x11-libs/libnotify-0.7.3 >=gnome-extra/nm-applet-0.9.7.995 >=net-misc/networkmanager-0.9.8[modemmanager] x11-apps/xmodmap x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5:= ) colord? ( >=x11-misc/colord-0.1.29 ) cups? ( >=net-print/cups-1.4[dbus] ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 ) i18n? ( >=app-i18n/ibus-1.4.99 ) kerberos? ( virtual/krb5 ) socialweb? ( net-libs/libsocialweb ) systemd? ( >=sys-apps/systemd-31 ) v4l? ( media-libs/gstreamer:1.0 media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.6 >=x11-libs/libXi-1.2 ) x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto dev-libs/libxml2:2 dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig cups? ( sys-apps/sed ) gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GNOME Desktop Configuration Tool
 EAPI=5
 HOMEPAGE=http://www.gnome.org/
@@ -10,5 +10,5 @@ PDEPEND=>=gnome-base/gnome-session-2.91.6-r1
 RDEPEND=>=dev-libs/glib-2.35.1:2 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.7.7:3 >=gnome-base/gsettings-desktop-schemas-3.7.2.2 >=gnome-base/gnome-desktop-3.7.5:3= >=gnome-base/gnome-settings-daemon-3.6[colord?,policykit] >=gnome-base/libgnomekbd-2.91.91 app-text/iso-codes dev-libs/libpwquality dev-libs/libxml2:2 gnome-base/gnome-menus:3 gnome-base/libgtop:2 media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.9.1 >=x11-libs/libnotify-0.7.3 >=gnome-extra/nm-applet-0.9.7.995 >=net-misc/networkmanager-0.9.8[modemmanager] x11-apps/xmodmap x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5:= ) colord? ( >=x11-misc/colord-0.1.29 ) cups? ( >=net-print/cups-1.4[dbus] ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 ) i18n? ( >=app-i18n/ibus-1.4.99 ) kerberos? ( virtual/krb5 ) socialweb? ( net-libs/libsocialweb ) systemd? ( >=sys-apps/systemd-31 ) v4l? ( media-libs/gstreamer:1.0 media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.6 >=x11-libs/libXi-1.2 ) >=sys-apps/accountsservice-0.6.30 x11-themes/gnome-icon-theme-symbolic colord? ( >=gnome-extra/gnome-color-manager-3 >=x11-misc/colord-0.1.29 ) cups? ( >=app-admin/system-config-printer-gnome-1.3.5 net-print/cups-pk-helper ) !systemd? ( app-admin/openrc-settingsd sys-auth/consolekit ) input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) !<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 !<net-wireless/gnome-bluetooth-3.3.2
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-control-center/3.8/gnome-control-center-3.8.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=07de6342879b1026090057b1f6237d79
diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-2.32.1-r1 b/metadata/md5-cache/gnome-base/gnome-keyring-2.32.1-r1
index e083d1f5a11d..cf41b447dec0 100644
--- a/metadata/md5-cache/gnome-base/gnome-keyring-2.32.1-r1
+++ b/metadata/md5-cache/gnome-base/gnome-keyring-2.32.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.25:2 >=x11-libs/gtk+-2.20:2 gnome-base/gconf:2 >=sys-apps/dbus-1.0 pam? ( virtual/pam ) >=dev-libs/libgcrypt-1.2.2 >=dev-libs/libtasn1-1 >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.25:2 >=x11-libs/gtk+-2.20:2 gnome-base/gconf:2 >=sys-apps/dbus-1.0 pam? ( virtual/pam ) >=dev-libs/libgcrypt-1.2.2 >=dev-libs/libtasn1-1 >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Password and keyring managing daemon
 EAPI=4
 HOMEPAGE=http://live.gnome.org/GnomeKeyring
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.25:2 >=x11-libs/gtk+-2.20:2 gnome-base/gconf:2 >=sys-a
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-keyring/2.32/gnome-keyring-2.32.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=3fd80e5511f5e8b8a08a5ceb5e73e2db
diff --git a/metadata/md5-cache/gnome-base/gnome-menus-3.0.1-r2 b/metadata/md5-cache/gnome-base/gnome-menus-3.0.1-r2
index 94da4597ed5b..1e1c8ef6b03a 100644
--- a/metadata/md5-cache/gnome-base/gnome-menus-3.0.1-r2
+++ b/metadata/md5-cache/gnome-base/gnome-menus-3.0.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.18 introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) sys-devel/gettext virtual/pkgconfig >=dev-util/intltool-0.40 gnome-base/gnome-common dev-libs/gobject-introspection-common || ( >=sys-devel/automake-1.12:1.12 ) >=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* ) )
+DEPEND=>=dev-libs/glib-2.18 introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) sys-devel/gettext virtual/pkgconfig >=dev-util/intltool-0.40 gnome-base/gnome-common dev-libs/gobject-introspection-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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* ) )
 DESCRIPTION=The GNOME menu system, implementing the F.D.O cross-desktop spec
 EAPI=4
 HOMEPAGE=http://www.gnome.org
@@ -10,5 +10,5 @@ PDEPEND=gnome-base/gnome-menus:3
 RDEPEND=>=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* ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-menus/3.0/gnome-menus-3.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7416b348ea3db70875cff51bed903205
diff --git a/metadata/md5-cache/gnome-base/gnome-panel-2.32.1-r3 b/metadata/md5-cache/gnome-base/gnome-panel-2.32.1-r3
index 06d10caa171f..b2d609a662c5 100644
--- a/metadata/md5-cache/gnome-base/gnome-panel-2.32.1-r3
+++ b/metadata/md5-cache/gnome-base/gnome-panel-2.32.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 dev-util/gtk-doc-am >=app-text/gnome-doc-utils-0.3.2 virtual/pkgconfig >=dev-util/intltool-0.40 app-text/docbook-xml-dtd:4.1.2 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 dev-util/gtk-doc-am >=app-text/gnome-doc-utils-0.3.2 virtual/pkgconfig >=dev-util/intltool-0.40 app-text/docbook-xml-dtd:4.1.2 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The GNOME panel
 EAPI=3
 HOMEPAGE=http://www.gnome.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
 RDEPEND=>=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* )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1e4cdead8279b3ff772dc7becb7adf63
diff --git a/metadata/md5-cache/gnome-base/gnome-session-2.32.1-r3 b/metadata/md5-cache/gnome-base/gnome-session-2.32.1-r3
index 951e9e025fc3..3106cdb551bd 100644
--- a/metadata/md5-cache/gnome-base/gnome-session-2.32.1-r3
+++ b/metadata/md5-cache/gnome-base/gnome-session-2.32.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.22.0:2 >=dev-libs/dbus-glib-0.76 >=gnome-base/gconf-2:2[gtk(+)] <gnome-base/gconf-3.2.6 >=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 virtual/pkgconfig >=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.22.0:2 >=dev-libs/dbus-glib-0.76 >=gnome-base/gconf-2:2[gtk(+)] <gnome-base/gconf-3.2.6 >=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 virtual/pkgconfig >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Gnome session manager
 EAPI=4
 HOMEPAGE=http://www.gnome.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2 FDL-1.1
 RDEPEND=>=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.22.0:2 >=dev-libs/dbus-glib-0.76 >=gnome-base/gconf-2:2[gtk(+)] <gnome-base/gconf-3.2.6 >=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
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-session/2.32/gnome-session-2.32.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=01f1f566872bfb88fbf5109a327e0bce
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-2.32.1-r2 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-2.32.1-r2
index 66bebe86218b..8a52aa2c517a 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-2.32.1-r2
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-2.32.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 virtual/pkgconfig x11-proto/inputproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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 virtual/pkgconfig x11-proto/inputproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Gnome Settings Daemon
 EAPI=4
 HOMEPAGE=http://www.gnome.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=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
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=41ec0b6389a74e22eecf72b464404fcf
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.4.2 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.4.2
index cffb54daa032..0250aa97e5f8 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.4.2
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.31.0:2 >=x11-libs/gtk+-3.3.4:3 >=gnome-base/libgnomekbd-2.91.1 >=gnome-base/gnome-desktop-3.3.92:3 >=gnome-base/gsettings-desktop-schemas-3.3.0 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/libXtst 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] ) input_devices_wacom? ( >=dev-libs/libwacom-0.6 x11-drivers/xf86-input-wacom ) packagekit? ( virtual/udev[gudev] >=app-admin/packagekit-base-0.6.12 ) smartcard? ( virtual/udev[gudev] >=dev-libs/nss-3.11.2 ) systemd? ( >=sys-apps/systemd-31 ) udev? ( virtual/udev[gudev] ) cups? ( sys-apps/sed ) sys-devel/gettext >=dev-util/intltool-0.40 virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xf86miscproto >=x11-proto/xproto-7.0.15 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.31.0:2 >=x11-libs/gtk+-3.3.4:3 >=gnome-base/libgnomekbd-2.91.1 >=gnome-base/gnome-desktop-3.3.92:3 >=gnome-base/gsettings-desktop-schemas-3.3.0 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/libXtst 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] ) input_devices_wacom? ( >=dev-libs/libwacom-0.6 x11-drivers/xf86-input-wacom ) packagekit? ( virtual/udev[gudev] >=app-admin/packagekit-base-0.6.12 ) smartcard? ( virtual/udev[gudev] >=dev-libs/nss-3.11.2 ) systemd? ( >=sys-apps/systemd-31 ) udev? ( virtual/udev[gudev] ) cups? ( sys-apps/sed ) sys-devel/gettext >=dev-util/intltool-0.40 virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xf86miscproto >=x11-proto/xproto-7.0.15 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Gnome Settings Daemon
 EAPI=4
 HOMEPAGE=http://www.gnome.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.31.0:2 >=x11-libs/gtk+-3.3.4:3 >=gnome-base/libgnomekbd-2.91.1 >=gnome-base/gnome-desktop-3.3.92:3 >=gnome-base/gsettings-desktop-schemas-3.3.0 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/libXtst 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] ) input_devices_wacom? ( >=dev-libs/libwacom-0.6 x11-drivers/xf86-input-wacom ) packagekit? ( virtual/udev[gudev] >=app-admin/packagekit-base-0.6.12 ) smartcard? ( virtual/udev[gudev] >=dev-libs/nss-3.11.2 ) systemd? ( >=sys-apps/systemd-31 ) udev? ( virtual/udev[gudev] ) 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 !systemd? ( sys-auth/consolekit )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.4/gnome-settings-daemon-3.4.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=b1f85c8e9b9e9b539a5b4ebed8c2730e
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.6.3 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.6.3
index b80e300f456d..8dbe2096ac6f 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.6.3
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.6.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.31.0:2 >=x11-libs/gtk+-3.3.4:3 >=gnome-base/gnome-desktop-3.5.3:3= >=gnome-base/gsettings-desktop-schemas-3.5.90 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/libxkbfile x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/libXxf86misc colord? ( >=x11-misc/colord-0.1.13 ) cups? ( >=net-print/cups-1.4[dbus] ) i18n? ( >=app-i18n/ibus-1.4.99 ) input_devices_wacom? ( >=dev-libs/libwacom-0.6 x11-drivers/xf86-input-wacom ) packagekit? ( >=app-admin/packagekit-base-0.7.4 ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( >=sys-apps/systemd-31 ) udev? ( virtual/udev[gudev] ) cups? ( sys-apps/sed ) dev-libs/libxml2:2 sys-devel/gettext >=dev-util/intltool-0.40 virtual/pkgconfig x11-proto/inputproto x11-proto/xf86miscproto >=x11-proto/xproto-7.0.15 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.31.0:2 >=x11-libs/gtk+-3.3.4:3 >=gnome-base/gnome-desktop-3.5.3:3= >=gnome-base/gsettings-desktop-schemas-3.5.90 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/libxkbfile x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/libXxf86misc colord? ( >=x11-misc/colord-0.1.13 ) cups? ( >=net-print/cups-1.4[dbus] ) i18n? ( >=app-i18n/ibus-1.4.99 ) input_devices_wacom? ( >=dev-libs/libwacom-0.6 x11-drivers/xf86-input-wacom ) packagekit? ( >=app-admin/packagekit-base-0.7.4 ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( >=sys-apps/systemd-31 ) udev? ( virtual/udev[gudev] ) cups? ( sys-apps/sed ) dev-libs/libxml2:2 sys-devel/gettext >=dev-util/intltool-0.40 virtual/pkgconfig x11-proto/inputproto x11-proto/xf86miscproto >=x11-proto/xproto-7.0.15 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Gnome Settings Daemon
 EAPI=5
 HOMEPAGE=http://www.gnome.org
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.31.0:2 >=x11-libs/gtk+-3.3.4:3 >=gnome-base/gnome-desk
 REQUIRED_USE=packagekit? ( udev ) smartcard? ( udev )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.6/gnome-settings-daemon-3.6.3.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=0767ef60747b252cfe3274f104495c7a
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.6.4 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.6.4
index 34623c74f511..9d9f9991284b 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.6.4
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.31.0:2 >=x11-libs/gtk+-3.3.4:3 >=gnome-base/gnome-desktop-3.5.3:3= >=gnome-base/gsettings-desktop-schemas-3.5.90 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/libxkbfile x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/libXxf86misc colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] ) i18n? ( >=app-i18n/ibus-1.4.99 ) input_devices_wacom? ( >=dev-libs/libwacom-0.6 x11-drivers/xf86-input-wacom ) packagekit? ( >=app-admin/packagekit-base-0.7.4 ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( >=sys-apps/systemd-31 ) udev? ( virtual/udev[gudev] ) cups? ( sys-apps/sed ) dev-libs/libxml2:2 sys-devel/gettext >=dev-util/intltool-0.40 virtual/pkgconfig x11-proto/inputproto x11-proto/xf86miscproto >=x11-proto/xproto-7.0.15 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.31.0:2 >=x11-libs/gtk+-3.3.4:3 >=gnome-base/gnome-desktop-3.5.3:3= >=gnome-base/gsettings-desktop-schemas-3.5.90 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/libxkbfile x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/libXxf86misc colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] ) i18n? ( >=app-i18n/ibus-1.4.99 ) input_devices_wacom? ( >=dev-libs/libwacom-0.6 x11-drivers/xf86-input-wacom ) packagekit? ( >=app-admin/packagekit-base-0.7.4 ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( >=sys-apps/systemd-31 ) udev? ( virtual/udev[gudev] ) cups? ( sys-apps/sed ) dev-libs/libxml2:2 sys-devel/gettext >=dev-util/intltool-0.40 virtual/pkgconfig x11-proto/inputproto x11-proto/xf86miscproto >=x11-proto/xproto-7.0.15 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Gnome Settings Daemon
 EAPI=5
 HOMEPAGE=http://www.gnome.org
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.31.0:2 >=x11-libs/gtk+-3.3.4:3 >=gnome-base/gnome-desk
 REQUIRED_USE=packagekit? ( udev ) smartcard? ( udev )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.6/gnome-settings-daemon-3.6.4.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=2cd03a38efe5932105f983db391fbbce
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.8.0 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.8.0
index 5ac58efdf649..47918405ba1b 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.8.0
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.35.3:2 >=x11-libs/gtk+-3.7.8:3 >=gnome-base/gnome-desktop-3.7.90:3= >=gnome-base/gsettings-desktop-schemas-3.7.2.1 >=gnome-base/librsvg-2.36.2 media-fonts/cantarell media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-2 >=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/libxkbfile x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/libXxf86misc colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] ) i18n? ( >=app-i18n/ibus-1.4.99 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 x11-drivers/xf86-input-wacom ) packagekit? ( >=app-admin/packagekit-base-0.7.4 ) smartcard? ( >=dev-libs/nss-3.11.2 ) udev? ( virtual/udev[gudev] ) cups? ( sys-apps/sed ) dev-libs/libxml2:2 sys-devel/gettext >=dev-util/intltool-0.40 virtual/pkgconfig x11-proto/inputproto x11-proto/xf86miscproto >=x11-proto/xproto-7.0.15 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.35.3:2 >=x11-libs/gtk+-3.7.8:3 >=gnome-base/gnome-desktop-3.7.90:3= >=gnome-base/gsettings-desktop-schemas-3.7.2.1 >=gnome-base/librsvg-2.36.2 media-fonts/cantarell media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-2 >=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/libxkbfile x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/libXxf86misc colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] ) i18n? ( >=app-i18n/ibus-1.4.99 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 x11-drivers/xf86-input-wacom ) packagekit? ( >=app-admin/packagekit-base-0.7.4 ) smartcard? ( >=dev-libs/nss-3.11.2 ) udev? ( virtual/udev[gudev] ) cups? ( sys-apps/sed ) dev-libs/libxml2:2 sys-devel/gettext >=dev-util/intltool-0.40 virtual/pkgconfig x11-proto/inputproto x11-proto/xf86miscproto >=x11-proto/xproto-7.0.15 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Gnome Settings Daemon
 EAPI=5
 HOMEPAGE=http://www.gnome.org
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.35.3:2 >=x11-libs/gtk+-3.7.8:3 >=gnome-base/gnome-desk
 REQUIRED_USE=packagekit? ( udev ) smartcard? ( udev )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.8/gnome-settings-daemon-3.8.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=829d19f41b3355c93fe7eb803bfbc8e3
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.4.2 b/metadata/md5-cache/gnome-base/gnome-shell-3.4.2
index 5503e54b1d7a..f93fed53fb7c 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.4.2
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=app-crypt/gcr-3.3.90[introspection] >=dev-libs/glib-2.31.6:2 >=dev-libs/gjs-1.31.22 >=dev-libs/gobject-introspection-0.10.1 >=x11-libs/gtk+-3.3.9:3[introspection] >=media-libs/clutter-1.9.16:1.0[introspection] >=dev-libs/folks-0.5.2 >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 >=gnome-base/gnome-desktop-2.91.2:3 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-base/gnome-keyring-3.3.90 >=gnome-base/gnome-menus-2.29.10:3[introspection] gnome-base/libgnome-keyring >=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/telepathy-glib-0.17.5[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 >=x11-wm/mutter-3.4.1[introspection] >=x11-libs/startup-notification-0.11 app-misc/ca-certificates dev-libs/dbus-glib dev-libs/libxml2:2 gnome-base/librsvg media-libs/libcanberra media-libs/mesa media-sound/pulseaudio net-libs/libsoup:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) networkmanager? ( >=net-misc/networkmanager-0.8.999[introspection] ) systemd? ( >=sys-apps/systemd-31 ) >=sys-devel/gettext-0.17 >=dev-util/intltool-0.40 gnome-base/gnome-common virtual/pkgconfig !!=dev-lang/spidermonkey-1.8.2* || ( >=sys-devel/automake-1.12:1.12 ) >=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* )
+DEPEND=>=app-crypt/gcr-3.3.90[introspection] >=dev-libs/glib-2.31.6:2 >=dev-libs/gjs-1.31.22 >=dev-libs/gobject-introspection-0.10.1 >=x11-libs/gtk+-3.3.9:3[introspection] >=media-libs/clutter-1.9.16:1.0[introspection] >=dev-libs/folks-0.5.2 >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 >=gnome-base/gnome-desktop-2.91.2:3 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-base/gnome-keyring-3.3.90 >=gnome-base/gnome-menus-2.29.10:3[introspection] gnome-base/libgnome-keyring >=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/telepathy-glib-0.17.5[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 >=x11-wm/mutter-3.4.1[introspection] >=x11-libs/startup-notification-0.11 app-misc/ca-certificates dev-libs/dbus-glib dev-libs/libxml2:2 gnome-base/librsvg media-libs/libcanberra media-libs/mesa media-sound/pulseaudio net-libs/libsoup:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) networkmanager? ( >=net-misc/networkmanager-0.8.999[introspection] ) systemd? ( >=sys-apps/systemd-31 ) >=sys-devel/gettext-0.17 >=dev-util/intltool-0.40 gnome-base/gnome-common virtual/pkgconfig !!=dev-lang/spidermonkey-1.8.2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
 EAPI=4
 HOMEPAGE=http://live.gnome.org/GnomeShell
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=app-crypt/gcr-3.3.90[introspection] >=dev-libs/glib-2.31.6:2 >=dev-libs/gjs-1.31.22 >=dev-libs/gobject-introspection-0.10.1 >=x11-libs/gtk+-3.3.9:3[introspection] >=media-libs/clutter-1.9.16:1.0[introspection] >=dev-libs/folks-0.5.2 >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 >=gnome-base/gnome-desktop-2.91.2:3 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-base/gnome-keyring-3.3.90 >=gnome-base/gnome-menus-2.29.10:3[introspection] gnome-base/libgnome-keyring >=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/telepathy-glib-0.17.5[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 >=x11-wm/mutter-3.4.1[introspection] >=x11-libs/startup-notification-0.11 app-misc/ca-certificates dev-libs/dbus-glib dev-libs/libxml2:2 gnome-base/librsvg media-libs/libcanberra media-libs/mesa media-sound/pulseaudio net-libs/libsoup:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) networkmanager? ( >=net-misc/networkmanager-0.8.999[introspection] ) systemd? ( >=sys-apps/systemd-31 ) >=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[bluetooth(+)?] >=sys-apps/accountsservice-0.6.14[introspection] >=app-accessibility/caribou-0.3 x11-misc/xdg-utils media-fonts/dejavu x11-themes/gnome-icon-theme-symbolic networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) !systemd? ( sys-auth/consolekit ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.4/gnome-shell-3.4.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0e973edaaa84297ccacc2c153de93f5b
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.6.3.1 b/metadata/md5-cache/gnome-base/gnome-shell-3.6.3.1
index 6887fdc1989a..09791f53da4f 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.6.3.1
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.6.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.3.90[introspection] >=dev-libs/glib-2.31.6:2 >=dev-libs/gjs-1.33.2 >=dev-libs/gobject-introspection-0.10.1 >=x11-libs/gtk+-3.3.9:3[introspection] >=media-libs/clutter-1.11.11:1.0[introspection] >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 >=gnome-base/gnome-desktop-3.5.1:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.5.4 >=gnome-base/gnome-keyring-3.3.90 >=gnome-base/gnome-menus-3.5.3:3[introspection] gnome-base/libgnome-keyring >=gnome-extra/evolution-data-server-3.5.3:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 >=x11-wm/mutter-3.6.3[introspection] >=x11-libs/startup-notification-0.11 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/dbus-glib dev-libs/libxml2:2 gnome-base/librsvg media-libs/libcanberra media-libs/mesa media-sound/pulseaudio >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.5[introspection] ) networkmanager? ( >=net-misc/networkmanager-0.8.999[introspection] ) systemd? ( >=sys-apps/systemd-31 ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.17 >=dev-util/intltool-0.40 gnome-base/gnome-common >=sys-devel/gettext-0.17 virtual/pkgconfig !!=dev-lang/spidermonkey-1.8.2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.3.90[introspection] >=dev-libs/glib-2.31.6:2 >=dev-libs/gjs-1.33.2 >=dev-libs/gobject-introspection-0.10.1 >=x11-libs/gtk+-3.3.9:3[introspection] >=media-libs/clutter-1.11.11:1.0[introspection] >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 >=gnome-base/gnome-desktop-3.5.1:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.5.4 >=gnome-base/gnome-keyring-3.3.90 >=gnome-base/gnome-menus-3.5.3:3[introspection] gnome-base/libgnome-keyring >=gnome-extra/evolution-data-server-3.5.3:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 >=x11-wm/mutter-3.6.3[introspection] >=x11-libs/startup-notification-0.11 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/dbus-glib dev-libs/libxml2:2 gnome-base/librsvg media-libs/libcanberra media-libs/mesa media-sound/pulseaudio >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.5[introspection] ) networkmanager? ( >=net-misc/networkmanager-0.8.999[introspection] ) systemd? ( >=sys-apps/systemd-31 ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.17 >=dev-util/intltool-0.40 gnome-base/gnome-common >=sys-devel/gettext-0.17 virtual/pkgconfig !!=dev-lang/spidermonkey-1.8.2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
 EAPI=5
 HOMEPAGE=http://live.gnome.org/GnomeShell
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.3.90[introspection] >=dev-libs/glib-2.31.6:2 >=dev-libs/gjs-1.33.2 >=dev-libs/gobject-introspection-0.10.1 >=x11-libs/gtk+-3.3.9:3[introspection] >=media-libs/clutter-1.11.11:1.0[introspection] >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 >=gnome-base/gnome-desktop-3.5.1:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.5.4 >=gnome-base/gnome-keyring-3.3.90 >=gnome-base/gnome-menus-3.5.3:3[introspection] gnome-base/libgnome-keyring >=gnome-extra/evolution-data-server-3.5.3:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 >=x11-wm/mutter-3.6.3[introspection] >=x11-libs/startup-notification-0.11 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/dbus-glib dev-libs/libxml2:2 gnome-base/librsvg media-libs/libcanberra media-libs/mesa media-sound/pulseaudio >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.5[introspection] ) networkmanager? ( >=net-misc/networkmanager-0.8.999[introspection] ) systemd? ( >=sys-apps/systemd-31 ) >=sys-auth/polkit-0.101[introspection] >=app-accessibility/caribou-0.3 >=gnome-base/gdm-3.5[introspection] >=gnome-base/libgnomekbd-2.91.4[introspection] media-libs/cogl[introspection] >=sys-apps/accountsservice-0.6.14[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[bluetooth(+)?] x11-misc/xdg-utils media-fonts/dejavu x11-themes/gnome-icon-theme-symbolic i18n? ( >=app-i18n/ibus-1.4.99[dconf,gtk3,introspection] ) networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) !systemd? ( sys-auth/consolekit )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.6/gnome-shell-3.6.3.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5a4a6d3fe5ff11e0aa9f118ffc5cee42
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.8.0.1 b/metadata/md5-cache/gnome-base/gnome-shell-3.8.0.1
index b6915ef7a2ef..a7aee005a9a8 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.8.0.1
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.8.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.3.90[introspection] >=dev-libs/glib-2.35:2 >=dev-libs/gjs-1.35.8 >=dev-libs/gobject-introspection-0.10.1 >=x11-libs/gtk+-3.7.9:3[introspection] >=media-libs/clutter-1.13.4:1.0[introspection] >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.7.4 >=gnome-base/gnome-keyring-3.3.90 >=gnome-base/gnome-menus-3.5.3:3[introspection] gnome-base/libgnome-keyring >=gnome-extra/evolution-data-server-3.5.3:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 >=x11-wm/mutter-3.8.0[introspection] >=x11-libs/startup-notification-0.11 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/dbus-glib dev-libs/libxml2:2 gnome-base/librsvg media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.5[introspection] ) networkmanager? ( >=net-misc/networkmanager-0.9.6[introspection] ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.17 >=dev-util/intltool-0.40 gnome-base/gnome-common >=sys-devel/gettext-0.17 virtual/pkgconfig !!=dev-lang/spidermonkey-1.8.2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.3.90[introspection] >=dev-libs/glib-2.35:2 >=dev-libs/gjs-1.35.8 >=dev-libs/gobject-introspection-0.10.1 >=x11-libs/gtk+-3.7.9:3[introspection] >=media-libs/clutter-1.13.4:1.0[introspection] >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.7.4 >=gnome-base/gnome-keyring-3.3.90 >=gnome-base/gnome-menus-3.5.3:3[introspection] gnome-base/libgnome-keyring >=gnome-extra/evolution-data-server-3.5.3:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 >=x11-wm/mutter-3.8.0[introspection] >=x11-libs/startup-notification-0.11 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/dbus-glib dev-libs/libxml2:2 gnome-base/librsvg media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.5[introspection] ) networkmanager? ( >=net-misc/networkmanager-0.9.6[introspection] ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.17 >=dev-util/intltool-0.40 gnome-base/gnome-common >=sys-devel/gettext-0.17 virtual/pkgconfig !!=dev-lang/spidermonkey-1.8.2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
 EAPI=5
 HOMEPAGE=http://live.gnome.org/GnomeShell
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.3.90[introspection] >=dev-libs/glib-2.35:2 >=dev-libs/gjs-1.35.8 >=dev-libs/gobject-introspection-0.10.1 >=x11-libs/gtk+-3.7.9:3[introspection] >=media-libs/clutter-1.13.4:1.0[introspection] >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.7.4 >=gnome-base/gnome-keyring-3.3.90 >=gnome-base/gnome-menus-3.5.3:3[introspection] gnome-base/libgnome-keyring >=gnome-extra/evolution-data-server-3.5.3:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 >=x11-wm/mutter-3.8.0[introspection] >=x11-libs/startup-notification-0.11 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/dbus-glib dev-libs/libxml2:2 gnome-base/librsvg media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.5[introspection] ) networkmanager? ( >=net-misc/networkmanager-0.9.6[introspection] ) >=sys-auth/polkit-0.101[introspection] >=app-accessibility/caribou-0.4.8 >=gnome-base/gdm-3.5[introspection] >=gnome-base/libgnomekbd-2.91.4[introspection] media-libs/cogl[introspection] >=sys-apps/accountsservice-0.6.14[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[bluetooth(+)?] x11-misc/xdg-utils media-fonts/dejavu x11-themes/gnome-icon-theme-symbolic || ( sys-auth/consolekit >=sys-apps/systemd-31 ) i18n? ( >=app-i18n/ibus-1.4.99[dconf,gtk3,introspection] ) networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.8/gnome-shell-3.8.0.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=86ddddc756673c46aa94db5eda62413f
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.8.1 b/metadata/md5-cache/gnome-base/gnome-shell-3.8.1
index bb92ec3f6b93..f37442a2e5d5 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.8.1
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.3.90[introspection] >=dev-libs/glib-2.35:2 >=dev-libs/gjs-1.35.8 >=dev-libs/gobject-introspection-0.10.1 >=x11-libs/gtk+-3.7.9:3[introspection] >=media-libs/clutter-1.13.4:1.0[introspection] >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.7.4 >=gnome-base/gnome-keyring-3.3.90 >=gnome-base/gnome-menus-3.5.3:3[introspection] gnome-base/libgnome-keyring >=gnome-extra/evolution-data-server-3.5.3:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 >=x11-wm/mutter-3.8.1[introspection] >=x11-libs/startup-notification-0.11 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/dbus-glib dev-libs/libxml2:2 gnome-base/librsvg media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.5[introspection] ) networkmanager? ( >=net-misc/networkmanager-0.9.6[introspection] ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.17 >=dev-util/intltool-0.40 gnome-base/gnome-common >=sys-devel/gettext-0.17 virtual/pkgconfig !!=dev-lang/spidermonkey-1.8.2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.3.90[introspection] >=dev-libs/glib-2.35:2 >=dev-libs/gjs-1.35.8 >=dev-libs/gobject-introspection-0.10.1 >=x11-libs/gtk+-3.7.9:3[introspection] >=media-libs/clutter-1.13.4:1.0[introspection] >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.7.4 >=gnome-base/gnome-keyring-3.3.90 >=gnome-base/gnome-menus-3.5.3:3[introspection] gnome-base/libgnome-keyring >=gnome-extra/evolution-data-server-3.5.3:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 >=x11-wm/mutter-3.8.1[introspection] >=x11-libs/startup-notification-0.11 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/dbus-glib dev-libs/libxml2:2 gnome-base/librsvg media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.5[introspection] ) networkmanager? ( >=net-misc/networkmanager-0.9.6[introspection] ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.17 >=dev-util/intltool-0.40 gnome-base/gnome-common >=sys-devel/gettext-0.17 virtual/pkgconfig !!=dev-lang/spidermonkey-1.8.2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
 EAPI=5
 HOMEPAGE=http://live.gnome.org/GnomeShell
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.3.90[introspection] >=dev-libs/glib-2.35:2 >=dev-libs/gjs-1.35.8 >=dev-libs/gobject-introspection-0.10.1 >=x11-libs/gtk+-3.7.9:3[introspection] >=media-libs/clutter-1.13.4:1.0[introspection] >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.7.4 >=gnome-base/gnome-keyring-3.3.90 >=gnome-base/gnome-menus-3.5.3:3[introspection] gnome-base/libgnome-keyring >=gnome-extra/evolution-data-server-3.5.3:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 >=x11-wm/mutter-3.8.1[introspection] >=x11-libs/startup-notification-0.11 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/dbus-glib dev-libs/libxml2:2 gnome-base/librsvg media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.5[introspection] ) networkmanager? ( >=net-misc/networkmanager-0.9.6[introspection] ) >=sys-auth/polkit-0.101[introspection] >=app-accessibility/caribou-0.4.8 >=gnome-base/gdm-3.5[introspection] >=gnome-base/libgnomekbd-2.91.4[introspection] media-libs/cogl[introspection] >=sys-apps/accountsservice-0.6.14[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[bluetooth(+)?] x11-misc/xdg-utils media-fonts/dejavu x11-themes/gnome-icon-theme-symbolic || ( sys-auth/consolekit >=sys-apps/systemd-31 ) i18n? ( >=app-i18n/ibus-1.4.99[dconf,gtk3,introspection] ) networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.8/gnome-shell-3.8.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d9919a88eb32f4d7186beb1de99c0f41
diff --git a/metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r1 b/metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r1
index e81828f36f54..3ab6e011fd3a 100644
--- a/metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r1
+++ b/metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 virtual/pkgconfig >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=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 virtual/pkgconfig >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Gnome Virtual Filesystem
 EAPI=3
 HOMEPAGE=http://www.gnome.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=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 ) )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-vfs/2.24/gnome-vfs-2.24.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=bf89478dec66bbede8989815be640d3d
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.12.3 b/metadata/md5-cache/gnome-base/gvfs-1.12.3
index 10439d239572..becffd13e325 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.12.3
+++ b/metadata/md5-cache/gnome-base/gvfs-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.31.0:2 sys-apps/dbus dev-libs/libxml2 net-misc/openssh 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? ( || ( >=gnome-base/libgdu-3.0.2 =sys-apps/gnome-disk-utility-3.0.2-r300 =sys-apps/gnome-disk-utility-3.0.2-r200 ) ) 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] ) virtual/udev[gudev] ) udisks? ( >=sys-fs/udisks-1.90:2 ) http? ( >=net-libs/libsoup-gnome-2.26.0 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) >=dev-util/intltool-0.40 virtual/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.31.0:2 sys-apps/dbus dev-libs/libxml2 net-misc/openssh 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? ( || ( >=gnome-base/libgdu-3.0.2 =sys-apps/gnome-disk-utility-3.0.2-r300 =sys-apps/gnome-disk-utility-3.0.2-r200 ) ) 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] ) virtual/udev[gudev] ) udisks? ( >=sys-fs/udisks-1.90:2 ) http? ( >=net-libs/libsoup-gnome-2.26.0 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) >=dev-util/intltool-0.40 virtual/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GNOME Virtual Filesystem Layer
 EAPI=4
 HOMEPAGE=http://www.gnome.org
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.31.0:2 sys-apps/dbus dev-libs/libxml2 net-misc/openssh
 REQUIRED_USE=cdda? ( udev )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.12/gvfs-1.12.3.tar.xz http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=54be0e11a1db2e9c234f01f0a9a999de
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.12.3-r1 b/metadata/md5-cache/gnome-base/gvfs-1.12.3-r1
index 31513230bf0a..3f5586547046 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.12.3-r1
+++ b/metadata/md5-cache/gnome-base/gvfs-1.12.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.31.0:2 sys-apps/dbus:= dev-libs/libxml2:= net-misc/openssh 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? ( || ( >=gnome-base/libgdu-3.0.2 =sys-apps/gnome-disk-utility-3.0.2-r300 =sys-apps/gnome-disk-utility-3.0.2-r200 ) ) 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] ) virtual/udev:=[gudev] ) udisks? ( >=sys-fs/udisks-1.90:2 ) http? ( >=net-libs/libsoup-gnome-2.26.0:= ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) >=dev-util/intltool-0.40 virtual/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.31.0:2 sys-apps/dbus:= dev-libs/libxml2:= net-misc/openssh 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? ( || ( >=gnome-base/libgdu-3.0.2 =sys-apps/gnome-disk-utility-3.0.2-r300 =sys-apps/gnome-disk-utility-3.0.2-r200 ) ) 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] ) virtual/udev:=[gudev] ) udisks? ( >=sys-fs/udisks-1.90:2 ) http? ( >=net-libs/libsoup-gnome-2.26.0:= ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) >=dev-util/intltool-0.40 virtual/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GNOME Virtual Filesystem Layer
 EAPI=5
 HOMEPAGE=http://www.gnome.org
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.31.0:2 sys-apps/dbus:= dev-libs/libxml2:= net-misc/ope
 REQUIRED_USE=cdda? ( udev )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.12/gvfs-1.12.3.tar.xz http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=396f0b01cea1fa093ffb718aae5edf25
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.14.2 b/metadata/md5-cache/gnome-base/gvfs-1.14.2
index 072e82154455..bf8f4f36d781 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.14.2
+++ b/metadata/md5-cache/gnome-base/gvfs-1.14.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.33.12:2 sys-apps/dbus dev-libs/libxml2:2 net-misc/openssh 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? ( || ( >=gnome-base/libgdu-3.0.2 =sys-apps/gnome-disk-utility-3.0.2-r300 =sys-apps/gnome-disk-utility-3.0.2-r200 ) ) gnome-keyring? ( app-crypt/libsecret ) gphoto2? ( >=media-libs/libgphoto2-2.4.7:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-gnome-2.26.0 ) ios? ( >=app-pda/libimobiledevice-1.1.0 >=app-pda/libplist-1 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) systemd? ( sys-apps/systemd ) udev? ( cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) virtual/udev[gudev] ) udisks? ( >=sys-fs/udisks-1.97:2 ) dev-libs/libxslt >=dev-util/intltool-0.40 virtual/pkgconfig dev-util/gdbus-codegen dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.33.12:2 sys-apps/dbus dev-libs/libxml2:2 net-misc/openssh 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? ( || ( >=gnome-base/libgdu-3.0.2 =sys-apps/gnome-disk-utility-3.0.2-r300 =sys-apps/gnome-disk-utility-3.0.2-r200 ) ) gnome-keyring? ( app-crypt/libsecret ) gphoto2? ( >=media-libs/libgphoto2-2.4.7:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-gnome-2.26.0 ) ios? ( >=app-pda/libimobiledevice-1.1.0 >=app-pda/libplist-1 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) systemd? ( sys-apps/systemd ) udev? ( cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) virtual/udev[gudev] ) udisks? ( >=sys-fs/udisks-1.97:2 ) dev-libs/libxslt >=dev-util/intltool-0.40 virtual/pkgconfig dev-util/gdbus-codegen dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GNOME Virtual Filesystem Layer
 EAPI=5
 HOMEPAGE=http://www.gnome.org
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.33.12:2 sys-apps/dbus dev-libs/libxml2:2 net-misc/open
 REQUIRED_USE=cdda? ( udev )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.14/gvfs-1.14.2.tar.xz http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9d80ac043b501d02324136d4c0acd175
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.16.0 b/metadata/md5-cache/gnome-base/gvfs-1.16.0
index 502569650e75..f8bb7e89e9c7 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.16.0
+++ b/metadata/md5-cache/gnome-base/gvfs-1.16.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.35:2 sys-apps/dbus dev-libs/libxml2:2 net-misc/openssh 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? ( || ( >=gnome-base/libgdu-3.0.2 =sys-apps/gnome-disk-utility-3.0.2-r300 =sys-apps/gnome-disk-utility-3.0.2-r200 ) ) gnome-keyring? ( app-crypt/libsecret ) gphoto2? ( >=media-libs/libgphoto2-2.4.7:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.34.0[gnome] ) ) ios? ( >=app-pda/libimobiledevice-1.1.0 >=app-pda/libplist-1 ) mtp? ( >=media-libs/libmtp-1.1.5 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) systemd? ( sys-apps/systemd ) udev? ( cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) virtual/udev[gudev] ) udisks? ( >=sys-fs/udisks-1.97:2 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 ) dev-libs/libxslt >=dev-util/intltool-0.40 virtual/pkgconfig dev-util/gdbus-codegen dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.35:2 sys-apps/dbus dev-libs/libxml2:2 net-misc/openssh 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? ( || ( >=gnome-base/libgdu-3.0.2 =sys-apps/gnome-disk-utility-3.0.2-r300 =sys-apps/gnome-disk-utility-3.0.2-r200 ) ) gnome-keyring? ( app-crypt/libsecret ) gphoto2? ( >=media-libs/libgphoto2-2.4.7:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.34.0[gnome] ) ) ios? ( >=app-pda/libimobiledevice-1.1.0 >=app-pda/libplist-1 ) mtp? ( >=media-libs/libmtp-1.1.5 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) systemd? ( sys-apps/systemd ) udev? ( cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) virtual/udev[gudev] ) udisks? ( >=sys-fs/udisks-1.97:2 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 ) dev-libs/libxslt >=dev-util/intltool-0.40 virtual/pkgconfig dev-util/gdbus-codegen dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GNOME Virtual Filesystem Layer
 EAPI=5
 HOMEPAGE=http://www.gnome.org
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.35:2 sys-apps/dbus dev-libs/libxml2:2 net-misc/openssh
 REQUIRED_USE=cdda? ( udev )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.16/gvfs-1.16.0.tar.xz http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=13ebf76fa84701e521519cfc24626ac8
diff --git a/metadata/md5-cache/gnome-base/libgdu-3.0.2 b/metadata/md5-cache/gnome-base/libgdu-3.0.2
index fcddec4e6f9d..8881c22eeef8 100644
--- a/metadata/md5-cache/gnome-base/libgdu-3.0.2
+++ b/metadata/md5-cache/gnome-base/libgdu-3.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=x11-libs/gtk+-2.90.7:3 =sys-fs/udisks-1.0*:0 >=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 ) sys-devel/gettext gnome-base/gnome-common app-text/docbook-xml-dtd:4.1.2 app-text/gnome-doc-utils virtual/pkgconfig >=dev-util/intltool-0.35 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.3 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=x11-libs/gtk+-2.90.7:3 =sys-fs/udisks-1.0*:0 >=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 ) sys-devel/gettext gnome-base/gnome-common app-text/docbook-xml-dtd:4.1.2 app-text/gnome-doc-utils virtual/pkgconfig >=dev-util/intltool-0.35 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.3 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GNOME Disk Utility libraries
 EAPI=4
 HOMEPAGE=http://git.gnome.org/browse/gnome-disk-utility
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=x11-libs/gtk+-2.90.7:3 =sys-fs/udisks-1.0*:0 >=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 ) !<=sys-apps/gnome-disk-utility-3.0.2-r200 !=sys-apps/gnome-disk-utility-3.0.2-r300
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-disk-utility/3.0/gnome-disk-utility-3.0.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=55f29c19e8426391a4893801b97d1c5d
diff --git a/metadata/md5-cache/gnome-base/libglade-2.6.4 b/metadata/md5-cache/gnome-base/libglade-2.6.4
index 8d8f6eec9d56..56c5f524247d 100644
--- a/metadata/md5-cache/gnome-base/libglade-2.6.4
+++ b/metadata/md5-cache/gnome-base/libglade-2.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.10:2 >=x11-libs/gtk+-2.8.10:2 >=dev-libs/atk-1.9 >=dev-libs/libxml2-2.4.10 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=>=dev-libs/glib-2.10:2 >=x11-libs/gtk+-2.8.10:2 >=dev-libs/atk-1.9 >=dev-libs/libxml2-2.4.10 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=Library to construct graphical interfaces at runtime
 EAPI=3
 HOMEPAGE=http://library.gnome.org/devel/libglade/stable/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.10:2 >=x11-libs/gtk+-2.8.10:2 >=dev-libs/atk-1.9 >=dev-libs/libxml2-2.4.10 =dev-lang/python-2*
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=b8c182ae9b664e6ae9480a41b7efcff6
diff --git a/metadata/md5-cache/gnome-base/libgnome-keyring-2.32.0 b/metadata/md5-cache/gnome-base/libgnome-keyring-2.32.0
index 5e7fab0f01ec..105885f3c7e2 100644
--- a/metadata/md5-cache/gnome-base/libgnome-keyring-2.32.0
+++ b/metadata/md5-cache/gnome-base/libgnome-keyring-2.32.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/dbus-1.0 >=gnome-base/gnome-keyring-2.29[test?] !<gnome-base/gnome-keyring-2.29 dev-util/gtk-doc-am >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-apps/dbus-1.0 >=gnome-base/gnome-keyring-2.29[test?] !<gnome-base/gnome-keyring-2.29 dev-util/gtk-doc-am >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Compatibility library for accessing secrets
 EAPI=4
 HOMEPAGE=http://live.gnome.org/GnomeKeyring
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=sys-apps/dbus-1.0 >=gnome-base/gnome-keyring-2.29[test?] !<gnome-base/gnome-keyring-2.29
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgnome-keyring/2.32/libgnome-keyring-2.32.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e135dc7f5b122bac26337a6c264194eb
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.36.1 b/metadata/md5-cache/gnome-base/librsvg-2.36.1
index e5ec1820b003..7436523d510d 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.36.1
+++ b/metadata/md5-cache/gnome-base/librsvg-2.36.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.16 >=dev-libs/libxml2-2.7:2 >=dev-libs/libcroco-0.6.1 x11-libs/gdk-pixbuf:2[introspection?] gtk? ( >=x11-libs/gtk+-2.16:2 tools? ( >=x11-libs/gtk+-3:3 ) ) introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.13 ) dev-libs/gobject-introspection-common >=dev-util/gtk-doc-am-1.13 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.16 >=dev-libs/libxml2-2.7:2 >=dev-libs/libcroco-0.6.1 x11-libs/gdk-pixbuf:2[introspection?] gtk? ( >=x11-libs/gtk+-2.16:2 tools? ( >=x11-libs/gtk+-3:3 ) ) introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.13 ) dev-libs/gobject-introspection-common >=dev-util/gtk-doc-am-1.13 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
 EAPI=4
 HOMEPAGE=http://librsvg.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.16 >=dev-libs/libxml2-2.7:2 >=dev-libs/libcroco-0.6.1 x11-libs/gdk-pixbuf:2[introspection?] gtk? ( >=x11-libs/gtk+-2.16:2 tools? ( >=x11-libs/gtk+-3:3 ) ) introspection? ( >=dev-libs/gobject-introspection-0.10.8 )
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.36/librsvg-2.36.1.tar.xz mirror://gentoo/introspection.m4.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e5be3805a44db10f9ce192ac155bcbcb
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.36.3 b/metadata/md5-cache/gnome-base/librsvg-2.36.3
index 46ca6f9a6023..457e04da9fd1 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.36.3
+++ b/metadata/md5-cache/gnome-base/librsvg-2.36.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.16 >=dev-libs/libxml2-2.7:2 >=dev-libs/libcroco-0.6.1 x11-libs/gdk-pixbuf:2[introspection?] gtk? ( >=x11-libs/gtk+-2.16:2 tools? ( >=x11-libs/gtk+-3:3 ) ) introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) virtual/pkgconfig dev-libs/gobject-introspection-common dev-libs/vala-common >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.13 ) vala? ( || ( dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.16 >=dev-libs/libxml2-2.7:2 >=dev-libs/libcroco-0.6.1 x11-libs/gdk-pixbuf:2[introspection?] gtk? ( >=x11-libs/gtk+-2.16:2 tools? ( >=x11-libs/gtk+-3:3 ) ) introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) virtual/pkgconfig dev-libs/gobject-introspection-common dev-libs/vala-common >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.13 ) vala? ( || ( dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
 EAPI=4
 HOMEPAGE=http://librsvg.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.16 >=dev-
 REQUIRED_USE=vala? ( introspection )
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.36/librsvg-2.36.3.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f00ea6657319c97343fa651f7730561f
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.36.4 b/metadata/md5-cache/gnome-base/librsvg-2.36.4
index 0d3bed04db22..31a9d944ec24 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.36.4
+++ b/metadata/md5-cache/gnome-base/librsvg-2.36.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.16 >=dev-libs/libxml2-2.7:2 >=dev-libs/libcroco-0.6.1 x11-libs/gdk-pixbuf:2[introspection?] gtk? ( >=x11-libs/gtk+-2.16:2 tools? ( >=x11-libs/gtk+-3:3 ) ) introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) virtual/pkgconfig dev-libs/gobject-introspection-common dev-libs/vala-common >=dev-util/gtk-doc-am-1.13 vala? ( || ( dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.16 >=dev-libs/libxml2-2.7:2 >=dev-libs/libcroco-0.6.1 x11-libs/gdk-pixbuf:2[introspection?] gtk? ( >=x11-libs/gtk+-2.16:2 tools? ( >=x11-libs/gtk+-3:3 ) ) introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) virtual/pkgconfig dev-libs/gobject-introspection-common dev-libs/vala-common >=dev-util/gtk-doc-am-1.13 vala? ( || ( dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
 EAPI=4
 HOMEPAGE=https://live.gnome.org/LibRsvg
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.16 >=dev-
 REQUIRED_USE=vala? ( introspection )
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.36/librsvg-2.36.4.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=692f207793c004bee9dc3a5653f172a1
diff --git a/metadata/md5-cache/gnome-base/nautilus-2.32.2.1-r2 b/metadata/md5-cache/gnome-base/nautilus-2.32.2.1-r2
index 24528d36fda7..cf2b3288ac3f 100644
--- a/metadata/md5-cache/gnome-base/nautilus-2.32.2.1-r2
+++ b/metadata/md5-cache/gnome-base/nautilus-2.32.2.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.28.0:2 >=gnome-base/gnome-desktop-2.29.91:2 >=x11-libs/pango-1.1.2 >=x11-libs/gtk+-2.22:2[introspection?] >=dev-libs/libxml2-2.4.7:2 >=media-libs/libexif-0.5.12 >=gnome-base/gconf-2:2 dev-libs/libunique:1 gnome-base/dconf x11-libs/libXext x11-libs/libXrender introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) xmp? ( media-libs/exempi:2 ) >=dev-lang/perl-5 sys-devel/gettext virtual/pkgconfig dev-util/gtk-doc-am >=dev-util/intltool-0.40.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.28.0:2 >=gnome-base/gnome-desktop-2.29.91:2 >=x11-libs/pango-1.1.2 >=x11-libs/gtk+-2.22:2[introspection?] >=dev-libs/libxml2-2.4.7:2 >=media-libs/libexif-0.5.12 >=gnome-base/gconf-2:2 dev-libs/libunique:1 gnome-base/dconf x11-libs/libXext x11-libs/libXrender introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) xmp? ( media-libs/exempi:2 ) >=dev-lang/perl-5 sys-devel/gettext virtual/pkgconfig dev-util/gtk-doc-am >=dev-util/intltool-0.40.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A file manager for the GNOME desktop
 EAPI=4
 HOMEPAGE=http://live.gnome.org/Nautilus
@@ -10,5 +10,5 @@ PDEPEND=gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 ) >=gnome-base/gvfs-0.1.2
 RDEPEND=>=dev-libs/glib-2.28.0:2 >=gnome-base/gnome-desktop-2.29.91:2 >=x11-libs/pango-1.1.2 >=x11-libs/gtk+-2.22:2[introspection?] >=dev-libs/libxml2-2.4.7:2 >=media-libs/libexif-0.5.12 >=gnome-base/gconf-2:2 dev-libs/libunique:1 gnome-base/dconf x11-libs/libXext x11-libs/libXrender introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) xmp? ( media-libs/exempi:2 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus/2.32/nautilus-2.32.2.1.tar.bz2 http://dev.gentoo.org/~pacho/gnome/nautilus-2.32.2.1-patches.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=70e97c5d7a57d9bad864c606eae01217
diff --git a/metadata/md5-cache/gnome-base/orbit-2.14.19-r1 b/metadata/md5-cache/gnome-base/orbit-2.14.19-r1
index a1d511107904..8edaf69c5224 100644
--- a/metadata/md5-cache/gnome-base/orbit-2.14.19-r1
+++ b/metadata/md5-cache/gnome-base/orbit-2.14.19-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.8:2 >=dev-libs/libIDL-0.8.2 dev-util/gtk-doc-am virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.8:2 >=dev-libs/libIDL-0.8.2 dev-util/gtk-doc-am virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ORBit2 is a high-performance CORBA ORB
 EAPI=3
 HOMEPAGE=http://projects.gnome.org/ORBit2/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-libs/glib-2.8:2 >=dev-libs/libIDL-0.8.2
 SLOT=2
 SRC_URI=mirror://gnome/sources/ORBit2/2.14/ORBit2-2.14.19.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=de1c3514f976a158d708e847f5b76593
diff --git a/metadata/md5-cache/gnome-base/orbit-2.14.19-r2 b/metadata/md5-cache/gnome-base/orbit-2.14.19-r2
index be9b8c9f45fb..7e47616579ee 100644
--- a/metadata/md5-cache/gnome-base/orbit-2.14.19-r2
+++ b/metadata/md5-cache/gnome-base/orbit-2.14.19-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.8:2 >=dev-libs/libIDL-0.8.2 dev-util/gtk-doc-am virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.8:2 >=dev-libs/libIDL-0.8.2 dev-util/gtk-doc-am virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ORBit2 is a high-performance CORBA ORB
 EAPI=5
 HOMEPAGE=http://projects.gnome.org/ORBit2/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.8:2 >=dev-libs/libIDL-0.8.2
 REQUIRED_USE=test? ( debug )
 SLOT=2
 SRC_URI=mirror://gnome/sources/ORBit2/2.14/ORBit2-2.14.19.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dc2231592d51b718703ff84071dbd760
diff --git a/metadata/md5-cache/gnome-extra/activity-log-manager-0.9.4 b/metadata/md5-cache/gnome-extra/activity-log-manager-0.9.4
index 8737f30cab27..2cbf984c975f 100644
--- a/metadata/md5-cache/gnome-extra/activity-log-manager-0.9.4
+++ b/metadata/md5-cache/gnome-extra/activity-log-manager-0.9.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=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-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=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-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GUI which lets you easily control what gets logged by Zeitgeist
 EAPI=5
 HOMEPAGE=https://launchpad.net/activity-log-manager/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=http://launchpad.net/history-manager/0.9/0.9.4/+download/activity-log-manager-0.9.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e86f7075fb87d21d5268de7233a1639d
diff --git a/metadata/md5-cache/gnome-extra/activity-log-manager-0.9.4-r1 b/metadata/md5-cache/gnome-extra/activity-log-manager-0.9.4-r1
index 689efe841085..5fac23713d85 100644
--- a/metadata/md5-cache/gnome-extra/activity-log-manager-0.9.4-r1
+++ b/metadata/md5-cache/gnome-extra/activity-log-manager-0.9.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=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-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=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-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GUI which lets you easily control what gets logged by Zeitgeist
 EAPI=5
 HOMEPAGE=https://launchpad.net/activity-log-manager/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=http://launchpad.net/history-manager/0.9/0.9.4/+download/activity-log-manager-0.9.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dc396be8b8ae6d7a9628fc5617f4ab2f
diff --git a/metadata/md5-cache/gnome-extra/cameramonitor-0.3.2 b/metadata/md5-cache/gnome-extra/cameramonitor-0.3.2
index 50a2f16d4249..126ecb89a68b 100644
--- a/metadata/md5-cache/gnome-extra/cameramonitor-0.3.2
+++ b/metadata/md5-cache/gnome-extra/cameramonitor-0.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-python/gconf-python:2 dev-python/notify-python dev-python/pyinotify dev-python/dbus-python app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-python/gconf-python:2 dev-python/notify-python dev-python/pyinotify dev-python/dbus-python app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Local Webcam monitoring in system tray.
 EAPI=5
 HOMEPAGE=https://launchpad.net/cameramonitor
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-python/gconf-python:2 dev-python/notify-python dev-python/pyinotify dev-python/dbus-python =dev-lang/python-2*
 SLOT=0
 SRC_URI=https://launchpad.net/cameramonitor/trunk/0.3.2/+download/cameramonitor-0.3.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ba97847f1a440ce6ab0dbb5762c7dc76
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-1.6.7-r1 b/metadata/md5-cache/gnome-extra/cinnamon-1.6.7-r1
index 9f0b209c5135..2b9f1fb4c286 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-1.6.7-r1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-1.6.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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] media-libs/cogl:1.0=[introspection] app-misc/ca-certificates >=dev-libs/json-glib-0.13.2 >=gnome-base/gnome-desktop-2.91.2:3=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 >=media-libs/gstreamer-0.10.16:0.10 >=media-libs/gst-plugins-base-0.10.16:0.10 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-wm/muffin-1.0.5[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 python_single_target_python2_6? ( dev-lang/python:2.6[xml] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] bluetooth? ( >=net-wireless/gnome-bluetooth-3.4:=[introspection] ) networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=sys-devel/gettext-0.17 virtual/pkgconfig >=dev-util/intltool-0.40 gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=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] media-libs/cogl:1.0=[introspection] app-misc/ca-certificates >=dev-libs/json-glib-0.13.2 >=gnome-base/gnome-desktop-2.91.2:3=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 >=media-libs/gstreamer-0.10.16:0.10 >=media-libs/gst-plugins-base-0.10.16:0.10 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-wm/muffin-1.0.5[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 python_single_target_python2_6? ( dev-lang/python:2.6[xml] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] bluetooth? ( >=net-wireless/gnome-bluetooth-3.4:=[introspection] ) networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=sys-devel/gettext-0.17 virtual/pkgconfig >=dev-util/intltool-0.40 gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
 EAPI=5
 HOMEPAGE=http://cinnamon.linuxmint.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=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] media-libs/cogl:1.0=[introspection] app-misc/ca-certificates >=dev-libs/json-glib-0.13.2 >=gnome-base/gnome-desktop-2.91.2:3=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 >=media-libs/gstreamer-0.10.16:0.10 >=media-libs/gst-plugins-base-0.10.16:0.10 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-wm/muffin-1.0.5[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 python_single_target_python2_6? ( dev-lang/python:2.6[xml] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] bluetooth? ( >=net-wireless/gnome-bluetooth-3.4:=[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[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/gconf-python:2 dev-python/imaging dev-python/lxml x11-themes/gnome-icon-theme-symbolic dev-python/pygobject:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] gnome-extra/nemo || ( app-admin/openrc-settingsd >=sys-apps/systemd-30 <gnome-base/gnome-settings-daemon-3.3.5 ) networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/Cinnamon/tarball/1.6.7 -> cinnamon-1.6.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8447f4065c8522bc4de995c41b1b0f52
diff --git a/metadata/md5-cache/gnome-extra/connman-gnome-0.7 b/metadata/md5-cache/gnome-extra/connman-gnome-0.7
index 8dd092e6ef9a..4be8af8706a5 100644
--- a/metadata/md5-cache/gnome-extra/connman-gnome-0.7
+++ b/metadata/md5-cache/gnome-extra/connman-gnome-0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare unpack
-DEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.73 >=x11-libs/gtk+-2.10:2 >=net-misc/connman-1.0 >=dev-util/intltool-0.35 >=dev-lang/perl-5.8.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.73 >=x11-libs/gtk+-2.10:2 >=net-misc/connman-1.0 >=dev-util/intltool-0.35 >=dev-lang/perl-5.8.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Provides a daemon for managing internet connections
 EAPI=5
 HOMEPAGE=https://github.com/connectivity/connman-gnome
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.73 >=x11-libs/gtk+-2.10:2 >=net-misc/connman-1.0
 SLOT=0
 SRC_URI=https://github.com/connectivity/connman-gnome/archive/0.7.tar.gz -> connman-gnome-0.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	vcs-snapshot	3facff03591093044e38f21285a02129
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	vcs-snapshot	3facff03591093044e38f21285a02129
 _md5_=bb2ee53607a48850acd5eef4f359dd23
diff --git a/metadata/md5-cache/gnome-extra/contacts-0.12 b/metadata/md5-cache/gnome-extra/contacts-0.12
index 8b97948c0aea..7c8cab46d5d9 100644
--- a/metadata/md5-cache/gnome-extra/contacts-0.12
+++ b/metadata/md5-cache/gnome-extra/contacts-0.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A small, lightweight addressbook for GNOME
 EAPI=4
 HOMEPAGE=http://pimlico-project.org/contacts.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/contacts/0.12/contacts-0.12.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=be51ef075a8aa52645af8791f2a667d4
diff --git a/metadata/md5-cache/gnome-extra/docky-2.1.4 b/metadata/md5-cache/gnome-extra/docky-2.1.4
index 08efe29d7db9..31a922947c0a 100644
--- a/metadata/md5-cache/gnome-extra/docky-2.1.4
+++ b/metadata/md5-cache/gnome-extra/docky-2.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-dotnet/gconf-sharp >=dev-dotnet/gio-sharp-0.2-r1 dev-dotnet/glib-sharp dev-dotnet/gnome-desktop-sharp dev-dotnet/gnome-keyring-sharp dev-dotnet/gtk-sharp dev-dotnet/mono-addins[gtk] dev-dotnet/notify-sharp dev-dotnet/rsvg-sharp dev-dotnet/wnck-sharp dev-util/intltool virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-dotnet/gconf-sharp >=dev-dotnet/gio-sharp-0.2-r1 dev-dotnet/glib-sharp dev-dotnet/gnome-desktop-sharp dev-dotnet/gnome-keyring-sharp dev-dotnet/gtk-sharp dev-dotnet/mono-addins[gtk] dev-dotnet/notify-sharp dev-dotnet/rsvg-sharp dev-dotnet/wnck-sharp dev-util/intltool virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Elegant, powerful, clean dock
 EAPI=4
 HOMEPAGE=https://wiki.go-docky.com
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-dotnet/gconf-sharp >=dev-dotnet/gio-sharp-0.2-r1 dev-dotnet/glib-sharp dev-dotnet/gnome-desktop-sharp dev-dotnet/gnome-keyring-sharp dev-dotnet/gtk-sharp dev-dotnet/mono-addins[gtk] dev-dotnet/notify-sharp dev-dotnet/rsvg-sharp dev-dotnet/wnck-sharp
 SLOT=0
 SRC_URI=http://launchpad.net/docky/2.1/2.1.4/+download/docky-2.1.4.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3afba6ae467e3cf73d2a2378b1822b12
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-2.32.3-r3 b/metadata/md5-cache/gnome-extra/evolution-data-server-2.32.3-r3
index 10d921fe30a2..acc80f1da04d 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-2.32.3-r3
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-2.32.3-r3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
 RDEPEND=>=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/libgnome-keyring ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-2.25.4:2 <dev-libs/libgweather-2.91:2 )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=1dea9f60505e6b22cf45833ed8804c77
diff --git a/metadata/md5-cache/gnome-extra/evolution-kolab-3.6.3 b/metadata/md5-cache/gnome-extra/evolution-kolab-3.6.3
index ee842eddbfce..bf23589f5d9a 100644
--- a/metadata/md5-cache/gnome-extra/evolution-kolab-3.6.3
+++ b/metadata/md5-cache/gnome-extra/evolution-kolab-3.6.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=mail-client/evolution-3.6.3:2.0 >=gnome-extra/evolution-data-server-3.6.3 =gnome-extra/evolution-data-server-3.6* >=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.32:2 >=dev-libs/libical-0.44 dev-libs/libxml2 dev-libs/nss >=gnome-base/gconf-2:2 >=net-misc/curl-7.19[ssl] >=x11-libs/gtk+-3.2:3 dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=mail-client/evolution-3.6.3:2.0 >=gnome-extra/evolution-data-server-3.6.3 =gnome-extra/evolution-data-server-3.6* >=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.32:2 >=dev-libs/libical-0.44 dev-libs/libxml2 dev-libs/nss >=gnome-base/gconf-2:2 >=net-misc/curl-7.19[ssl] >=x11-libs/gtk+-3.2:3 dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Evolution module for connecting to Kolab groupware servers
 EAPI=5
 HOMEPAGE=https://live.gnome.org/Evolution/Kolab
@@ -9,5 +9,5 @@ RDEPEND=>=mail-client/evolution-3.6.3:2.0 >=gnome-extra/evolution-data-server-3.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-kolab/3.6/evolution-kolab-3.6.3.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6b0be223c1715410423209b0ecb6f798
diff --git a/metadata/md5-cache/gnome-extra/evolution-kolab-3.6.4 b/metadata/md5-cache/gnome-extra/evolution-kolab-3.6.4
index a39fdfe1b5a8..74c820fdba13 100644
--- a/metadata/md5-cache/gnome-extra/evolution-kolab-3.6.4
+++ b/metadata/md5-cache/gnome-extra/evolution-kolab-3.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=mail-client/evolution-3.6:2.0 >=gnome-extra/evolution-data-server-3.6:= =gnome-extra/evolution-data-server-3.6* >=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.32:2 >=dev-libs/libical-0.44 dev-libs/libxml2 dev-libs/nss >=gnome-base/gconf-2:2 >=net-misc/curl-7.19[ssl] >=x11-libs/gtk+-3.2:3 dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=mail-client/evolution-3.6:2.0 >=gnome-extra/evolution-data-server-3.6:= =gnome-extra/evolution-data-server-3.6* >=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.32:2 >=dev-libs/libical-0.44 dev-libs/libxml2 dev-libs/nss >=gnome-base/gconf-2:2 >=net-misc/curl-7.19[ssl] >=x11-libs/gtk+-3.2:3 dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Evolution module for connecting to Kolab groupware servers
 EAPI=5
 HOMEPAGE=https://live.gnome.org/Evolution/Kolab
@@ -9,5 +9,5 @@ RDEPEND=>=mail-client/evolution-3.6:2.0 >=gnome-extra/evolution-data-server-3.6:
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-kolab/3.6/evolution-kolab-3.6.4.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=332249ab9522a76237185361826331a3
diff --git a/metadata/md5-cache/gnome-extra/evolution-kolab-3.8.0 b/metadata/md5-cache/gnome-extra/evolution-kolab-3.8.0
index 6bca3d9b2cd5..9baa92f84dea 100644
--- a/metadata/md5-cache/gnome-extra/evolution-kolab-3.8.0
+++ b/metadata/md5-cache/gnome-extra/evolution-kolab-3.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=mail-client/evolution-3.8.0:2.0 >=gnome-extra/evolution-data-server-3.8.0 =gnome-extra/evolution-data-server-3.8* >=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.32:2 >=dev-libs/libical-0.44 dev-libs/libxml2 dev-libs/nss >=gnome-base/gconf-2:2 >=net-misc/curl-7.19[ssl] >=x11-libs/gtk+-3.2:3 dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=mail-client/evolution-3.8.0:2.0 >=gnome-extra/evolution-data-server-3.8.0 =gnome-extra/evolution-data-server-3.8* >=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.32:2 >=dev-libs/libical-0.44 dev-libs/libxml2 dev-libs/nss >=gnome-base/gconf-2:2 >=net-misc/curl-7.19[ssl] >=x11-libs/gtk+-3.2:3 dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Evolution module for connecting to Kolab groupware servers
 EAPI=5
 HOMEPAGE=https://live.gnome.org/Evolution/Kolab
@@ -9,5 +9,5 @@ RDEPEND=>=mail-client/evolution-3.8.0:2.0 >=gnome-extra/evolution-data-server-3.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-kolab/3.8/evolution-kolab-3.8.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d28830f113f800c650dc6a949c7e65fb
diff --git a/metadata/md5-cache/gnome-extra/evolution-kolab-3.8.1 b/metadata/md5-cache/gnome-extra/evolution-kolab-3.8.1
index b02fb1606e39..90a7acabec7b 100644
--- a/metadata/md5-cache/gnome-extra/evolution-kolab-3.8.1
+++ b/metadata/md5-cache/gnome-extra/evolution-kolab-3.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=mail-client/evolution-3.8.1:2.0 =gnome-extra/evolution-data-server-3.8* >=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.32:2 >=dev-libs/libical-0.44 dev-libs/libxml2 dev-libs/nss >=gnome-base/gconf-2:2 >=net-misc/curl-7.19[ssl] >=x11-libs/gtk+-3.2:3 dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=mail-client/evolution-3.8.1:2.0 =gnome-extra/evolution-data-server-3.8* >=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.32:2 >=dev-libs/libical-0.44 dev-libs/libxml2 dev-libs/nss >=gnome-base/gconf-2:2 >=net-misc/curl-7.19[ssl] >=x11-libs/gtk+-3.2:3 dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Evolution module for connecting to Kolab groupware servers
 EAPI=5
 HOMEPAGE=https://live.gnome.org/Evolution/Kolab
@@ -9,5 +9,5 @@ RDEPEND=>=mail-client/evolution-3.8.1:2.0 =gnome-extra/evolution-data-server-3.8
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-kolab/3.8/evolution-kolab-3.8.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8935e2b76b9a0a83595ff35af9017250
diff --git a/metadata/md5-cache/gnome-extra/fast-user-switch-applet-2.24.0 b/metadata/md5-cache/gnome-extra/fast-user-switch-applet-2.24.0
index 91af148f9016..f8c0507bf637 100644
--- a/metadata/md5-cache/gnome-extra/fast-user-switch-applet-2.24.0
+++ b/metadata/md5-cache/gnome-extra/fast-user-switch-applet-2.24.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 virtual/pkgconfig >=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Fast User Switching Applet for Gnome Desktop
 EAPI=2
 HOMEPAGE=http://www.gnome.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.1 LGPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://gnome/sources/fast-user-switch-applet/2.24/fast-user-switch-applet-2.24.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7327bf44d8140be2e87aad21e66724e1
diff --git a/metadata/md5-cache/gnome-extra/gdesklets-core-0.36.3-r3 b/metadata/md5-cache/gnome-extra/gdesklets-core-0.36.3-r3
index d502e693af88..08f9a1b8b8f8 100644
--- a/metadata/md5-cache/gnome-extra/gdesklets-core-0.36.3-r3
+++ b/metadata/md5-cache/gnome-extra/gdesklets-core-0.36.3-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2 >=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-util/intltool sys-devel/gettext virtual/pkgconfig >=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2 >=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-util/intltool sys-devel/gettext virtual/pkgconfig >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNOME Desktop Applets: Core library for desktop applets
 EAPI=3
 HOMEPAGE=http://gdesklets.de
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 >=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] )
 SLOT=0
 SRC_URI=http://gdesklets.de/files/gdesklets-0.36.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=10a0d9543c33c9519c253c7367de778d
diff --git a/metadata/md5-cache/gnome-extra/gnome-do-0.8.5 b/metadata/md5-cache/gnome-extra/gnome-do-0.8.5
index eeb298997a2f..7c25f5580003 100644
--- a/metadata/md5-cache/gnome-extra/gnome-do-0.8.5
+++ b/metadata/md5-cache/gnome-extra/gnome-do-0.8.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=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 virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNOME Do allows you to get things done quickly
 EAPI=2
 HOMEPAGE=http://do.davebsd.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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
 SLOT=0
 SRC_URI=https://launchpad.net/do/trunk/0.8.5/+download/gnome-do-0.8.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=20a7945a46e8f3ca7fed74d8feca199e
diff --git a/metadata/md5-cache/gnome-extra/gnome-games-2.28.2 b/metadata/md5-cache/gnome-extra/gnome-games-2.28.2
index 5c65fc1776f6..a157e5d361c9 100644
--- a/metadata/md5-cache/gnome-extra/gnome-games-2.28.2
+++ b/metadata/md5-cache/gnome-extra/gnome-games-2.28.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-games/libggz-0.0.14 >=dev-games/ggz-client-libs-0.0.14 >=dev-libs/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-games/2.28/gnome-games-2.28.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	games-ggz	7957d0a0b68d2703b8bb71ec7ddd87a8	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	games-ggz	7957d0a0b68d2703b8bb71ec7ddd87a8	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=4c6206a8855aa7506ce99b74bff6a754
diff --git a/metadata/md5-cache/gnome-extra/gnome-media-2.32.0-r300 b/metadata/md5-cache/gnome-extra/gnome-media-2.32.0-r300
index ea842d13cff7..a3565dfbbe67 100644
--- a/metadata/md5-cache/gnome-extra/gnome-media-2.32.0-r300
+++ b/metadata/md5-cache/gnome-extra/gnome-media-2.32.0-r300
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=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 app-text/docbook-xml-dtd:4.1.2 app-text/rarian virtual/pkgconfig >=app-text/gnome-doc-utils-0.3.2 >=dev-util/intltool-0.35.0 gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=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 app-text/docbook-xml-dtd:4.1.2 app-text/rarian virtual/pkgconfig >=app-text/gnome-doc-utils-0.3.2 >=dev-util/intltool-0.35.0 gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Multimedia related programs for the GNOME desktop
 EAPI=3
 HOMEPAGE=http://ronald.bitfreak.net/gnome-media.php
@@ -8,5 +8,5 @@ LICENSE=LGPL-2 GPL-2 FDL-1.1
 RDEPEND=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
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-media/2.32/gnome-media-2.32.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=544ff8a529c295d28446fa8d46fcff9c
diff --git a/metadata/md5-cache/gnome-extra/gnome-power-manager-2.32.0-r3 b/metadata/md5-cache/gnome-extra/gnome-power-manager-2.32.0-r3
index 142fcb55da84..6e2a8096c9b6 100644
--- a/metadata/md5-cache/gnome-extra/gnome-power-manager-2.32.0-r3
+++ b/metadata/md5-cache/gnome-extra/gnome-power-manager-2.32.0-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 virtual/pkgconfig >=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=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 virtual/pkgconfig >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A session daemon for GNOME that makes it easy to manage your laptop or desktop system
 EAPI=4
 HOMEPAGE=http://projects.gnome.org/gnome-power-manager/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.13.0:2 >=x11-libs/gtk+-2.17.7:2 >=gnome-base/gnome-key
 RESTRICT=test
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=356aa46483abcde55624f743ce4dfc9e
diff --git a/metadata/md5-cache/gnome-extra/gnome-screensaver-2.30.2-r1 b/metadata/md5-cache/gnome-extra/gnome-screensaver-2.30.2-r1
index 2ec122bf2e4b..4306c4cdbf05 100644
--- a/metadata/md5-cache/gnome-extra/gnome-screensaver-2.30.2-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-screensaver-2.30.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 virtual/pkgconfig >=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Replaces xscreensaver, integrating with the desktop.
 EAPI=2
 HOMEPAGE=http://live.gnome.org/GnomeScreensaver
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-screensaver/2.30/gnome-screensaver-2.30.2.tar.bz2 branding? ( http://www.gentoo.org/images/gentoo-logo.svg )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ba8a80cd3616e0c927b4665882637c8b
diff --git a/metadata/md5-cache/gnome-extra/gnome-swallow-1.2 b/metadata/md5-cache/gnome-extra/gnome-swallow-1.2
index d3f545af5ecc..296f4a3578f5 100644
--- a/metadata/md5-cache/gnome-extra/gnome-swallow-1.2
+++ b/metadata/md5-cache/gnome-extra/gnome-swallow-1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=An applet for Gnome that 'swallows' normal apps. Useful for docks that are made for other DEs or WMs
 EAPI=3
 HOMEPAGE=http://interreality.org/~tetron/technology/swallow/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=http://interreality.org/~tetron/technology/swallow/gnome-swallow-1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ec3fc73d0bc297f1362a0c12cc397c57
diff --git a/metadata/md5-cache/gnome-extra/gnome-utils-2.32.0-r2 b/metadata/md5-cache/gnome-extra/gnome-utils-2.32.0-r2
index 55116adb2195..a8c7e7b4f36d 100644
--- a/metadata/md5-cache/gnome-extra/gnome-utils-2.32.0-r2
+++ b/metadata/md5-cache/gnome-extra/gnome-utils-2.32.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.10 ) dev-util/gtk-doc-am gnome-base/gnome-common >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.10 ) dev-util/gtk-doc-am gnome-base/gnome-common >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utilities for the Gnome desktop
 EAPI=4
 HOMEPAGE=https://live.gnome.org/GnomeUtils
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 ) )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=38eed33c53568e420cb9d808f7bc9c22
diff --git a/metadata/md5-cache/gnome-extra/gpointing-device-settings-1.5.1-r2 b/metadata/md5-cache/gnome-extra/gpointing-device-settings-1.5.1-r2
index 37cf9ca3e3fd..050b6a5c55ba 100644
--- a/metadata/md5-cache/gnome-extra/gpointing-device-settings-1.5.1-r2
+++ b/metadata/md5-cache/gnome-extra/gpointing-device-settings-1.5.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=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 virtual/pkgconfig >=dev-util/intltool-0.35.5 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig >=dev-util/intltool-0.35.5 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A GTK+ based configuration utility for the synaptics driver
 EAPI=2
 HOMEPAGE=http://live.gnome.org/GPointingDeviceSettings
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/gsynaptics/45812/gpointing-device-settings-1.5.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cb95a6c80f1c5bceac30a59469ec7ae2
diff --git a/metadata/md5-cache/gnome-extra/gtkhtml-2.11.1 b/metadata/md5-cache/gnome-extra/gtkhtml-2.11.1
index a5dbae29357e..84f253620b6b 100644
--- a/metadata/md5-cache/gnome-extra/gtkhtml-2.11.1
+++ b/metadata/md5-cache/gnome-extra/gtkhtml-2.11.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DEPEND=>=x11-libs/gtk+-2.13.0:2 >=dev-libs/libxml2-2.4.16:2 test? ( >=gnome-base/gnome-vfs-2:2 ) virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.13.0:2 >=dev-libs/libxml2-2.4.16:2 test? ( >=gnome-base/gnome-vfs-2:2 ) virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Lightweight HTML rendering/printing/editing engine
 EAPI=1
 HOMEPAGE=http://projects.gnome.org/evolution/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=x11-libs/gtk+-2.13.0:2 >=dev-libs/libxml2-2.4.16:2 test? ( >=gnome-base/gnome-vfs-2:2 )
 SLOT=2
 SRC_URI=mirror://gnome/sources/libgtkhtml/2.11/libgtkhtml-2.11.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e83f2dffc09911816557dd3de8659e98
diff --git a/metadata/md5-cache/gnome-extra/libgda-5.0.3-r1 b/metadata/md5-cache/gnome-extra/libgda-5.0.3-r1
index 4a717a954b03..ff5e8cba709d 100644
--- a/metadata/md5-cache/gnome-extra/libgda-5.0.3-r1
+++ b/metadata/md5-cache/gnome-extra/libgda-5.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=app-text/iso-codes >=dev-libs/glib-2.28: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 >=app-text/gnome-doc-utils-0.9 dev-util/gtk-doc-am >=dev-util/intltool-0.35.5 virtual/pkgconfig java? ( virtual/jdk:1.6 ) || ( >=sys-devel/automake-1.12:1.12 ) >=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*
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.28: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 >=app-text/gnome-doc-utils-0.9 dev-util/gtk-doc-am >=dev-util/intltool-0.35.5 virtual/pkgconfig java? ( virtual/jdk:1.6 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.1.9-r1 ) =dev-lang/python-2*
 DESCRIPTION=GNOME database access library
 EAPI=4
 HOMEPAGE=http://www.gnome-db.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.28: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*
 SLOT=5
 SRC_URI=mirror://gnome/sources/libgda/5.0/libgda-5.0.3.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=89013c5115d96e7473cb8138d2555366
diff --git a/metadata/md5-cache/gnome-extra/libgda-5.1.1-r1 b/metadata/md5-cache/gnome-extra/libgda-5.1.1-r1
index 33f80bd7e98c..7d42809ee3a8 100644
--- a/metadata/md5-cache/gnome-extra/libgda-5.1.1-r1
+++ b/metadata/md5-cache/gnome-extra/libgda-5.1.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=app-text/iso-codes >=dev-libs/glib-2.32: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? ( app-crypt/libsecret ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-1.30 ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap:= ) mdb? ( >app-office/mdbtools-0.5:= ) mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql-base:= ) reports? ( python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-java/fop dev-python/reportlab ) ssl? ( dev-libs/openssl:= ) >=dev-db/sqlite-3.6.22:3= >=app-text/gnome-doc-utils-0.9 dev-util/gtk-doc-am >=dev-util/intltool-0.40.6 virtual/pkgconfig java? ( virtual/jdk:1.6 ) || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.32: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? ( app-crypt/libsecret ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-1.30 ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap:= ) mdb? ( >app-office/mdbtools-0.5:= ) mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql-base:= ) reports? ( python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-java/fop dev-python/reportlab ) ssl? ( dev-libs/openssl:= ) >=dev-db/sqlite-3.6.22:3= >=app-text/gnome-doc-utils-0.9 dev-util/gtk-doc-am >=dev-util/intltool-0.40.6 virtual/pkgconfig java? ( virtual/jdk:1.6 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=GNOME database access library
 EAPI=5
 HOMEPAGE=http://www.gnome-db.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=canvas? ( gtk ) firebird? ( !bindist ) graphviz? ( gtk ) sourceview
 RESTRICT=test
 SLOT=5/4
 SRC_URI=mirror://gnome/sources/libgda/5.1/libgda-5.1.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=66a11bbf001f6ec793d4de05d6084ab7
diff --git a/metadata/md5-cache/gnome-extra/libgsf-1.14.23 b/metadata/md5-cache/gnome-extra/libgsf-1.14.23
index fa0413e42294..e622623ba8ba 100644
--- a/metadata/md5-cache/gnome-extra/libgsf-1.14.23
+++ b/metadata/md5-cache/gnome-extra/libgsf-1.14.23
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) python? ( >=dev-python/pygobject-2.10:2 >=dev-python/pygtk-2.10:2 ) >=dev-util/intltool-0.35.0 dev-util/gtk-doc-am dev-libs/gobject-introspection-common virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=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* ) )
+DEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) python? ( >=dev-python/pygobject-2.10:2 >=dev-python/pygtk-2.10:2 ) >=dev-util/intltool-0.35.0 dev-util/gtk-doc-am dev-libs/gobject-introspection-common virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 DESCRIPTION=The GNOME Structured File Library
 EAPI=4
 HOMEPAGE=http://projects.gnome.org/libgsf/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) python? ( >=dev-python/pygobject-2.10:2 >=dev-python/pygtk-2.10:2 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.23.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0bb3666a40eeaf1211ec9fd0eaa23179
diff --git a/metadata/md5-cache/gnome-extra/nautilus-dropbox-0.6.9 b/metadata/md5-cache/gnome-extra/nautilus-dropbox-0.6.9
index 3a893ea0216d..c86f2615b4b8 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-dropbox-0.6.9
+++ b/metadata/md5-cache/gnome-extra/nautilus-dropbox-0.6.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2 net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama virtual/pkgconfig dev-python/docutils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* >=sys-apps/sed-4
+DEPEND=gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2 net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama virtual/pkgconfig dev-python/docutils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* >=sys-apps/sed-4
 DESCRIPTION=Store, Sync and Share Files Online
 EAPI=3
 HOMEPAGE=http://www.dropbox.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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*
 SLOT=0
 SRC_URI=http://www.dropbox.com/download?dl=packages/nautilus-dropbox-0.6.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e726b72c1934a1c9554c10e29cf6f9d4
diff --git a/metadata/md5-cache/gnome-extra/nautilus-dropbox-0.7.0 b/metadata/md5-cache/gnome-extra/nautilus-dropbox-0.7.0
index fe9093209f54..24e857cd1876 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-dropbox-0.7.0
+++ b/metadata/md5-cache/gnome-extra/nautilus-dropbox-0.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2 net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama virtual/pkgconfig dev-python/docutils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* >=sys-apps/sed-4
+DEPEND=gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2 net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama virtual/pkgconfig dev-python/docutils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* >=sys-apps/sed-4
 DESCRIPTION=Store, Sync and Share Files Online
 EAPI=3
 HOMEPAGE=http://www.dropbox.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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*
 SLOT=0
 SRC_URI=http://www.dropbox.com/download?dl=packages/nautilus-dropbox-0.7.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3edda4426c1de7cd1cf80a6a36430098
diff --git a/metadata/md5-cache/gnome-extra/nautilus-dropbox-0.7.1 b/metadata/md5-cache/gnome-extra/nautilus-dropbox-0.7.1
index bbc56845c16e..6e0447b7b78d 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-dropbox-0.7.1
+++ b/metadata/md5-cache/gnome-extra/nautilus-dropbox-0.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2 net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama virtual/pkgconfig dev-python/docutils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* >=sys-apps/sed-4
+DEPEND=gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2 net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama virtual/pkgconfig dev-python/docutils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* >=sys-apps/sed-4
 DESCRIPTION=Store, Sync and Share Files Online
 EAPI=3
 HOMEPAGE=http://www.dropbox.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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*
 SLOT=0
 SRC_URI=http://www.dropbox.com/download?dl=packages/nautilus-dropbox-0.7.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=274de632ac8ba57488f02b051e744eda
diff --git a/metadata/md5-cache/gnome-extra/nautilus-dropbox-1.4.0 b/metadata/md5-cache/gnome-extra/nautilus-dropbox-1.4.0
index 18b3d3734b6c..9a6a28e9b5fb 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-dropbox-1.4.0
+++ b/metadata/md5-cache/gnome-extra/nautilus-dropbox-1.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2 net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama virtual/pkgconfig dev-python/docutils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2 net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama virtual/pkgconfig dev-python/docutils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Store, Sync and Share Files Online
 EAPI=5
 HOMEPAGE=http://www.dropbox.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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*
 SLOT=0
 SRC_URI=http://www.dropbox.com/download?dl=packages/nautilus-dropbox-1.4.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0eeabdce113a5fb82e4baba7039745a4
diff --git a/metadata/md5-cache/gnome-extra/nemo-1.1.2 b/metadata/md5-cache/gnome-extra/nemo-1.1.2
index 630e64703b66..6c8f0dcebe0d 100644
--- a/metadata/md5-cache/gnome-extra/nemo-1.1.2
+++ b/metadata/md5-cache/gnome-extra/nemo-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.31.9:2 >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.3.17:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3.0.0:3= gnome-base/dconf:= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.1.0:= ) >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.31.0 dev-util/gtk-doc-am >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig x11-proto/xproto dev-util/gtk-doc gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.31.9:2 >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.3.17:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3.0.0:3= gnome-base/dconf:= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.1.0:= ) >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.31.0 dev-util/gtk-doc-am >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig x11-proto/xproto dev-util/gtk-doc gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
 EAPI=5
 HOMEPAGE=http://cinnamon.linuxmint.com/
@@ -10,5 +10,5 @@ PDEPEND=>=gnome-base/gvfs-0.1.2
 RDEPEND=>=dev-libs/glib-2.31.9:2 >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.3.17:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3.0.0:3= gnome-base/dconf:= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.1.0:= ) x11-themes/gnome-icon-theme-symbolic packagekit? ( app-admin/packagekit-base )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/nemo/tarball/1.1.2 -> nemo-1.1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=72e241ab6a3c21a9628e4a749b4e7223
diff --git a/metadata/md5-cache/gnome-extra/synapse-0.2.10 b/metadata/md5-cache/gnome-extra/synapse-0.2.10
index 4ee2d40840ca..5da599dac028 100644
--- a/metadata/md5-cache/gnome-extra/synapse-0.2.10
+++ b/metadata/md5-cache/gnome-extra/synapse-0.2.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=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 plugins? ( net-libs/rest ) zeitgeist? ( dev-libs/libzeitgeist gnome-extra/zeitgeist gnome-extra/zeitgeist-extensions || ( gnome-extra/zeitgeist[fts] gnome-extra/zeitgeist-extensions[fts] ) ) dev-util/intltool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=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 plugins? ( net-libs/rest ) zeitgeist? ( dev-libs/libzeitgeist gnome-extra/zeitgeist gnome-extra/zeitgeist-extensions || ( gnome-extra/zeitgeist[fts] gnome-extra/zeitgeist-extensions[fts] ) ) dev-util/intltool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A program launcher in the style of GNOME Do
 EAPI=4
 HOMEPAGE=http://launchpad.net/synapse-project/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=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 plugins? ( net-libs/rest ) zeitgeist? ( dev-libs/libzeitgeist gnome-extra/zeitgeist gnome-extra/zeitgeist-extensions || ( gnome-extra/zeitgeist[fts] gnome-extra/zeitgeist-extensions[fts] ) )
 SLOT=0
 SRC_URI=http://launchpad.net/synapse-project/0.2/0.2.10/+download/synapse-0.2.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=85f96f23cb93a7f1dc8935636c4cf4ff
diff --git a/metadata/md5-cache/gnome-extra/tasks-0.20 b/metadata/md5-cache/gnome-extra/tasks-0.20
index 0eca828ca918..f5b85bc48261 100644
--- a/metadata/md5-cache/gnome-extra/tasks-0.20
+++ b/metadata/md5-cache/gnome-extra/tasks-0.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=gnome-extra/evolution-data-server-1.8 >=x11-libs/gtk+-2.16:2 >=dev-libs/glib-2.14:2 >=dev-libs/libunique-1:1 virtual/pkgconfig >=dev-util/intltool-0.33 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=gnome-extra/evolution-data-server-1.8 >=x11-libs/gtk+-2.16:2 >=dev-libs/glib-2.14:2 >=dev-libs/libunique-1:1 virtual/pkgconfig >=dev-util/intltool-0.33 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A small, lightweight to-do list for Gnome
 EAPI=4
 HOMEPAGE=http://pimlico-project.org/tasks.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnome-extra/evolution-data-server-1.8 >=x11-libs/gtk+-2.16:2 >=dev-libs/glib-2.14:2 >=dev-libs/libunique-1:1
 SLOT=0
 SRC_URI=mirror://gnome/sources/tasks/0.20/tasks-0.20.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dd794982cb0ae50663d91a6c224f5f02
diff --git a/metadata/md5-cache/gnome-extra/yelp-2.30.2-r200 b/metadata/md5-cache/gnome-extra/yelp-2.30.2-r200
index d085df694637..c419cd6a6001 100644
--- a/metadata/md5-cache/gnome-extra/yelp-2.30.2-r200
+++ b/metadata/md5-cache/gnome-extra/yelp-2.30.2-r200
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=app-arch/bzip2 >=app-text/gnome-doc-utils-0.20.6 >=app-text/rarian-0.8.1 >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16 dev-libs/libxml2 dev-libs/libxslt >=gnome-base/gconf-2 sys-libs/zlib >=x11-libs/gtk+-2.18:2 x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/startup-notification net-libs/webkit-gtk:2 lzma? ( app-arch/xz-utils ) dev-util/intltool gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=app-arch/bzip2 >=app-text/gnome-doc-utils-0.20.6 >=app-text/rarian-0.8.1 >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16 dev-libs/libxml2 dev-libs/libxslt >=gnome-base/gconf-2 sys-libs/zlib >=x11-libs/gtk+-2.18:2 x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/startup-notification net-libs/webkit-gtk:2 lzma? ( app-arch/xz-utils ) dev-util/intltool gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Help browser for GNOME
 EAPI=4
 HOMEPAGE=http://projects.gnome.org/yelp/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2 >=app-text/gnome-doc-utils-0.20.6 >=app-text/rarian-0.8.1 >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16 dev-libs/libxml2 dev-libs/libxslt >=gnome-base/gconf-2 sys-libs/zlib >=x11-libs/gtk+-2.18:2 x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/startup-notification net-libs/webkit-gtk:2 lzma? ( app-arch/xz-utils )
 SLOT=0
 SRC_URI=mirror://gentoo/yelp-2.30.2+webkit.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8d8425a794da3f3a0abee9a2c294a64d
diff --git a/metadata/md5-cache/gnome-extra/yelp-3.6.2 b/metadata/md5-cache/gnome-extra/yelp-3.6.2
index a0e63e09eb3a..7773401bed96 100644
--- a/metadata/md5-cache/gnome-extra/yelp-3.6.2
+++ b/metadata/md5-cache/gnome-extra/yelp-3.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-3.6.1 >=net-libs/webkit-gtk-1.3.2:3 >=x11-libs/gtk+-2.91.8:3 x11-themes/gnome-icon-theme-symbolic >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.41.0 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-3.6.1 >=net-libs/webkit-gtk-1.3.2:3 >=x11-libs/gtk+-2.91.8:3 x11-themes/gnome-icon-theme-symbolic >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.41.0 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Help browser for GNOME
 EAPI=5
 HOMEPAGE=http://www.gnome.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-3.6.1 >=net-libs/webkit-gtk-1.3.2:3 >=x11-libs/gtk+-2.91.8:3 x11-themes/gnome-icon-theme-symbolic
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp/3.6/yelp-3.6.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f497c3307a3d8cf729f46c7930346bcb
diff --git a/metadata/md5-cache/gnome-extra/yelp-3.8.0 b/metadata/md5-cache/gnome-extra/yelp-3.8.0
index e35972fc6029..2e074a67d0a5 100644
--- a/metadata/md5-cache/gnome-extra/yelp-3.8.0
+++ b/metadata/md5-cache/gnome-extra/yelp-3.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-3.6.1 >=net-libs/webkit-gtk-1.3.10:3 >=x11-libs/gtk+-2.91.8:3 x11-themes/gnome-icon-theme-symbolic >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.41.0 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-3.6.1 >=net-libs/webkit-gtk-1.3.10:3 >=x11-libs/gtk+-2.91.8:3 x11-themes/gnome-icon-theme-symbolic >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.41.0 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Help browser for GNOME
 EAPI=5
 HOMEPAGE=http://www.gnome.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-3.6.1 >=net-libs/webkit-gtk-1.3.10:3 >=x11-libs/gtk+-2.91.8:3 x11-themes/gnome-icon-theme-symbolic
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp/3.8/yelp-3.8.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1d2a5ef196c4a5a17b075553cc4b1f51
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.12 b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.12
index 43f80f1a6790..21744fb4c8bd 100644
--- a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.12
+++ b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!gnome-extra/zeitgeist-datahub dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/rdflib media-libs/raptor:2 >=dev-libs/glib-2.26.0:2 >=dev-db/sqlite-3.7.11:3 extensions? ( gnome-extra/zeitgeist-extensions ) fts? ( dev-libs/xapian[inmemory] ) icu? ( dev-libs/dee[icu?] ) introspection? ( dev-libs/gobject-introspection ) plugins? ( gnome-extra/zeitgeist-datasources ) telepathy? ( net-libs/telepathy-glib ) virtual/pkgconfig
+DEPEND=!gnome-extra/zeitgeist-datahub dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/rdflib media-libs/raptor:2 >=dev-libs/glib-2.26.0:2 >=dev-db/sqlite-3.7.11:3 extensions? ( gnome-extra/zeitgeist-extensions ) fts? ( dev-libs/xapian[inmemory] ) icu? ( dev-libs/dee[icu?] ) introspection? ( dev-libs/gobject-introspection ) plugins? ( gnome-extra/zeitgeist-datasources ) telepathy? ( net-libs/telepathy-glib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Service to log activities and present to other apps
 EAPI=5
 HOMEPAGE=http://launchpad.net/zeitgeist/
@@ -7,7 +7,8 @@ IUSE=+datahub +dbus downloads-monitor extensions +fts icu introspection nls plug
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2+ LGPL-3+ GPL-2+
 RDEPEND=!gnome-extra/zeitgeist-datahub dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/rdflib media-libs/raptor:2 >=dev-libs/glib-2.26.0:2 >=dev-db/sqlite-3.7.11:3 extensions? ( gnome-extra/zeitgeist-extensions ) fts? ( dev-libs/xapian[inmemory] ) icu? ( dev-libs/dee[icu?] ) introspection? ( dev-libs/gobject-introspection ) plugins? ( gnome-extra/zeitgeist-datasources ) telepathy? ( net-libs/telepathy-glib )
+REQUIRED_USE=downloads-monitor? ( datahub )
 SLOT=0
 SRC_URI=http://launchpad.net/zeitgeist/0.9/0.9.12/+download/zeitgeist-0.9.12.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f23b9380bcaed986a9ee57d86bb09bb1
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=dc9134a5bd82618958cb7a5c3f96f84e
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.5-r1 b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.5-r1
index f4ba4ca4c19d..1b52874cc703 100644
--- a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.5-r1
+++ b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/xapian[inmemory] dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/rdflib media-libs/raptor:2 dev-libs/glib:2 dev-db/sqlite:3 extensions? ( gnome-extra/zeitgeist-extensions ) icu? ( dev-libs/dee[icu?] ) passiv? ( gnome-extra/zeitgeist-datahub ) plugins? ( gnome-extra/zeitgeist-datasources ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/xapian[inmemory] dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/rdflib media-libs/raptor:2 dev-libs/glib:2 dev-db/sqlite:3 extensions? ( gnome-extra/zeitgeist-extensions ) icu? ( dev-libs/dee[icu?] ) passiv? ( gnome-extra/zeitgeist-datahub ) plugins? ( gnome-extra/zeitgeist-datasources ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Service to log activities and present to other apps
 EAPI=5
 HOMEPAGE=http://launchpad.net/zeitgeist/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/xapian[inmemory] dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/rdflib media-libs/raptor:2 dev-libs/glib:2 dev-db/sqlite:3 extensions? ( gnome-extra/zeitgeist-extensions ) icu? ( dev-libs/dee[icu?] ) passiv? ( gnome-extra/zeitgeist-datahub ) plugins? ( gnome-extra/zeitgeist-datasources )
 SLOT=0
 SRC_URI=http://launchpad.net/zeitgeist/0.9/0.9.5/+download/zeitgeist-0.9.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=566ce90e19dadb00784747a3c40c6ae2
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-datahub-0.9.5 b/metadata/md5-cache/gnome-extra/zeitgeist-datahub-0.9.5
index c8751dc02ce9..db9f83695882 100644
--- a/metadata/md5-cache/gnome-extra/zeitgeist-datahub-0.9.5
+++ b/metadata/md5-cache/gnome-extra/zeitgeist-datahub-0.9.5
@@ -10,5 +10,5 @@ PDEPEND=gnome-extra/zeitgeist
 RDEPEND=!>=gnome-extra/zeitgeist-0.9.12 dev-libs/libzeitgeist >=dev-libs/json-glib-0.14.0 dev-libs/glib:2 x11-libs/gtk+:2 telepathy? ( >=net-libs/telepathy-glib-0.18.0 )
 SLOT=0
 SRC_URI=http://launchpad.net/zeitgeist-datahub/0.9/0.9.5/+download/zeitgeist-datahub-0.9.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2d9fe55a9e3cc81db15196a30d83f146
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-datasources-0.8.0.1 b/metadata/md5-cache/gnome-extra/zeitgeist-datasources-0.8.0.1
index 069ce70cc432..c6fd2fb75fca 100644
--- a/metadata/md5-cache/gnome-extra/zeitgeist-datasources-0.8.0.1
+++ b/metadata/md5-cache/gnome-extra/zeitgeist-datasources-0.8.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=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[python] ) 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] ) totem? ( media-video/totem[zeitgeist] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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[python] ) 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] ) totem? ( media-video/totem[zeitgeist] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Plugins whose work is to push activities as events into Zeitgeist daemon
 EAPI=4
 HOMEPAGE=https://launchpad.net/zeitgeist-datasources/ http://zeitgeist-project.com/
@@ -10,5 +10,5 @@ PDEPEND=gnome-extra/zeitgeist
 RDEPEND=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[python] ) 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] ) totem? ( media-video/totem[zeitgeist] )
 SLOT=0
 SRC_URI=http://launchpad.net/zeitgeist-datasources/0.8/0.8.0/+download/zeitgeist-datasources-0.8.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5f7ee6dbf423fcc700f46f6ab7163a26
diff --git a/metadata/md5-cache/gnustep-apps/cenon-4.0.2 b/metadata/md5-cache/gnustep-apps/cenon-4.0.2
new file mode 100644
index 000000000000..14dcb697eafc
--- /dev/null
+++ b/metadata/md5-cache/gnustep-apps/cenon-4.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Cenon is a vector graphics tool for GNUstep, OpenStep and MacOSX
+EAPI=5
+HOMEPAGE=http://www.cenon.info/
+IUSE=debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Cenon
+RDEPEND=>=gnustep-libs/cenonlibrary-4.0.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://www.vhf-group.com/vhf-interservice/download/source/Cenon-4.0.2.tar.bz2
+_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2724ef4166e9288832a9bcdffda2de46
diff --git a/metadata/md5-cache/gnustep-libs/cenonlibrary-4.0.0 b/metadata/md5-cache/gnustep-libs/cenonlibrary-4.0.0
new file mode 100644
index 000000000000..50df194c4733
--- /dev/null
+++ b/metadata/md5-cache/gnustep-libs/cenonlibrary-4.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Default library required to run Cenon
+EAPI=5
+HOMEPAGE=http://www.cenon.info/
+IUSE=debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Cenon
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://www.vhf-group.com/vhf-interservice/download/source/CenonLibrary-4.0.0-1.tar.bz2
+_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d6db94f50fa4ca60ba84a641c0d01b1e
diff --git a/metadata/md5-cache/gnustep-libs/dbuskit-0.1 b/metadata/md5-cache/gnustep-libs/dbuskit-0.1
index 02b7cd89ed74..d06de45db5ea 100644
--- a/metadata/md5-cache/gnustep-libs/dbuskit-0.1
+++ b/metadata/md5-cache/gnustep-libs/dbuskit-0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=sys-apps/dbus-1.2.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DEPEND=>=sys-apps/dbus-1.2.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 DESCRIPTION=framework that interfaces Objective-C applications with the D-Bus IPC service
 EAPI=4
 HOMEPAGE=http://www.gnustep.org
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/dbus-1.2.1 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://download.gna.org/gnustep/dbuskit-0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5833bc23a748fc18c8039050c1d854e9
diff --git a/metadata/md5-cache/gpe-base/gpe-contacts-0.49 b/metadata/md5-cache/gpe-base/gpe-contacts-0.49
index 49ed2d1354c6..449f68e36a71 100644
--- a/metadata/md5-cache/gpe-base/gpe-contacts-0.49
+++ b/metadata/md5-cache/gpe-base/gpe-contacts-0.49
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=gpe-base/libgpewidget gpe-base/libgpevtype gpe-base/libgpepimc gpe-base/libcontactsdb gpe-base/libmimedir dev-db/sqlite dbus? ( dev-libs/dbus-glib ) >=dev-util/intltool-0.29 virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gpe-base/libgpewidget gpe-base/libgpevtype gpe-base/libgpepimc gpe-base/libcontactsdb gpe-base/libmimedir dev-db/sqlite dbus? ( dev-libs/dbus-glib ) >=dev-util/intltool-0.29 virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The GPE Contacts Manager
 HOMEPAGE=http://gpe.linuxtogo.org
 IUSE=dbus nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=gpe-base/libgpewidget gpe-base/libgpevtype gpe-base/libgpepimc gpe-base/libcontactsdb gpe-base/libmimedir dev-db/sqlite dbus? ( dev-libs/dbus-glib )
 SLOT=0
 SRC_URI=http://gpe.linuxtogo.org/download/source/gpe-contacts-0.49.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=50977c0fd2f63a52a167a271f7440a28
diff --git a/metadata/md5-cache/gpe-base/gpe-dm-0.51-r1 b/metadata/md5-cache/gpe-base/gpe-dm-0.51-r1
index 09929985bd92..a15ac6e40da8 100644
--- a/metadata/md5-cache/gpe-base/gpe-dm-0.51-r1
+++ b/metadata/md5-cache/gpe-base/gpe-dm-0.51-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=dev-util/intltool-0.29 virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-util/intltool-0.29 virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GPE Desktop Manager
 HOMEPAGE=http://gpe.linuxtogo.org
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-apps/xinit
 SLOT=0
 SRC_URI=http://gpe.linuxtogo.org/download/source/gpe-dm-0.51.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=438c41131bc5956623b893ff3fa63538
diff --git a/metadata/md5-cache/gpe-base/gpe-login-0.95-r4 b/metadata/md5-cache/gpe-base/gpe-login-0.95-r4
index e7b234eb072f..57f80886473a 100644
--- a/metadata/md5-cache/gpe-base/gpe-login-0.95-r4
+++ b/metadata/md5-cache/gpe-base/gpe-login-0.95-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=gpe-base/libgpewidget >=dev-util/intltool-0.29 virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gpe-base/libgpewidget >=dev-util/intltool-0.29 virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The GPE user login screen
 HOMEPAGE=http://gpe.linuxtogo.org
 IUSE=branding nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=gpe-base/libgpewidget x11-misc/xkbd gpe-utils/gpe-ownerinfo x11-wm/matchbox sys-apps/dbus
 SLOT=0
 SRC_URI=http://gpe.linuxtogo.org/download/source/gpe-login-0.95.tar.bz2 mirror://gentoo/gpe-login-gentoo.png.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=876b8beb2e5a0e08ff37052747a8de70
diff --git a/metadata/md5-cache/gpe-base/libeventdb-0.90 b/metadata/md5-cache/gpe-base/libeventdb-0.90
index 0ee0f4b5527d..61c7f7f6529c 100644
--- a/metadata/md5-cache/gpe-base/libeventdb-0.90
+++ b/metadata/md5-cache/gpe-base/libeventdb-0.90
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=gpe-base/libgpewidget-0.113 >=gpe-base/libgpepimc-0.6 =dev-db/sqlite-2.8* doc? ( >=dev-util/gtk-doc-1.2 ) dev-util/gtk-doc-am >=dev-util/intltool-0.29 virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=gpe-base/libgpewidget-0.113 >=gpe-base/libgpepimc-0.6 =dev-db/sqlite-2.8* doc? ( >=dev-util/gtk-doc-1.2 ) dev-util/gtk-doc-am >=dev-util/intltool-0.29 virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Database access library for GPE calendar
 HOMEPAGE=http://gpe.linuxtogo.org
 IUSE=doc nls
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=gpe-base/libgpewidget-0.113 >=gpe-base/libgpepimc-0.6 =dev-db/sqlite-2.8*
 SLOT=0
 SRC_URI=http://gpe.linuxtogo.org/download/source/libeventdb-0.90.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=55f59c48cce742cbe852f9e9926f2e51
diff --git a/metadata/md5-cache/gpe-base/libgpepimc-0.9 b/metadata/md5-cache/gpe-base/libgpepimc-0.9
index 60d91d0183b2..bfdc6e7e260c 100644
--- a/metadata/md5-cache/gpe-base/libgpepimc-0.9
+++ b/metadata/md5-cache/gpe-base/libgpepimc-0.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Common code for PIM applications of the GPE Palmtop Environment
 EAPI=1
 HOMEPAGE=http://gpe.linuxtogo.org
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=x11-libs/gtk+:2 >=dev-libs/glib-2.2 gpe-base/libgpewidget dev-db/sqlite
 SLOT=0
 SRC_URI=http://gpe.linuxtogo.org/download/source/libgpepimc-0.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=e303604f954153b42d370bbcd18b7815
diff --git a/metadata/md5-cache/gpe-base/libgpevtype-0.50 b/metadata/md5-cache/gpe-base/libgpevtype-0.50
index 3c08518e68f7..cac17dcff254 100644
--- a/metadata/md5-cache/gpe-base/libgpevtype-0.50
+++ b/metadata/md5-cache/gpe-base/libgpevtype-0.50
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=gpe-base/libtododb >=dev-libs/glib-2.2 >=gpe-base/libmimedir-0.4.2 >=gpe-base/libeventdb-0.29 doc? ( >=dev-util/gtk-doc-1.2 ) dev-util/gtk-doc-am >=dev-util/intltool-0.29 virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gpe-base/libtododb >=dev-libs/glib-2.2 >=gpe-base/libmimedir-0.4.2 >=gpe-base/libeventdb-0.29 doc? ( >=dev-util/gtk-doc-1.2 ) dev-util/gtk-doc-am >=dev-util/intltool-0.29 virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Data interchange library for the GPE Palmtop Environment
 HOMEPAGE=http://gpe.linuxtogo.org
 IUSE=doc nls
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=gpe-base/libtododb >=dev-libs/glib-2.2 >=gpe-base/libmimedir-0.4.2 >=gpe-base/libeventdb-0.29
 SLOT=0
 SRC_URI=http://gpe.linuxtogo.org/download/source/libgpevtype-0.50.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=069ada8f0074427663309c0adff0ef15
diff --git a/metadata/md5-cache/gpe-base/libgpewidget-0.117-r1 b/metadata/md5-cache/gpe-base/libgpewidget-0.117-r1
index 80a70e85ce1f..cd104c2da3f9 100644
--- a/metadata/md5-cache/gpe-base/libgpewidget-0.117-r1
+++ b/metadata/md5-cache/gpe-base/libgpewidget-0.117-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A collection of widgets and other common code shared by many GPE applications.
 EAPI=4
 HOMEPAGE=http://gpe.linuxtogo.org
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=x11-libs/gtk+:2 media-libs/libpng cairo? ( x11-libs/cairo[X] x11-libs/pango[X] )
 SLOT=0
 SRC_URI=http://gpe.linuxtogo.org/download/source/libgpewidget-0.117.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a7bcd7fe763c72d44137b31c40307b77
diff --git a/metadata/md5-cache/gpe-base/libmimedir-0.4.2 b/metadata/md5-cache/gpe-base/libmimedir-0.4.2
index 2c09e821a83f..44fb31d62cd6 100644
--- a/metadata/md5-cache/gpe-base/libmimedir-0.4.2
+++ b/metadata/md5-cache/gpe-base/libmimedir-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=!dev-libs/libmimedir >=gpe-base/libgpewidget-0.102 doc? ( >=dev-util/gtk-doc-0.6 ) >=dev-util/intltool-0.29 virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!dev-libs/libmimedir >=gpe-base/libgpewidget-0.102 doc? ( >=dev-util/gtk-doc-0.6 ) >=dev-util/intltool-0.29 virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=RFC2425 MIME Directory Profile library
 HOMEPAGE=http://gpe.linuxtogo.org
 IUSE=doc nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!dev-libs/libmimedir >=gpe-base/libgpewidget-0.102
 SLOT=0
 SRC_URI=http://gpe.linuxtogo.org/download/source/libmimedir-0.4.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=e5cca15c60080e61a8ceffebd94e1b75
diff --git a/metadata/md5-cache/gpe-base/libtododb-0.11 b/metadata/md5-cache/gpe-base/libtododb-0.11
index c2b8881ed7b9..f9eb0f0a370a 100644
--- a/metadata/md5-cache/gpe-base/libtododb-0.11
+++ b/metadata/md5-cache/gpe-base/libtododb-0.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=gpe-base/libgpewidget-0.113 >=gpe-base/libgpepimc-0.6 =dev-db/sqlite-2.8* doc? ( >=dev-util/gtk-doc-1.2 ) dev-util/gtk-doc-am >=dev-util/intltool-0.29 virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=gpe-base/libgpewidget-0.113 >=gpe-base/libgpepimc-0.6 =dev-db/sqlite-2.8* doc? ( >=dev-util/gtk-doc-1.2 ) dev-util/gtk-doc-am >=dev-util/intltool-0.29 virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Database access library for GPE to-do list
 HOMEPAGE=http://gpe.linuxtogo.org
 IUSE=doc nls
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=gpe-base/libgpewidget-0.113 >=gpe-base/libgpepimc-0.6 =dev-db/sqlite-2.8*
 SLOT=0
 SRC_URI=http://gpe.linuxtogo.org/download/source/libtododb-0.11.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=2374bf358c1ba610f6ffe1d60fc22073
diff --git a/metadata/md5-cache/gpe-utils/gpe-edit-0.41 b/metadata/md5-cache/gpe-utils/gpe-edit-0.41
index 71462663ff61..b16653ca11e8 100644
--- a/metadata/md5-cache/gpe-utils/gpe-edit-0.41
+++ b/metadata/md5-cache/gpe-utils/gpe-edit-0.41
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=gpe-base/libgpewidget >=dev-util/intltool-0.29 virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gpe-base/libgpewidget >=dev-util/intltool-0.29 virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Editor for the GPE Palmtop Environment
 HOMEPAGE=http://gpe.linuxtogo.org
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=gpe-base/libgpewidget
 SLOT=0
 SRC_URI=http://gpe.linuxtogo.org/download/source/gpe-edit-0.41.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=6d5529675bce0e74858286bbe66a9ef1
diff --git a/metadata/md5-cache/kde-misc/kanyremote-6.1 b/metadata/md5-cache/kde-misc/kanyremote-6.1
index 27bdd70b8a7c..2c56fe22537d 100644
--- a/metadata/md5-cache/kde-misc/kanyremote-6.1
+++ b/metadata/md5-cache/kde-misc/kanyremote-6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=>=app-mobilephone/anyremote-6.0[bluetooth?] dev-python/PyQt4[X] kde-base/pykde4 bluetooth? ( dev-python/pybluez ) sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=>=app-mobilephone/anyremote-6.0[bluetooth?] dev-python/PyQt4[X] kde-base/pykde4 bluetooth? ( dev-python/pybluez ) sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=KDE frontend to Anyremote
 EAPI=4
 HOMEPAGE=http://anyremote.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-mobilephone/anyremote-6.0[bluetooth?] dev-python/PyQt4[X] kde-base/pykde4 bluetooth? ( dev-python/pybluez ) =dev-lang/python-2*
 SLOT=4
 SRC_URI=mirror://sourceforge/anyremote/kanyremote-6.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=45a177a91a267198afa1bd9e39e8bfa8
diff --git a/metadata/md5-cache/lxde-base/lxde-common-0.5.5-r2 b/metadata/md5-cache/lxde-base/lxde-common-0.5.5-r2
index 100e02ddc4be..6366c6a3b35c 100644
--- a/metadata/md5-cache/lxde-base/lxde-common-0.5.5-r2
+++ b/metadata/md5-cache/lxde-base/lxde-common-0.5.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LXDE Session default configuration files and nuoveXT2 iconset
 EAPI=4
 HOMEPAGE=http://lxde.sf.net/
@@ -9,5 +9,5 @@ PDEPEND=lxde-base/lxde-icon-theme
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxde-common-0.5.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=107357f432130ca8906815937fbab467
diff --git a/metadata/md5-cache/lxde-base/lxde-common-0.5.5-r3 b/metadata/md5-cache/lxde-base/lxde-common-0.5.5-r3
index b00996bfee4a..9e46cb456379 100644
--- a/metadata/md5-cache/lxde-base/lxde-common-0.5.5-r3
+++ b/metadata/md5-cache/lxde-base/lxde-common-0.5.5-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LXDE Session default configuration files and nuoveXT2 iconset
 EAPI=4
 HOMEPAGE=http://lxde.sf.net/
@@ -9,5 +9,5 @@ PDEPEND=lxde-base/lxde-icon-theme
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxde-common-0.5.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8123d8f0b582d19fb541576c3a3b46af
diff --git a/metadata/md5-cache/lxde-base/lxdm-0.4.1-r5 b/metadata/md5-cache/lxde-base/lxdm-0.4.1-r5
index effad8336f41..86885306bab4 100644
--- a/metadata/md5-cache/lxde-base/lxdm-0.4.1-r5
+++ b/metadata/md5-cache/lxde-base/lxdm-0.4.1-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LXDE Display Manager
 EAPI=2
 HOMEPAGE=http://lxde.org
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=sys-auth/consolekit x11-libs/libxcb gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxdm-0.4.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7863754d7f8e99e56e3bdbe5e109fc5a
diff --git a/metadata/md5-cache/lxde-base/lxlauncher-0.2.1 b/metadata/md5-cache/lxde-base/lxlauncher-0.2.1
index 676b1daca4f8..a1575ddf1cc2 100644
--- a/metadata/md5-cache/lxde-base/lxlauncher-0.2.1
+++ b/metadata/md5-cache/lxde-base/lxlauncher-0.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 gnome-base/gnome-menus x11-libs/startup-notification virtual/pkgconfig dev-util/intltool sys-devel/gettext lxde-base/menu-cache !lxde-base/lxlauncher-gmenu || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 gnome-base/gnome-menus x11-libs/startup-notification virtual/pkgconfig dev-util/intltool sys-devel/gettext lxde-base/menu-cache !lxde-base/lxlauncher-gmenu || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An open source clone of the Asus launcher for EeePC
 EAPI=1
 HOMEPAGE=http://lxde.sf.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 gnome-base/gnome-menus x11-libs/startup-notification
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxlauncher-0.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=311eb4d09e7ac71ddf0dc063c13327fc
diff --git a/metadata/md5-cache/lxde-base/lxlauncher-0.2.1-r1 b/metadata/md5-cache/lxde-base/lxlauncher-0.2.1-r1
index 94f137011a9b..0fa7fc0a0b35 100644
--- a/metadata/md5-cache/lxde-base/lxlauncher-0.2.1-r1
+++ b/metadata/md5-cache/lxde-base/lxlauncher-0.2.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 gnome-base/gnome-menus x11-libs/startup-notification virtual/pkgconfig dev-util/intltool sys-devel/gettext lxde-base/menu-cache !lxde-base/lxlauncher-gmenu || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 gnome-base/gnome-menus x11-libs/startup-notification virtual/pkgconfig dev-util/intltool sys-devel/gettext lxde-base/menu-cache !lxde-base/lxlauncher-gmenu || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An open source clone of the Asus launcher for EeePC
 EAPI=1
 HOMEPAGE=http://lxde.sf.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 gnome-base/gnome-menus x11-libs/startup-notification
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxlauncher-0.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=128855683333df081baffec17c220b46
diff --git a/metadata/md5-cache/lxde-base/lxpanel-0.5.10 b/metadata/md5-cache/lxde-base/lxpanel-0.5.10
index 431cd9211f0c..c6df2cf1b2f4 100644
--- a/metadata/md5-cache/lxde-base/lxpanel-0.5.10
+++ b/metadata/md5-cache/lxde-base/lxpanel-0.5.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/libX11 lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) wifi? ( net-wireless/wireless-tools ) virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/libX11 lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) wifi? ( net-wireless/wireless-tools ) virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Lightweight X11 desktop panel for LXDE
 EAPI=4
 HOMEPAGE=http://lxde.org/
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm x11-libs/cairo x11-libs/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%200.5.10/lxpanel-0.5.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7f00ee097c09e335bf887fa0c1897184
diff --git a/metadata/md5-cache/lxde-base/lxpanel-0.5.12 b/metadata/md5-cache/lxde-base/lxpanel-0.5.12
index e804bc172573..a9e974387e8a 100644
--- a/metadata/md5-cache/lxde-base/lxpanel-0.5.12
+++ b/metadata/md5-cache/lxde-base/lxpanel-0.5.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/libX11 lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) wifi? ( net-wireless/wireless-tools ) virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/libX11 lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) wifi? ( net-wireless/wireless-tools ) virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Lightweight X11 desktop panel for LXDE
 EAPI=4
 HOMEPAGE=http://lxde.org/
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm x11-libs/cairo x11-libs/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%200.5.12/lxpanel-0.5.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8cadcba631678fb4035fb35778078070
diff --git a/metadata/md5-cache/lxde-base/lxrandr-0.1.2 b/metadata/md5-cache/lxde-base/lxrandr-0.1.2
index 5f66336fe961..a023aaa0a6ac 100644
--- a/metadata/md5-cache/lxde-base/lxrandr-0.1.2
+++ b/metadata/md5-cache/lxde-base/lxrandr-0.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=x11-libs/gtk+:2 x11-libs/libXrandr x11-apps/xrandr x11-proto/randrproto virtual/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40.0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 x11-libs/libXrandr x11-apps/xrandr x11-proto/randrproto virtual/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LXDE GUI interface to RandR extention
 EAPI=4
 HOMEPAGE=http://lxde.sf.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:2 x11-libs/libXrandr x11-apps/xrandr
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxrandr-0.1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4df961fce631ae6a9e088cad94e8562c
diff --git a/metadata/md5-cache/lxde-base/lxshortcut-0.1.2 b/metadata/md5-cache/lxde-base/lxshortcut-0.1.2
index 835c23770cb6..f95b9ab6dae3 100644
--- a/metadata/md5-cache/lxde-base/lxshortcut-0.1.2
+++ b/metadata/md5-cache/lxde-base/lxshortcut-0.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 sys-devel/gettext dev-util/intltool virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 sys-devel/gettext dev-util/intltool virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LXDE tool to edit desktop entry files
 EAPI=4
 HOMEPAGE=http://lxde.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxshortcut-0.1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5eafa8c508264006fad3ac67573071f9
diff --git a/metadata/md5-cache/lxde-base/lxtask-0.1.4 b/metadata/md5-cache/lxde-base/lxtask-0.1.4
index 0e32d48fa5ad..ec8d1b678021 100644
--- a/metadata/md5-cache/lxde-base/lxtask-0.1.4
+++ b/metadata/md5-cache/lxde-base/lxtask-0.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 virtual/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40.0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 virtual/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LXDE Task manager
 EAPI=4
 HOMEPAGE=http://lxde.sf.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxtask-0.1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e388b9efda74c64374dfc462ee799af5
diff --git a/metadata/md5-cache/mail-client/alpine-2.00-r5 b/metadata/md5-cache/mail-client/alpine-2.00-r5
index e2449243db03..94c41deebe58 100644
--- a/metadata/md5-cache/mail-client/alpine-2.00-r5
+++ b/metadata/md5-cache/mail-client/alpine-2.00-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=virtual/pam >=net-libs/c-client-2007f-r4[topal=,chappa=] >=sys-libs/ncurses-5.1 ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( app-crypt/mit-krb5 ) spell? ( app-text/aspell ) topal? ( >=net-mail/topal-72 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pam >=net-libs/c-client-2007f-r4[topal=,chappa=] >=sys-libs/ncurses-5.1 ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( app-crypt/mit-krb5 ) spell? ( app-text/aspell ) topal? ( >=net-mail/topal-72 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=alpine is an easy to use text-based based mail and news client
 EAPI=4
 HOMEPAGE=http://www.washington.edu/alpine/ http://patches.freeiz.com/alpine/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=virtual/pam >=net-libs/c-client-2007f-r4[topal=,chappa=] >=sys-libs/ncurses-5.1 ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( app-crypt/mit-krb5 ) spell? ( app-text/aspell ) topal? ( >=net-mail/topal-72 ) app-misc/mime-types !onlyalpine? ( !mail-client/pine ) !<=net-mail/uw-imap-2004g
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/alpine/alpine-2.00.tar.bz2 chappa? ( http://patches.freeiz.com/alpine/patches/alpine-2.00/all.patch.gz -> alpine-2.00-chappa-115-all.patch.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=189049e35d287fc7b56e41dd195df25e
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.9.0 b/metadata/md5-cache/mail-client/claws-mail-3.9.0
index 8f320ac2e6b0..37cbb4d3d3b2 100644
--- a/metadata/md5-cache/mail-client/claws-mail-3.9.0
+++ b/metadata/md5-cache/mail-client/claws-mail-3.9.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-2.20:2 pda? ( >=app-pda/jpilot-0.99 ) ssl? ( >=net-libs/gnutls-2.2.0 ) ldap? ( >=net-nds/openldap-2.0.7 ) crypt? ( >=app-crypt/gpgme-0.4.5 ) dbus? ( >=dev-libs/dbus-glib-0.60 ) dillo? ( www-client/dillo ) spell? ( >=app-text/enchant-1.0.0 ) imap? ( >=net-libs/libetpan-0.57 ) nntp? ( >=net-libs/libetpan-0.57 ) startup-notification? ( x11-libs/startup-notification ) bogofilter? ( mail-filter/bogofilter ) session? ( x11-libs/libSM x11-libs/libICE ) smime? ( >=app-crypt/gpgme-0.4.5 ) app-misc/mime-types x11-misc/shared-mime-info
 SLOT=0
 SRC_URI=mirror://sourceforge/sylpheed-claws/claws-mail-3.9.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=609d8d3e7eee7e42f91e8bca58bbf84c
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.9.0-r1 b/metadata/md5-cache/mail-client/claws-mail-3.9.0-r1
index b1d158a615c6..002fb3c2c293 100644
--- a/metadata/md5-cache/mail-client/claws-mail-3.9.0-r1
+++ b/metadata/md5-cache/mail-client/claws-mail-3.9.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-2.20:2 pda? ( >=app-pda/jpilot-0.99 ) ssl? ( >=net-libs/gnutls-2.2.0 ) ldap? ( >=net-nds/openldap-2.0.7 ) crypt? ( >=app-crypt/gpgme-0.4.5 ) dbus? ( >=dev-libs/dbus-glib-0.60 ) dillo? ( www-client/dillo ) spell? ( >=app-text/enchant-1.0.0 ) imap? ( >=net-libs/libetpan-0.57 ) nntp? ( >=net-libs/libetpan-0.57 ) startup-notification? ( x11-libs/startup-notification ) bogofilter? ( mail-filter/bogofilter ) session? ( x11-libs/libSM x11-libs/libICE ) smime? ( >=app-crypt/gpgme-0.4.5 ) app-misc/mime-types x11-misc/shared-mime-info
 SLOT=0
 SRC_URI=mirror://sourceforge/sylpheed-claws/claws-mail-3.9.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4fe83230958aeb63604cd9e3d5c18159
diff --git a/metadata/md5-cache/mail-client/cone-0.89 b/metadata/md5-cache/mail-client/cone-0.89
index 659df6e23c06..80e6f53a5b45 100644
--- a/metadata/md5-cache/mail-client/cone-0.89
+++ b/metadata/md5-cache/mail-client/cone-0.89
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=CONE: COnsole News reader and Emailer
 EAPI=4
 HOMEPAGE=http://www.courier-mta.org/cone/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/cone-0.89.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0893c2ec7d578b0af308bc5bd6e3b0e3
diff --git a/metadata/md5-cache/mail-client/cone-0.90 b/metadata/md5-cache/mail-client/cone-0.90
index f4245612e2a7..3b8d6a61f89d 100644
--- a/metadata/md5-cache/mail-client/cone-0.90
+++ b/metadata/md5-cache/mail-client/cone-0.90
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=CONE: COnsole News reader and Emailer
 EAPI=4
 HOMEPAGE=http://www.courier-mta.org/cone/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/cone-0.90.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cffd58a40e8f4cdf9e33be06a24e8663
diff --git a/metadata/md5-cache/mail-client/cone-0.90-r1 b/metadata/md5-cache/mail-client/cone-0.90-r1
index c1c972bf6f09..25c2f1cae85f 100644
--- a/metadata/md5-cache/mail-client/cone-0.90-r1
+++ b/metadata/md5-cache/mail-client/cone-0.90-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=CONE: COnsole News reader and Emailer
 EAPI=4
 HOMEPAGE=http://www.courier-mta.org/cone/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/cone-0.90.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=01701c20d01d02c1d38f23e2f7dfed50
diff --git a/metadata/md5-cache/mail-client/etpan-ng-0.7.1-r1 b/metadata/md5-cache/mail-client/etpan-ng-0.7.1-r1
index 822ca5fea94d..970094b74626 100644
--- a/metadata/md5-cache/mail-client/etpan-ng-0.7.1-r1
+++ b/metadata/md5-cache/mail-client/etpan-ng-0.7.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=net-libs/libetpan-0.35 sys-libs/ncurses ldap? ( net-nds/openldap ) virtual/yacc || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-libs/libetpan-0.35 sys-libs/ncurses ldap? ( net-nds/openldap ) virtual/yacc || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=etPan is a console mail client that is based on libEtPan
 HOMEPAGE=http://www.etpan.org/other.html
 IUSE=debug ldap
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=net-libs/libetpan-0.35 sys-libs/ncurses ldap? ( net-nds/openldap )
 SLOT=0
 SRC_URI=mirror://sourceforge/libetpan/etpan-ng-0.7.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a69f2abb6c52269220eb5bf00a5008c2
diff --git a/metadata/md5-cache/mail-client/evolution-2.32.3-r1 b/metadata/md5-cache/mail-client/evolution-2.32.3-r1
index a0cbdafd9872..f64b56f58910 100644
--- a/metadata/md5-cache/mail-client/evolution-2.32.3-r1
+++ b/metadata/md5-cache/mail-client/evolution-2.32.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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/evolution-data-server-2.32* >=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 virtual/pkgconfig >=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 || ( >=sys-devel/automake-1.12:1.12 ) >=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* ) )
+DEPEND=>=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/evolution-data-server-2.32* >=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 virtual/pkgconfig >=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 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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* ) )
 DESCRIPTION=Integrated mail, addressbook and calendaring functionality
 EAPI=4
 HOMEPAGE=http://projects.gnome.org/evolution/
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2 LGPL-3 ) GPL-2+ LGPL-2 FDL-1.2+ OPENLDAP
 RDEPEND=>=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/evolution-data-server-2.32* >=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* ) )
 SLOT=2.0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2cddf768eaea9c476c2952cabb505831
diff --git a/metadata/md5-cache/mail-client/hap-3.7-r1 b/metadata/md5-cache/mail-client/hap-3.7-r1
index 60968fbc290f..7d71039ef6bf 100644
--- a/metadata/md5-cache/mail-client/hap-3.7-r1
+++ b/metadata/md5-cache/mail-client/hap-3.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A terminal mail notification program (replacement for biff)
 EAPI=4
 HOMEPAGE=http://www.transbay.net/~enf/sw.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.transbay.net/~enf/hap-3.7.tar
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1d90cc58dc61cd4a6c7848c09bbd3eec
diff --git a/metadata/md5-cache/mail-client/mutt-1.5.21-r1 b/metadata/md5-cache/mail-client/mutt-1.5.21-r1
index 950530653d9a..5f5596158de1 100644
--- a/metadata/md5-cache/mail-client/mutt-1.5.21-r1
+++ b/metadata/md5-cache/mail-client/mutt-1.5.21-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A small but very powerful text-based mail client
 EAPI=3
 HOMEPAGE=http://www.mutt.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e11e6a82438ac752c3ac184e15c1db59
diff --git a/metadata/md5-cache/mail-client/mutt-1.5.21-r11 b/metadata/md5-cache/mail-client/mutt-1.5.21-r11
index 100448543340..17b226154c2c 100644
--- a/metadata/md5-cache/mail-client/mutt-1.5.21-r11
+++ b/metadata/md5-cache/mail-client/mutt-1.5.21-r11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A small but very powerful text-based mail client
 EAPI=3
 HOMEPAGE=http://www.mutt.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=ftp://ftp.mutt.org/mutt/devel/mutt-1.5.21.tar.gz mirror://gentoo/mutt-1.5.21-gentoo-patches-r14.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/mutt-1.5.21-gentoo-patches-r14.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=03bc8571fb9de8598a003937b804056e
diff --git a/metadata/md5-cache/mail-client/mutt-1.5.21-r12 b/metadata/md5-cache/mail-client/mutt-1.5.21-r12
index a34a47f086ab..1449d538e8a5 100644
--- a/metadata/md5-cache/mail-client/mutt-1.5.21-r12
+++ b/metadata/md5-cache/mail-client/mutt-1.5.21-r12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A small but very powerful text-based mail client
 EAPI=3
 HOMEPAGE=http://www.mutt.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=ftp://ftp.mutt.org/mutt/devel/mutt-1.5.21.tar.gz mirror://gentoo/mutt-1.5.21-gentoo-patches-r15.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/mutt-1.5.21-gentoo-patches-r15.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f8f77d8f0724e120672729ee4b89e935
diff --git a/metadata/md5-cache/mail-client/thunderbird-17.0.5 b/metadata/md5-cache/mail-client/thunderbird-17.0.5
index 77024340a952..b9361547cc19 100644
--- a/metadata/md5-cache/mail-client/thunderbird-17.0.5
+++ b/metadata/md5-cache/mail-client/thunderbird-17.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.14.1 >=dev-libs/nspr-4.9.4 >=dev-libs/glib-2.26 gconf? ( >=gnome-base/gconf-1.2.1:2 ) >=media-libs/libpng-1.5.11[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 kernel_linux? ( media-libs/alsa-lib ) >=media-libs/libvpx-1.0.0 virtual/libffi !x11-plugins/enigmail system-sqlite? ( || ( >=dev-db/sqlite-3.7.16:3[secure-delete,debug=] =dev-db/sqlite-3.7.15*[fts3,secure-delete,threadsafe,unlock-notify,debug=] =dev-db/sqlite-3.7.14*[fts3,secure-delete,threadsafe,unlock-notify,debug=] =dev-db/sqlite-3.7.13*[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) ) selinux? ( sec-policy/selinux-thunderbird ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) !elibc_glibc? ( dev-libs/libexecinfo ) virtual/pkgconfig amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) x11-libs/libXrender x11-libs/libXt >=sys-libs/zlib-1.1.4 virtual/pkgconfig || ( dev-lang/python:2.7[threads,sqlite] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=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 alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme 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.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip
+DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.14.1 >=dev-libs/nspr-4.9.4 >=dev-libs/glib-2.26 gconf? ( >=gnome-base/gconf-1.2.1:2 ) >=media-libs/libpng-1.5.11[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 kernel_linux? ( media-libs/alsa-lib ) >=media-libs/libvpx-1.0.0 virtual/libffi !x11-plugins/enigmail system-sqlite? ( || ( >=dev-db/sqlite-3.7.16:3[secure-delete,debug=] =dev-db/sqlite-3.7.15*[fts3,secure-delete,threadsafe,unlock-notify,debug=] =dev-db/sqlite-3.7.14*[fts3,secure-delete,threadsafe,unlock-notify,debug=] =dev-db/sqlite-3.7.13*[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) ) selinux? ( sec-policy/selinux-thunderbird ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) !elibc_glibc? ( dev-libs/libexecinfo ) virtual/pkgconfig amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) x11-libs/libXrender x11-libs/libXt >=sys-libs/zlib-1.1.4 virtual/pkgconfig || ( dev-lang/python:2.7[threads,sqlite] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=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 alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip
 DESCRIPTION=Thunderbird Mail Client
 EAPI=3
 HOMEPAGE=http://www.mozilla.com/en-US/thunderbird/
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.14.1 >=dev-libs/nspr-4.9.4 >=dev-libs/glib-2.26 gconf? ( >=gnome-base/gconf-1.2.1:2 ) >=media-libs/libpng-1.5.11[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 kernel_linux? ( media-libs/alsa-lib ) >=media-libs/libvpx-1.0.0 virtual/libffi !x11-plugins/enigmail system-sqlite? ( || ( >=dev-db/sqlite-3.7.16:3[secure-delete,debug=] =dev-db/sqlite-3.7.15*[fts3,secure-delete,threadsafe,unlock-notify,debug=] =dev-db/sqlite-3.7.14*[fts3,secure-delete,threadsafe,unlock-notify,debug=] =dev-db/sqlite-3.7.13*[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) ) selinux? ( sec-policy/selinux-thunderbird ) 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 >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=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 alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme 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 )
 SLOT=0
 SRC_URI=linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/ar.xpi -> thunderbird-17.0.5esr-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/ast.xpi -> thunderbird-17.0.5esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/be.xpi -> thunderbird-17.0.5esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/bg.xpi -> thunderbird-17.0.5esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/bn-BD.xpi -> thunderbird-17.0.5esr-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/br.xpi -> thunderbird-17.0.5esr-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/ca.xpi -> thunderbird-17.0.5esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/cs.xpi -> thunderbird-17.0.5esr-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/da.xpi -> thunderbird-17.0.5esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/de.xpi -> thunderbird-17.0.5esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/el.xpi -> thunderbird-17.0.5esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/en-GB.xpi -> thunderbird-17.0.5esr-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/es-AR.xpi -> thunderbird-17.0.5esr-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/es-ES.xpi -> thunderbird-17.0.5esr-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/et.xpi -> thunderbird-17.0.5esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/eu.xpi -> thunderbird-17.0.5esr-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/fi.xpi -> thunderbird-17.0.5esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/fr.xpi -> thunderbird-17.0.5esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/fy-NL.xpi -> thunderbird-17.0.5esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/ga-IE.xpi -> thunderbird-17.0.5esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/gd.xpi -> thunderbird-17.0.5esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/gl.xpi -> thunderbird-17.0.5esr-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/he.xpi -> thunderbird-17.0.5esr-he.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/hr.xpi -> thunderbird-17.0.5esr-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/hu.xpi -> thunderbird-17.0.5esr-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/hy-AM.xpi -> thunderbird-17.0.5esr-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/id.xpi -> thunderbird-17.0.5esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/is.xpi -> thunderbird-17.0.5esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/it.xpi -> thunderbird-17.0.5esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/ja.xpi -> thunderbird-17.0.5esr-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/ko.xpi -> thunderbird-17.0.5esr-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/lt.xpi -> thunderbird-17.0.5esr-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/nb-NO.xpi -> thunderbird-17.0.5esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/nl.xpi -> thunderbird-17.0.5esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/nn-NO.xpi -> thunderbird-17.0.5esr-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/pa-IN.xpi -> thunderbird-17.0.5esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/pl.xpi -> thunderbird-17.0.5esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/pt-BR.xpi -> thunderbird-17.0.5esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/pt-PT.xpi -> thunderbird-17.0.5esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/rm.xpi -> thunderbird-17.0.5esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/ro.xpi -> thunderbird-17.0.5esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/ru.xpi -> thunderbird-17.0.5esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/si.xpi -> thunderbird-17.0.5esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/sk.xpi -> thunderbird-17.0.5esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/sl.xpi -> thunderbird-17.0.5esr-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/sq.xpi -> thunderbird-17.0.5esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/sr.xpi -> thunderbird-17.0.5esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/sv-SE.xpi -> thunderbird-17.0.5esr-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/ta-LK.xpi -> thunderbird-17.0.5esr-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/tr.xpi -> thunderbird-17.0.5esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/uk.xpi -> thunderbird-17.0.5esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/vi.xpi -> thunderbird-17.0.5esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/zh-CN.xpi -> thunderbird-17.0.5esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.5esr/linux-i686/xpi/zh-TW.xpi -> thunderbird-17.0.5esr-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases/17.0.5esr/source/thunderbird-17.0.5esr.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.5.1.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-17.0-patches-01.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-17.0-patches-0.5.tar.xz http://dev.gentoo.org/~nirbheek/mozilla/patchsets/firefox-17.0-patches-0.5.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/thunderbird-17.0-patches-01.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	e4ad1852082c7cd6fef51893c4d16af2	mozcoreconf-2	1e308a59d2f982d7c2f79b68e67a0a4f	mozextension	08e43f98cbab4b43f95660c74a831df7	mozlinguas	4fccc675305cf2d1e23c1a05f47b9b2a	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	pax-utils	d727728a240d5f59bf9370a64259fd61	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	e4ad1852082c7cd6fef51893c4d16af2	mozcoreconf-2	1e308a59d2f982d7c2f79b68e67a0a4f	mozextension	08e43f98cbab4b43f95660c74a831df7	mozlinguas	4fccc675305cf2d1e23c1a05f47b9b2a	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	pax-utils	d727728a240d5f59bf9370a64259fd61	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b6b65399e1c6b1034a4ffde94fd23518
diff --git a/metadata/md5-cache/mail-filter/anubis-4.1.1 b/metadata/md5-cache/mail-filter/anubis-4.1.1
index e4cd5c3746cb..826228b85dcf 100644
--- a/metadata/md5-cache/mail-filter/anubis-4.1.1
+++ b/metadata/md5-cache/mail-filter/anubis-4.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU Anubis is an outgoing mail processor.
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/anubis/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/gdbm crypt? ( >=app-crypt/gpgme-0.9.0 ) guile? ( >=dev-scheme/g
 REQUIRED_USE=mysql? ( sasl ) postgres? ( sasl )
 SLOT=0
 SRC_URI=mirror://gnu/anubis/anubis-4.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8065be12febf47f9ef6163ec44d3ef1e
diff --git a/metadata/md5-cache/mail-filter/anubis-4.1.1-r1 b/metadata/md5-cache/mail-filter/anubis-4.1.1-r1
index 4bf73fb3efae..93da960b1855 100644
--- a/metadata/md5-cache/mail-filter/anubis-4.1.1-r1
+++ b/metadata/md5-cache/mail-filter/anubis-4.1.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU Anubis is an outgoing mail processor.
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/anubis/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/gdbm crypt? ( >=app-crypt/gpgme-0.9.0 ) guile? ( >=dev-scheme/g
 REQUIRED_USE=mysql? ( sasl ) postgres? ( sasl )
 SLOT=0
 SRC_URI=mirror://gnu/anubis/anubis-4.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3f7a43a9ac77d07b5e53c45ab461ec91
diff --git a/metadata/md5-cache/mail-filter/couriersrs-0.1.1 b/metadata/md5-cache/mail-filter/couriersrs-0.1.1
index ddfd5595ee98..6dee7c9e18ce 100644
--- a/metadata/md5-cache/mail-filter/couriersrs-0.1.1
+++ b/metadata/md5-cache/mail-filter/couriersrs-0.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-libs/popt mail-filter/libsrs2 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/popt mail-filter/libsrs2 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=SRS (Sender Rewriting Scheme) wrapper for the courier MTA.
 HOMEPAGE=http://couriersrs.com/
 KEYWORDS=~amd64
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/popt mail-filter/libsrs2
 SLOT=0
 SRC_URI=http://couriersrs.com/download/couriersrs-0.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7c2d3124010e64fb2dd5572b487df514
diff --git a/metadata/md5-cache/mail-filter/couriersrs-0.1.2 b/metadata/md5-cache/mail-filter/couriersrs-0.1.2
index 6835c1c98f2b..07de48502a52 100644
--- a/metadata/md5-cache/mail-filter/couriersrs-0.1.2
+++ b/metadata/md5-cache/mail-filter/couriersrs-0.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/popt mail-filter/libsrs2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/popt mail-filter/libsrs2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=SRS (Sender Rewriting Scheme) wrapper for the courier MTA.
 EAPI=2
 HOMEPAGE=http://couriersrs.com/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/popt mail-filter/libsrs2
 SLOT=0
 SRC_URI=http://couriersrs.com/download/couriersrs-0.1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8a7474248b128c50e67ad5ddbe2bcdc6
diff --git a/metadata/md5-cache/mail-filter/dovecot-antispam-2.0_pre20120226 b/metadata/md5-cache/mail-filter/dovecot-antispam-2.0_pre20120226
index d05a549d4dae..453402681dce 100644
--- a/metadata/md5-cache/mail-filter/dovecot-antispam-2.0_pre20120226
+++ b/metadata/md5-cache/mail-filter/dovecot-antispam-2.0_pre20120226
@@ -1,5 +1,5 @@
 DEFINED_PHASES=postinst prepare
-DEPEND=>=net-mail/dovecot-2.1.0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-mail/dovecot-2.1.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A dovecot antispam plugin supporting multiple backends
 EAPI=4
 HOMEPAGE=http://wiki2.dovecot.org/Plugins/Antispam
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-mail/dovecot-2.1.0
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~radhermit/distfiles/dovecot-antispam-2.0_pre20120226.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=654ed437ce023736ded9e7619b492eee
diff --git a/metadata/md5-cache/mail-filter/libdkim-1.0.21-r1 b/metadata/md5-cache/mail-filter/libdkim-1.0.21-r1
index 4ca2e7926eee..270b8afd0c0e 100644
--- a/metadata/md5-cache/mail-filter/libdkim-1.0.21-r1
+++ b/metadata/md5-cache/mail-filter/libdkim-1.0.21-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/openssl app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=DomainKeys Identified Mail library from Alt-N Inc.
 EAPI=4
 HOMEPAGE=http://libdkim.sourceforge.net
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 yahoo-patent-license-1.2
 RDEPEND=!mail-filter/libdkim-exim dev-libs/openssl
 SLOT=0
 SRC_URI=mirror://sourceforge/libdkim/libdkim-1.0.21.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e012befcc4bc21a9e4ffd3709547e3b7
diff --git a/metadata/md5-cache/mail-filter/libspf2-1.2.9-r3 b/metadata/md5-cache/mail-filter/libspf2-1.2.9-r3
index c58b77dee5ca..7a279772fe62 100644
--- a/metadata/md5-cache/mail-filter/libspf2-1.2.9-r3
+++ b/metadata/md5-cache/mail-filter/libspf2-1.2.9-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocol pair.
 EAPI=4
 HOMEPAGE=http://www.libspf2.org
@@ -10,5 +10,5 @@ RDEPEND=!dev-perl/Mail-SPF-Query
 REQUIRED_USE=static? ( static-libs )
 SLOT=0
 SRC_URI=http://www.libspf2.org/spf/libspf2-1.2.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b0d1a1d63c71d842b18dfc6e43bc296d
diff --git a/metadata/md5-cache/mail-filter/libsrs2-1.0.18 b/metadata/md5-cache/mail-filter/libsrs2-1.0.18
index 8aff94503b92..5a92375c8ed7 100644
--- a/metadata/md5-cache/mail-filter/libsrs2-1.0.18
+++ b/metadata/md5-cache/mail-filter/libsrs2-1.0.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=!dev-perl/Mail-SRS || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!dev-perl/Mail-SRS || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=libsrs2 is the next generation Sender Rewriting Scheme library
 EAPI=4
 HOMEPAGE=http://www.libsrs2.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!dev-perl/Mail-SRS
 SLOT=0
 SRC_URI=http://www.libsrs2.org/srs/libsrs2-1.0.18.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c575f85bc04076a81074196deed228b0
diff --git a/metadata/md5-cache/mail-filter/libsrs_alt-1.0 b/metadata/md5-cache/mail-filter/libsrs_alt-1.0
index fe1de3fcfbe7..388cdbd5da36 100644
--- a/metadata/md5-cache/mail-filter/libsrs_alt-1.0
+++ b/metadata/md5-cache/mail-filter/libsrs_alt-1.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=!dev-perl/Mail-SRS || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!dev-perl/Mail-SRS || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Sender Rewriting Scheme library
 HOMEPAGE=http://srs.mirtol.com/
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://srs.mirtol.com/libsrs_alt-1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7b80714e868cae44c6ddd41ab7ab8b1a
diff --git a/metadata/md5-cache/mail-filter/maildrop-2.6.0 b/metadata/md5-cache/mail-filter/maildrop-2.6.0
index 4235a7b5d24c..e94d569f1ae9 100644
--- a/metadata/md5-cache/mail-filter/maildrop-2.6.0
+++ b/metadata/md5-cache/mail-filter/maildrop-2.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=!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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Mail delivery agent/filter
 EAPI=4
 HOMEPAGE=http://www.courier-mta.org/maildrop/
@@ -10,5 +10,5 @@ RDEPEND=!mail-mta/courier net-mail/mailbase dev-libs/libpcre net-dns/libidn gdbm
 REQUIRED_USE=mysql? ( authlib ) postgres? ( authlib ) ldap? ( authlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/maildrop-2.6.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d31cae3cb226171b06b140c1027f55ab
diff --git a/metadata/md5-cache/mail-filter/opendkim-2.7.4-r1 b/metadata/md5-cache/mail-filter/opendkim-2.7.4-r1
index 5ec2dbcb8b59..2415bff58195 100644
--- a/metadata/md5-cache/mail-filter/opendkim-2.7.4-r1
+++ b/metadata/md5-cache/mail-filter/opendkim-2.7.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd 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 ) !unbound? ( net-libs/ldns ) gnutls? ( >=net-libs/gnutls-2.11.7 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd 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 ) !unbound? ( net-libs/ldns ) gnutls? ( >=net-libs/gnutls-2.11.7 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A milter-based application to provide DKIM signing and verification
 EAPI=4
 HOMEPAGE=http://opendkim.org
@@ -10,5 +10,5 @@ RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd ssl? ( >=
 REQUIRED_USE=sasl? ( ldap )
 SLOT=0
 SRC_URI=mirror://sourceforge/opendkim/opendkim-2.7.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=24dd9464755759e20bb6271c1c2f3e75
diff --git a/metadata/md5-cache/mail-filter/opendkim-2.8.0 b/metadata/md5-cache/mail-filter/opendkim-2.8.0
index 3a97a1b6e237..05502b4dddbc 100644
--- a/metadata/md5-cache/mail-filter/opendkim-2.8.0
+++ b/metadata/md5-cache/mail-filter/opendkim-2.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd 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 ) !unbound? ( net-libs/ldns ) gnutls? ( >=net-libs/gnutls-2.11.7 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd 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 ) !unbound? ( net-libs/ldns ) gnutls? ( >=net-libs/gnutls-2.11.7 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A milter-based application to provide DKIM signing and verification
 EAPI=5
 HOMEPAGE=http://opendkim.org
@@ -10,5 +10,5 @@ RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd ssl? ( >=
 REQUIRED_USE=sasl? ( ldap )
 SLOT=0
 SRC_URI=mirror://sourceforge/opendkim/opendkim-2.8.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=62b099df5e21b5c818c945b1327a3235
diff --git a/metadata/md5-cache/mail-filter/opendkim-2.8.0-r1 b/metadata/md5-cache/mail-filter/opendkim-2.8.0-r1
index 440b278743bc..1cfec54619e3 100644
--- a/metadata/md5-cache/mail-filter/opendkim-2.8.0-r1
+++ b/metadata/md5-cache/mail-filter/opendkim-2.8.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd 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 ) !unbound? ( net-libs/ldns ) gnutls? ( >=net-libs/gnutls-2.11.7 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd 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 ) !unbound? ( net-libs/ldns ) gnutls? ( >=net-libs/gnutls-2.11.7 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A milter-based application to provide DKIM signing and verification
 EAPI=5
 HOMEPAGE=http://opendkim.org
@@ -10,5 +10,5 @@ RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd ssl? ( >=
 REQUIRED_USE=sasl? ( ldap )
 SLOT=0
 SRC_URI=mirror://sourceforge/opendkim/opendkim-2.8.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dad8ae05614c365b259d8c5b1e34a5e7
diff --git a/metadata/md5-cache/mail-filter/opendkim-2.8.1 b/metadata/md5-cache/mail-filter/opendkim-2.8.1
index fb2b7ecf3408..3c8deb8d6dd2 100644
--- a/metadata/md5-cache/mail-filter/opendkim-2.8.1
+++ b/metadata/md5-cache/mail-filter/opendkim-2.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd 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 ) !unbound? ( net-libs/ldns ) gnutls? ( >=net-libs/gnutls-2.11.7 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd 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 ) !unbound? ( net-libs/ldns ) gnutls? ( >=net-libs/gnutls-2.11.7 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A milter-based application to provide DKIM signing and verification
 EAPI=5
 HOMEPAGE=http://opendkim.org
@@ -10,5 +10,5 @@ RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd ssl? ( >=
 REQUIRED_USE=sasl? ( ldap )
 SLOT=0
 SRC_URI=mirror://sourceforge/opendkim/opendkim-2.8.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a1fee104f1b8d3968225324b156e3cb1
diff --git a/metadata/md5-cache/mail-filter/opendkim-2.8.2 b/metadata/md5-cache/mail-filter/opendkim-2.8.2
index 51fec01a7cc8..c51cc0616706 100644
--- a/metadata/md5-cache/mail-filter/opendkim-2.8.2
+++ b/metadata/md5-cache/mail-filter/opendkim-2.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd 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 ) !unbound? ( net-libs/ldns ) gnutls? ( >=net-libs/gnutls-2.11.7 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd 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 ) !unbound? ( net-libs/ldns ) gnutls? ( >=net-libs/gnutls-2.11.7 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A milter-based application to provide DKIM signing and verification
 EAPI=5
 HOMEPAGE=http://opendkim.org
@@ -10,5 +10,5 @@ RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd ssl? ( >=
 REQUIRED_USE=sasl? ( ldap )
 SLOT=0
 SRC_URI=mirror://sourceforge/opendkim/opendkim-2.8.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=969d94cfb56c6983ac21756021241cbe
diff --git a/metadata/md5-cache/mail-filter/spamdyke-4.3.0 b/metadata/md5-cache/mail-filter/spamdyke-4.3.0
index 496fe16fbd1b..c12d4aca7350 100644
--- a/metadata/md5-cache/mail-filter/spamdyke-4.3.0
+++ b/metadata/md5-cache/mail-filter/spamdyke-4.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=tls? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=tls? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A drop-in connection-time spam filter for qmail
 EAPI=2
 HOMEPAGE=http://www.spamdyke.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=tls? ( dev-libs/openssl ) virtual/qmail
 SLOT=0
 SRC_URI=http://www.spamdyke.org/releases/spamdyke-4.3.0.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=10fab8dfdd5a6ccbd7bdf5688bcb7b70
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.4.30 b/metadata/md5-cache/mail-mta/msmtp-1.4.31
similarity index 81%
rename from metadata/md5-cache/mail-mta/msmtp-1.4.30
rename to metadata/md5-cache/mail-mta/msmtp-1.4.31
index af911083854f..df4b48aa5a2f 100644
--- a/metadata/md5-cache/mail-mta/msmtp-1.4.30
+++ b/metadata/md5-cache/mail-mta/msmtp-1.4.31
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install prepare setup
+DEFINED_PHASES=compile configure install postinst prepare setup
 DEPEND=gnome-keyring? ( dev-python/gnome-keyring-python gnome-base/libgnome-keyring ) idn? ( net-dns/libidn ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) virtual/pkgconfig
 DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
-EAPI=4
+EAPI=5
 HOMEPAGE=http://msmtp.sourceforge.net/
 IUSE=doc gnome-keyring gnutls idn +mta nls sasl ssl vim-syntax
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-3
 RDEPEND=gnome-keyring? ( dev-python/gnome-keyring-python gnome-base/libgnome-keyring ) idn? ( net-dns/libidn ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) net-mail/mailbase mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] )
 REQUIRED_USE=gnutls? ( ssl )
 SLOT=0
-SRC_URI=mirror://sourceforge/msmtp/msmtp-1.4.30.tar.bz2
+SRC_URI=mirror://sourceforge/msmtp/msmtp-1.4.31.tar.bz2
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=08562bcd5b7445e4b7a2b2d28d8315f0
+_md5_=c2d930f8eeebf0355144da4372459533
diff --git a/metadata/md5-cache/mail-mta/nullmailer-1.11 b/metadata/md5-cache/mail-mta/nullmailer-1.11
index 80e17057f9ca..9a5aea05fbce 100644
--- a/metadata/md5-cache/mail-mta/nullmailer-1.11
+++ b/metadata/md5-cache/mail-mta/nullmailer-1.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/shadow virtual/logger ssl? ( net-libs/gnutls ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp
 SLOT=0
 SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-1.11.tar.gz mirror://debian/pool/main/n/nullmailer/nullmailer_1.11-1.debian.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e2f08d9d28984eac05cbd157d81965e0
diff --git a/metadata/md5-cache/mail-mta/nullmailer-1.11-r1 b/metadata/md5-cache/mail-mta/nullmailer-1.11-r1
index 37b28c2289be..5d9f5d8fae37 100644
--- a/metadata/md5-cache/mail-mta/nullmailer-1.11-r1
+++ b/metadata/md5-cache/mail-mta/nullmailer-1.11-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/shadow virtual/logger ssl? ( net-libs/gnutls ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp
 SLOT=0
 SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-1.11.tar.gz mirror://debian/pool/main/n/nullmailer/nullmailer_1.11-1.debian.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9956649df80eeab32de93e156a09c8dd
diff --git a/metadata/md5-cache/mail-mta/opensmtpd-5.3.1_p1 b/metadata/md5-cache/mail-mta/opensmtpd-5.3.1_p1
index 188c6b3507cf..99d8669ada9a 100644
--- a/metadata/md5-cache/mail-mta/opensmtpd-5.3.1_p1
+++ b/metadata/md5-cache/mail-mta/opensmtpd-5.3.1_p1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install preinst prepare
-DEPEND=dev-libs/openssl sys-libs/zlib pam? ( virtual/pam ) sys-libs/db sqlite? ( dev-db/sqlite:3 ) dev-libs/libevent !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl sys-libs/zlib pam? ( virtual/pam ) sys-libs/db sqlite? ( dev-db/sqlite:3 ) dev-libs/libevent !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Lightweight but featured SMTP daemon from OpenBSD
 EAPI=5
 HOMEPAGE=http://www.opensmtpd.org/
@@ -9,5 +9,5 @@ LICENSE=ISC BSD BSD-1 BSD-2 BSD-4
 RDEPEND=dev-libs/openssl sys-libs/zlib pam? ( virtual/pam ) sys-libs/db sqlite? ( dev-db/sqlite:3 ) dev-libs/libevent !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta]
 SLOT=0
 SRC_URI=http://www.opensmtpd.org/archives/opensmtpd-5.3.1p1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dfd70115352d2405a5bebe4b0ebbe4a8
diff --git a/metadata/md5-cache/mail-mta/sendmail-8.14.7 b/metadata/md5-cache/mail-mta/sendmail-8.14.7
new file mode 100644
index 000000000000..14736f28fd89
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/sendmail-8.14.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=net-mail/mailbase sys-devel/m4 sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) >=sys-libs/db-3.2 !net-mail/vacation
+DESCRIPTION=Widely-used Mail Transport Agent (MTA)
+EAPI=5
+HOMEPAGE=http://www.sendmail.org/
+IUSE=ssl ldap sasl tcpd mbox ipv6 nis sockets
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=Sendmail
+PDEPEND=!mbox? ( mail-filter/procmail )
+RDEPEND=net-mail/mailbase sys-devel/m4 sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) >=sys-libs/db-3.2 !net-mail/vacation >=net-mail/mailbase-0.00 !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/opensmtpd !mail-mta/qmail-ldap !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta]
+SLOT=0
+SRC_URI=ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.14.7.tar.gz
+_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d7ca1a0ffbf35b87962e6d5a674160fc
diff --git a/metadata/md5-cache/mail-mta/ssmtp-2.64-r2 b/metadata/md5-cache/mail-mta/ssmtp-2.64-r2
index 3c81768ee521..5955bdb95fc5 100644
--- a/metadata/md5-cache/mail-mta/ssmtp-2.64-r2
+++ b/metadata/md5-cache/mail-mta/ssmtp-2.64-r2
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) ) net-m
 REQUIRED_USE=gnutls? ( ssl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2 http://dev.gentoo.org/~flameeyes/ssmtp/ssmtp-2.64-patches-3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=51ecd4c2bb1112b10122d66c84863c6e
diff --git a/metadata/md5-cache/media-fonts/encodings-1.0.4 b/metadata/md5-cache/media-fonts/encodings-1.0.4
index fa6671e5541e..e2d6045b3a36 100644
--- a/metadata/md5-cache/media-fonts/encodings-1.0.4
+++ b/metadata/md5-cache/media-fonts/encodings-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-apps/mkfontscale >=media-fonts/font-util-1.1.1-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-apps/mkfontscale >=media-fonts/font-util-1.1.1-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org font encodings
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/encodings-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=13f74227a1826469944b7b43dd7539cb
diff --git a/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3
index 35bc03705f83..ba5cf04e4492 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Adobe bitmap fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-adobe-100dpi-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4558971e5ea7be98cdb7e301a6a30465
diff --git a/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3
index 04107e25305c..abfb54ccdc1f 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Adobe bitmap fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-adobe-75dpi-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=19213d2b4e50cdc5055cb458faabfba3
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4
index bee6a97f5963..232caae561ab 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Adobe Utopia bitmap fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=ff25aaf38047f02eb5f539e8d6a096bb
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4
index 7ccd7d9896a5..780b062d6e2d 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Adobe Utopia bitmap fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=cabb7e004a9b426968b8405d8adea3ff
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4 b/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4
index b1d59b783854..5e6c8ea95684 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Adobe Utopia Type 1 fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a2dfbc2aa411e45fecafedea4733dbb2
diff --git a/metadata/md5-cache/media-fonts/font-alias-1.0.3 b/metadata/md5-cache/media-fonts/font-alias-1.0.3
index ca33b8aee3d7..97a24b669786 100644
--- a/metadata/md5-cache/media-fonts/font-alias-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-alias-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-apps/mkfontscale >=media-fonts/font-util-1.1.1-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-apps/mkfontscale >=media-fonts/font-util-1.1.1-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org font aliases
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-alias-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7f51642e50b0d49bdf7eec991fdf2ddb
diff --git a/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3
index 9fc497274910..34b3aa78b2f0 100644
--- a/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org arabic bitmap fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-arabic-misc-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=94a9402c51ed47b7ee4b9f3a787cb837
diff --git a/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3
index be18fd7a8066..884e2c93e7c7 100644
--- a/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Bigelow & Holmes bitmap fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bh-100dpi-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=869647d10868665af56199d94140168c
diff --git a/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3
index fff5187a781a..02201e96f4e8 100644
--- a/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Bigelow & Holmes bitmap fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bh-75dpi-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4009937f9c6e5a28fd77fa7d29ff3895
diff --git a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3
index 97c85f7c9884..a18c48ff0006 100644
--- a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Bigelow & Holmes Lucida bitmap fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5b89bb66c48b418b448c52b4369530e2
diff --git a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3
index c8a0c0bd75d2..d40b5bdc1ca7 100644
--- a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Bigelow & Holmes Lucida bitmap fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5ab15b4b9b49821e76ef474ae27b6102
diff --git a/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3 b/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3
index bec65cd08982..7ee5ad1e1e11 100644
--- a/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Bigelow & Holmes TrueType fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bh-ttf-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=c03557d4f27962afb7c700508ad6fc1f
diff --git a/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3 b/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3
index bb5ec6817913..6166e255b117 100644
--- a/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Bigelow & Holmes Type 1 fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bh-type1-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=280e5ee7b7378afbd7e8385e4219d421
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3
index aa4c19605633..6ab9c134b0fc 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Bitstream bitmap fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=79280ac155f9ece7837a80128e7b93db
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3
index 1ef03a08fa7f..f87b818a0aa4 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Bitstream bitmap fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=105c64961eeb7d07e522aa1ef7db6199
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2 b/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2
index 35e824a62300..779d111cd493 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2
+++ b/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=Bitstream Speedo fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bitstream-speedo-1.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a22c13117bc12d169140538902f6ac88
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3 b/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3
index d75a21682869..f2c7b1c44c9a 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Bitstream Type 1 fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bitstream-type1-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=ab4e7c861c07106450cb215cfe3d2b0f
diff --git a/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3 b/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3
index 3f49f4bde6a2..b4d1c8070d03 100644
--- a/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Cronyx cyrillic fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=fef7ca147519e21ef9b8720c05ed2b16
diff --git a/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3
index f4a68578078f..09c8e84ca673 100644
--- a/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org cursor font
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-cursor-misc-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=0135fe83dede1f69ce26d2fdf6e96a0f
diff --git a/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3
index 282a1f35cc56..207023675600 100644
--- a/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Daewoo fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-daewoo-misc-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=34afc7bde30b79781b97fc917a2e7472
diff --git a/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3
index 66de8a99fa26..2e6290a87ead 100644
--- a/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org DEC fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-dec-misc-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=624b1e5645187500ca0443662cdd1041
diff --git a/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3 b/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3
index f77dc87fdbf6..9681469e1be7 100644
--- a/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org IBM Courier font
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-ibm-type1-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=62a8c014a10d88293746ef49b5238845
diff --git a/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3
index b796d67de390..d2435a0b9581 100644
--- a/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org the Institute of Software, Academia Sinica (chinese) fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-isas-misc-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=862fa25ed23551780e41cbf99fbbb0d3
diff --git a/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3
index dcb9f1f565d7..c2ad02f5d3cc 100644
--- a/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=media-fonts/font-util-1.1.1-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=media-fonts/font-util-1.1.1-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org JIS (japanese) fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-jis-misc-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=8646373e66395a42d83cb9309cdab71a
diff --git a/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3
index 6a540e67c9d9..759480126d2f 100644
--- a/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org micro-misc font
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-micro-misc-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=40a70d12b8f0d40fb0c617870ce325a6
diff --git a/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3 b/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3
index c3187e4e7674..86d03dc4c91e 100644
--- a/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org misc-cyrillic fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-misc-cyrillic-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a188236bc61636994df5ce6994a06b1a
diff --git a/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3 b/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3
index 31a750181b77..b8dabf118939 100644
--- a/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=Miscellaneous Ethiopic fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-misc-ethiopic-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=084f8ac247a2e9980749e842ca4e89b8
diff --git a/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3 b/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3
index 8c5f43f050b7..5873136f1854 100644
--- a/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Syriac fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-misc-meltho-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=40339a601f6c54f34689f65d3cfe3894
diff --git a/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2 b/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2
index 9422d33bc083..6159a4bffdeb 100644
--- a/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2
+++ b/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org miscellaneous fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-misc-misc-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=bb029da7d86f0492eae552e920c51173
diff --git a/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3
index 88d81da101b1..2ffcc2e3e7a7 100644
--- a/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org ClearlyU fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-mutt-misc-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=553f28d18a2f1aac5e80626ae4dc8c85
diff --git a/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2 b/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2
index b4512111ebe9..a0c3bb677249 100644
--- a/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2
+++ b/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Schumacher fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-schumacher-misc-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=9be0e2195fd57a75cf67939df12b2e82
diff --git a/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4 b/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4
index 2cc889418d93..2f4330aabb9d 100644
--- a/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Screen cyrillic fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-screen-cyrillic-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=1dd548dab18f229ba2dd7d08edf8ef73
diff --git a/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3
index 3a2544f5879c..64ddfa433c4f 100644
--- a/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Sony fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-sony-misc-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6dc2c29dba60c9fa5e365950999157f1
diff --git a/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3
index 1160a8f8ec9b..c6b050738b60 100644
--- a/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Sun fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-sun-misc-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6f891cf0da2ce49c1cf10c21879962b5
diff --git a/metadata/md5-cache/media-fonts/font-util-1.2.0 b/metadata/md5-cache/media-fonts/font-util-1.2.0
index d4238fe53b3d..af0308ea9b1d 100644
--- a/metadata/md5-cache/media-fonts/font-util-1.2.0
+++ b/metadata/md5-cache/media-fonts/font-util-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 ) virtual/pkgconfig
 DESCRIPTION=X.Org font utilities
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-util-1.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6b5267075433176783fed85768f3767f
diff --git a/metadata/md5-cache/media-fonts/font-util-1.3.0 b/metadata/md5-cache/media-fonts/font-util-1.3.0
index add7b6e538fc..51913703fb01 100644
--- a/metadata/md5-cache/media-fonts/font-util-1.3.0
+++ b/metadata/md5-cache/media-fonts/font-util-1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 ) virtual/pkgconfig
 DESCRIPTION=X.Org font utilities
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-util-1.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=906e45222154fbbff931599964c2b85e
diff --git a/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3 b/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3
index 62d1f3fac70e..3fa4c57131cd 100644
--- a/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Winitzki cyrillic font
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=1eea4da2e4e311640b0cb18d7da5cb3e
diff --git a/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4 b/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4
index 26c7ea71ba80..ad2ebf69aed8 100644
--- a/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org XFree86 Type 1 font
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-xfree86-type1-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6334c4131661d73dd99fe7962e9817e5
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.13 b/metadata/md5-cache/media-gfx/asymptote-2.13
index 8a278d98ef72..f6019f0eba0f 100644
--- a/metadata/md5-cache/media-gfx/asymptote-2.13
+++ b/metadata/md5-cache/media-gfx/asymptote-2.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/latex-base >=sys-apps/texinfo-4.2-r5 python? ( =dev-lang/python-2* )
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/latex-base >=sys-apps/texinfo-4.2-r5 python? ( =dev-lang/python-2* )
 DESCRIPTION=A vector graphics language that provides a framework for technical drawing
 EAPI=3
 HOMEPAGE=http://asymptote.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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* )
 SLOT=0
 SRC_URI=mirror://sourceforge/asymptote/asymptote-2.13.src.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	latex-package	e7bfe03b27224512702eac009812cc50	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	latex-package	e7bfe03b27224512702eac009812cc50	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a636b31a9706366fda1730e5f2ac9e83
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.19 b/metadata/md5-cache/media-gfx/asymptote-2.19
index 83e64c66903d..1767b5ecdc59 100644
--- a/metadata/md5-cache/media-gfx/asymptote-2.19
+++ b/metadata/md5-cache/media-gfx/asymptote-2.19
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=sys-libs/readline-4.3-r5 >=sys-libs/ncurses-5.4-r5 imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( >=media-libs/mesa-8 ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/latex-base >=sys-apps/texinfo-4.2-r5 python? ( =dev-lang/python-2* )
+DEPEND=>=sys-libs/readline-4.3-r5 >=sys-libs/ncurses-5.4-r5 imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( >=media-libs/mesa-8 ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/latex-base >=sys-apps/texinfo-4.2-r5 python? ( =dev-lang/python-2* )
 DESCRIPTION=A vector graphics language that provides a framework for technical drawing
 EAPI=4
 HOMEPAGE=http://asymptote.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/readline-4.3-r5 >=sys-libs/ncurses-5.4-r5 imagemagick? ( medi
 REQUIRED_USE=offscreen? ( )
 SLOT=0
 SRC_URI=mirror://sourceforge/asymptote/asymptote-2.19.src.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	latex-package	e7bfe03b27224512702eac009812cc50	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	latex-package	e7bfe03b27224512702eac009812cc50	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f64c6f0fdd5b437499217824d65164f3
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.21 b/metadata/md5-cache/media-gfx/asymptote-2.21
index b24a676cfd77..2d4cba7ffcb7 100644
--- a/metadata/md5-cache/media-gfx/asymptote-2.21
+++ b/metadata/md5-cache/media-gfx/asymptote-2.21
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=sys-libs/readline-4.3-r5 >=sys-libs/ncurses-5.4-r5 imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( >=media-libs/mesa-8 ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/latex-base >=sys-apps/texinfo-4.2-r5 python? ( =dev-lang/python-2* )
+DEPEND=>=sys-libs/readline-4.3-r5 >=sys-libs/ncurses-5.4-r5 imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( >=media-libs/mesa-8 ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/latex-base >=sys-apps/texinfo-4.2-r5 python? ( =dev-lang/python-2* )
 DESCRIPTION=A vector graphics language that provides a framework for technical drawing
 EAPI=4
 HOMEPAGE=http://asymptote.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/readline-4.3-r5 >=sys-libs/ncurses-5.4-r5 imagemagick? ( medi
 REQUIRED_USE=offscreen? ( opengl )
 SLOT=0
 SRC_URI=mirror://sourceforge/asymptote/asymptote-2.21.src.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	latex-package	e7bfe03b27224512702eac009812cc50	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	latex-package	e7bfe03b27224512702eac009812cc50	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b6e51a0b3c5aaa12cab8f74ab95be248
diff --git a/metadata/md5-cache/media-gfx/autotrace-0.31.1-r6 b/metadata/md5-cache/media-gfx/autotrace-0.31.1-r6
index 98ccfce7c21e..246448ca98b4 100644
--- a/metadata/md5-cache/media-gfx/autotrace-0.31.1-r6
+++ b/metadata/md5-cache/media-gfx/autotrace-0.31.1-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A program for converting bitmaps to vector graphics
 EAPI=4
 HOMEPAGE=http://packages.qa.debian.org/a/autotrace.html http://autotrace.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=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 )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a2b2b3f6a8c40928af11db561c35c9fe
diff --git a/metadata/md5-cache/media-gfx/cfe-0.12 b/metadata/md5-cache/media-gfx/cfe-0.12
index f9aaf31b0651..d8cc3302f788 100644
--- a/metadata/md5-cache/media-gfx/cfe-0.12
+++ b/metadata/md5-cache/media-gfx/cfe-0.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Console font editor
 EAPI=4
 HOMEPAGE=http://lrn.ru/~osgene/
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://download.uhulinux.hu/pub/pub/mirror/http:/lrn.ru/~osgene/files/cfe-0.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1222dbd3a8daffac003a28618ed628fb
diff --git a/metadata/md5-cache/media-gfx/eog-2.32.1 b/metadata/md5-cache/media-gfx/eog-2.32.1
index 4e7da843387a..815e18520ea7 100644
--- a/metadata/md5-cache/media-gfx/eog-2.32.1
+++ b/metadata/md5-cache/media-gfx/eog-2.32.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf:2[jpeg?,tiff?] >=dev-libs/glib-2.25.9:2 >=dev-libs/libxml2-2 >=gnome-base/gconf-2.31.1 >=gnome-base/gnome-desktop-2.25.1:2 >=x11-themes/gnome-icon-theme-2.19.1 >=x11-misc/shared-mime-info-0.20 x11-libs/libX11 dbus? ( >=dev-libs/dbus-glib-0.71 ) exif? ( >=media-libs/libexif-0.6.14 virtual/jpeg:0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( =media-libs/lcms-1* ) python? ( >=dev-python/pygobject-2.15.1:2 >=dev-python/pygtk-2.13 ) svg? ( >=gnome-base/librsvg-2.26 ) xmp? ( >=media-libs/exempi-2 ) dev-util/gtk-doc-am app-text/gnome-doc-utils sys-devel/gettext >=dev-util/intltool-0.40 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=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* )
+DEPEND=>=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf:2[jpeg?,tiff?] >=dev-libs/glib-2.25.9:2 >=dev-libs/libxml2-2 >=gnome-base/gconf-2.31.1 >=gnome-base/gnome-desktop-2.25.1:2 >=x11-themes/gnome-icon-theme-2.19.1 >=x11-misc/shared-mime-info-0.20 x11-libs/libX11 dbus? ( >=dev-libs/dbus-glib-0.71 ) exif? ( >=media-libs/libexif-0.6.14 virtual/jpeg:0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( =media-libs/lcms-1* ) python? ( >=dev-python/pygobject-2.15.1:2 >=dev-python/pygtk-2.13 ) svg? ( >=gnome-base/librsvg-2.26 ) xmp? ( >=media-libs/exempi-2 ) dev-util/gtk-doc-am app-text/gnome-doc-utils sys-devel/gettext >=dev-util/intltool-0.40 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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* )
 DESCRIPTION=The Eye of GNOME image viewer
 EAPI=3
 HOMEPAGE=http://www.gnome.org/projects/eog/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf:2[jpeg?,tiff?] >=dev-libs/glib-2.25.9:2 >=dev-libs/libxml2-2 >=gnome-base/gconf-2.31.1 >=gnome-base/gnome-desktop-2.25.1:2 >=x11-themes/gnome-icon-theme-2.19.1 >=x11-misc/shared-mime-info-0.20 x11-libs/libX11 dbus? ( >=dev-libs/dbus-glib-0.71 ) exif? ( >=media-libs/libexif-0.6.14 virtual/jpeg:0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( =media-libs/lcms-1* ) python? ( >=dev-python/pygobject-2.15.1:2 >=dev-python/pygtk-2.13 ) svg? ( >=gnome-base/librsvg-2.26 ) xmp? ( >=media-libs/exempi-2 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=1
 SRC_URI=mirror://gnome/sources/eog/2.32/eog-2.32.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d8e408be3eb954e5b42b1ea7945170f7
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.23 b/metadata/md5-cache/media-gfx/exiv2-0.23
index 4d1913e08d9d..ff30d0ffb87f 100644
--- a/metadata/md5-cache/media-gfx/exiv2-0.23
+++ b/metadata/md5-cache/media-gfx/exiv2-0.23
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libiconv nls? ( virtual/libintl ) xmp? ( dev-libs/expat ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://www.exiv2.org/exiv2-0.23.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=effb806cb272fabe6a0a1c844dc225ac
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.23-r1 b/metadata/md5-cache/media-gfx/exiv2-0.23-r1
index 4e9ea52d3d7d..6b282fed7d93 100644
--- a/metadata/md5-cache/media-gfx/exiv2-0.23-r1
+++ b/metadata/md5-cache/media-gfx/exiv2-0.23-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libiconv nls? ( virtual/libintl ) xmp? ( dev-libs/expat ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://www.exiv2.org/exiv2-0.23.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=77020ac8cf2399c8f3031d3a67501905
diff --git a/metadata/md5-cache/media-gfx/f-spot-0.8.2 b/metadata/md5-cache/media-gfx/f-spot-0.8.2
index b2398ea3bea8..e5ca5223957f 100644
--- a/metadata/md5-cache/media-gfx/f-spot-0.8.2
+++ b/metadata/md5-cache/media-gfx/f-spot-0.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 virtual/pkgconfig >=dev-util/intltool-0.35 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig >=dev-util/intltool-0.35 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Personal photo management application for the gnome desktop
 EAPI=2
 HOMEPAGE=http://f-spot.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/f-spot/0.8/f-spot-0.8.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6d3db59d8730fea2e1d95672bcdf8f37
diff --git a/metadata/md5-cache/media-gfx/fbgrab-1.0-r2 b/metadata/md5-cache/media-gfx/fbgrab-1.0-r2
index 6b1a9abb66d6..70ad7f0f4b90 100644
--- a/metadata/md5-cache/media-gfx/fbgrab-1.0-r2
+++ b/metadata/md5-cache/media-gfx/fbgrab-1.0-r2
@@ -3,10 +3,10 @@ DEPEND=media-libs/libpng sys-libs/zlib
 DESCRIPTION=Framebuffer screenshot utility
 EAPI=5
 HOMEPAGE=http://hem.bredband.net/gmogmo/fbgrab/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng sys-libs/zlib
 SLOT=0
 SRC_URI=http://hem.bredband.net/gmogmo/fbgrab/fbgrab-1.0.tar.gz
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=61944f9a3e4ac38d45d3ee620ae413c2
+_md5_=c71db2c2ca27e5bf347ab6ef851b3c63
diff --git a/metadata/md5-cache/media-gfx/flam3-3.0.1 b/metadata/md5-cache/media-gfx/flam3-3.0.1
index bb1a5d228137..520c95c5bfcb 100644
--- a/metadata/md5-cache/media-gfx/flam3-3.0.1
+++ b/metadata/md5-cache/media-gfx/flam3-3.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libxml2 media-libs/libpng virtual/jpeg !<=x11-misc/electricsheep-2.6.8-r2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 media-libs/libpng virtual/jpeg !<=x11-misc/electricsheep-2.6.8-r2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tools and a library for creating flame fractal images
 EAPI=4
 HOMEPAGE=http://flam3.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libxml2 media-libs/libpng virtual/jpeg !<=x11-misc/electricsheep-2.6.8-r2
 SLOT=0
 SRC_URI=http://flam3.googlecode.com/files/flam3-3.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0f1a37d01452f6ea62932b854a3a83b6
diff --git a/metadata/md5-cache/media-gfx/flam3-9999 b/metadata/md5-cache/media-gfx/flam3-9999
index 9243336618a6..d3cf5889a8dc 100644
--- a/metadata/md5-cache/media-gfx/flam3-9999
+++ b/metadata/md5-cache/media-gfx/flam3-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure install preinst prepare unpack
-DEPEND=dev-libs/libxml2 virtual/jpeg media-libs/libpng !<=x11-misc/electricsheep-2.6.8-r2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=dev-libs/libxml2 virtual/jpeg media-libs/libpng !<=x11-misc/electricsheep-2.6.8-r2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=Tools and a library for creating fractal flames
 EAPI=2
 HOMEPAGE=http://flam3.com/
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 virtual/jpeg media-libs/libpng !<=x11-misc/electricsheep-2.6.8-r2
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ac7d210f927039967e6a884682effdfc
diff --git a/metadata/md5-cache/media-gfx/fontforge-20110222 b/metadata/md5-cache/media-gfx/fontforge-20110222
index 193b5c4251b4..c00e5d0339d6 100644
--- a/metadata/md5-cache/media-gfx/fontforge-20110222
+++ b/metadata/md5-cache/media-gfx/fontforge-20110222
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=postscript font editor and converter
 EAPI=3
 HOMEPAGE=http://fontforge.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=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* )
 SLOT=0
 SRC_URI=mirror://sourceforge/fontforge/fontforge_full-20110222.tar.bz2 doc? ( mirror://sourceforge/fontforge/fontforge_htdocs-20110221.tar.bz2 ) cjk? ( mirror://gentoo/cidmaps-20090121.tgz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=22cf47e950f261c5125de932597668f7
diff --git a/metadata/md5-cache/media-gfx/fontforge-20110222-r1 b/metadata/md5-cache/media-gfx/fontforge-20110222-r1
index 137ce1289541..5b7b13f1ed2a 100644
--- a/metadata/md5-cache/media-gfx/fontforge-20110222-r1
+++ b/metadata/md5-cache/media-gfx/fontforge-20110222-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=postscript font editor and converter
 EAPI=3
 HOMEPAGE=http://fontforge.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=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* )
 SLOT=0
 SRC_URI=mirror://sourceforge/fontforge/fontforge_full-20110222.tar.bz2 doc? ( mirror://sourceforge/fontforge/fontforge_htdocs-20110221.tar.bz2 ) cjk? ( mirror://gentoo/cidmaps-20090121.tgz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3f3173b38dec504d783bb2bd8ca5e2dd
diff --git a/metadata/md5-cache/media-gfx/freewrl-1.22.13-r1 b/metadata/md5-cache/media-gfx/freewrl-1.22.13-r1
index 7824f5161a33..d547dddfbd06 100644
--- a/metadata/md5-cache/media-gfx/freewrl-1.22.13-r1
+++ b/metadata/md5-cache/media-gfx/freewrl-1.22.13-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libX11 motif? ( x11-libs/motif ) !motif? ( x11-libs/libXaw ) media-libs/mesa glew? ( media-libs/glew ) virtual/opengl media-libs/libpng virtual/jpeg media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) dev-lang/spidermonkey virtual/pkgconfig java? ( >=virtual/jdk-1.4 ) nsplugin? ( net-misc/npapi-sdk ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libX11 motif? ( x11-libs/motif ) !motif? ( x11-libs/libXaw ) media-libs/mesa glew? ( media-libs/glew ) virtual/opengl media-libs/libpng virtual/jpeg media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) dev-lang/spidermonkey virtual/pkgconfig java? ( >=virtual/jdk-1.4 ) nsplugin? ( net-misc/npapi-sdk ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=VRML97 and X3D compliant browser, library, and web-browser plugin
 EAPI=4
 HOMEPAGE=http://freewrl.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libX11 motif? ( x11-libs/motif ) !motif? ( x11-libs/libXaw ) media-libs/mesa glew? ( media-libs/glew ) virtual/opengl media-libs/libpng virtual/jpeg media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) dev-lang/spidermonkey media-fonts/dejavu || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) app-arch/unzip java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/freewrl/freewrl-1.22.13.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=807dcb8eabab5d13aafb0369d857625d
diff --git a/metadata/md5-cache/media-gfx/freewrl-1.22.13-r2 b/metadata/md5-cache/media-gfx/freewrl-1.22.13-r2
index de846ce75e62..d82deba149cc 100644
--- a/metadata/md5-cache/media-gfx/freewrl-1.22.13-r2
+++ b/metadata/md5-cache/media-gfx/freewrl-1.22.13-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libX11 motif? ( x11-libs/motif ) !motif? ( x11-libs/libXaw ) media-libs/mesa glew? ( media-libs/glew ) virtual/opengl media-libs/libpng virtual/jpeg media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) dev-lang/spidermonkey:= virtual/pkgconfig java? ( >=virtual/jdk-1.4 ) nsplugin? ( net-misc/npapi-sdk ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libX11 motif? ( x11-libs/motif ) !motif? ( x11-libs/libXaw ) media-libs/mesa glew? ( media-libs/glew ) virtual/opengl media-libs/libpng virtual/jpeg media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) dev-lang/spidermonkey:= virtual/pkgconfig java? ( >=virtual/jdk-1.4 ) nsplugin? ( net-misc/npapi-sdk ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=VRML97 and X3D compliant browser, library, and web-browser plugin
 EAPI=5
 HOMEPAGE=http://freewrl.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libX11 motif? ( x11-libs/motif ) !motif? ( x11-libs/libXaw ) media-libs/mesa glew? ( media-libs/glew ) virtual/opengl media-libs/libpng virtual/jpeg media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) dev-lang/spidermonkey:= media-fonts/dejavu || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) app-arch/unzip java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/freewrl/freewrl-1.22.13.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a4bfd8f4455181902eb05ee3a49fa245
diff --git a/metadata/md5-cache/media-gfx/geeqie-1.0-r2 b/metadata/md5-cache/media-gfx/geeqie-1.0-r2
index a94f4a0ec55f..f3e727784c67 100644
--- a/metadata/md5-cache/media-gfx/geeqie-1.0-r2
+++ b/metadata/md5-cache/media-gfx/geeqie-1.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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 ) ) virtual/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) ) virtual/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A lightweight GTK image viewer forked from GQview
 EAPI=4
 HOMEPAGE=http://geeqie.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/geeqie/geeqie-1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b4dd87ba3c66f841b4c026b1ab659cb7
diff --git a/metadata/md5-cache/media-gfx/geeqie-1.0-r4 b/metadata/md5-cache/media-gfx/geeqie-1.0-r4
index 95bdae774ef2..eaf99d42bfc4 100644
--- a/metadata/md5-cache/media-gfx/geeqie-1.0-r4
+++ b/metadata/md5-cache/media-gfx/geeqie-1.0-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=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 ) ) virtual/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) ) virtual/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A lightweight GTK image viewer forked from GQview
 EAPI=4
 HOMEPAGE=http://geeqie.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/geeqie/geeqie-1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=59c0ee57757548dce69ffd17c1589e21
diff --git a/metadata/md5-cache/media-gfx/geeqie-1.1 b/metadata/md5-cache/media-gfx/geeqie-1.1
index edbf6b4b49e9..9138ad99acd4 100644
--- a/metadata/md5-cache/media-gfx/geeqie-1.1
+++ b/metadata/md5-cache/media-gfx/geeqie-1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=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 ) ) virtual/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) ) virtual/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A lightweight GTK image viewer forked from GQview
 EAPI=4
 HOMEPAGE=http://geeqie.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/geeqie/geeqie-1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a8bf71be9cd3aab1dcc9d6bfe6f8e14d
diff --git a/metadata/md5-cache/media-gfx/gimmage-0.2.3 b/metadata/md5-cache/media-gfx/gimmage-0.2.3
index 8bbcf4a3ceb8..cff193926c2e 100644
--- a/metadata/md5-cache/media-gfx/gimmage-0.2.3
+++ b/metadata/md5-cache/media-gfx/gimmage-0.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-cpp/cairomm >=dev-cpp/gtkmm-2.6.2:2.4 net-misc/curl sys-apps/file sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-cpp/cairomm >=dev-cpp/gtkmm-2.6.2:2.4 net-misc/curl sys-apps/file sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A slim GTK-based image browser
 EAPI=2
 HOMEPAGE=http://gimmage.berlios.de/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/cairomm >=dev-cpp/gtkmm-2.6.2:2.4 net-misc/curl sys-apps/file
 SLOT=0
 SRC_URI=mirror://berlios/gimmage/gimmage-0.2.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e6ee41aab24d8ed14106352bccc6e5d4
diff --git a/metadata/md5-cache/media-gfx/gimp-2.8.2 b/metadata/md5-cache/media-gfx/gimp-2.8.2
index 8e67a8b43764..690c4c73c782 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.8.2
+++ b/metadata/md5-cache/media-gfx/gimp-2.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1: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-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0 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.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/udev[gudev] ) sys-apps/findutils virtual/pkgconfig >=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.12:1.12 ) >=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* ) )
+DEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1: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-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0 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.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/udev[gudev] ) sys-apps/findutils virtual/pkgconfig >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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* ) )
 DESCRIPTION=GNU Image Manipulation Program
 EAPI=3
 HOMEPAGE=http://www.gimp.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1: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-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0 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.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/udev[gudev] ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=2
 SRC_URI=mirror://gimp/v2.8/gimp-2.8.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5fe9bcd0d3b546df261e97e58fbf0c18
diff --git a/metadata/md5-cache/media-gfx/gimp-2.8.2-r1 b/metadata/md5-cache/media-gfx/gimp-2.8.2-r1
index 3e2081e68dae..2948427cba59 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.8.2-r1
+++ b/metadata/md5-cache/media-gfx/gimp-2.8.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1: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-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0 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.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/udev[gudev] ) sys-apps/findutils virtual/pkgconfig >=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.12:1.12 ) >=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* ) )
+DEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1: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-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0 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.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/udev[gudev] ) sys-apps/findutils virtual/pkgconfig >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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* ) )
 DESCRIPTION=GNU Image Manipulation Program
 EAPI=3
 HOMEPAGE=http://www.gimp.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1: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-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0 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.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/udev[gudev] ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=2
 SRC_URI=mirror://gimp/v2.8/gimp-2.8.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0e88eb79c425e470a6f7253459dab223
diff --git a/metadata/md5-cache/media-gfx/gimp-2.8.4 b/metadata/md5-cache/media-gfx/gimp-2.8.4
index 864875cd7592..da08a27dd59f 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.8.4
+++ b/metadata/md5-cache/media-gfx/gimp-2.8.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1: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-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0 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.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/udev[gudev] ) sys-apps/findutils virtual/pkgconfig >=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.12:1.12 ) >=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* ) )
+DEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1: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-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0 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.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/udev[gudev] ) sys-apps/findutils virtual/pkgconfig >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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* ) )
 DESCRIPTION=GNU Image Manipulation Program
 EAPI=3
 HOMEPAGE=http://www.gimp.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1: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-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0 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.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/udev[gudev] ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=2
 SRC_URI=mirror://gimp/v2.8/gimp-2.8.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=beb8dd0bd7d4906546faa959b0fcd4d0
diff --git a/metadata/md5-cache/media-gfx/gliv-1.9.6 b/metadata/md5-cache/media-gfx/gliv-1.9.6
index d8bc4d5f9216..766e51979ca6 100644
--- a/metadata/md5-cache/media-gfx/gliv-1.9.6
+++ b/metadata/md5-cache/media-gfx/gliv-1.9.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/gtk+-2.6:2 virtual/opengl >x11-libs/gtkglext-1.0.6 nls? ( sys-devel/gettext ) virtual/pkgconfig >=sys-devel/bison-1.875 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.6:2 virtual/opengl >x11-libs/gtkglext-1.0.6 nls? ( sys-devel/gettext ) virtual/pkgconfig >=sys-devel/bison-1.875 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An image viewer that uses OpenGL
 EAPI=2
 HOMEPAGE=http://guichaz.free.fr/gliv/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.6:2 virtual/opengl >x11-libs/gtkglext-1.0.6 nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=http://guichaz.free.fr/gliv/files/gliv-1.9.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fa0f49e4c71e60c0f65683f39c0a4548
diff --git a/metadata/md5-cache/media-gfx/gliv-1.9.7 b/metadata/md5-cache/media-gfx/gliv-1.9.7
index 40822342b950..485e79b6b6cf 100644
--- a/metadata/md5-cache/media-gfx/gliv-1.9.7
+++ b/metadata/md5-cache/media-gfx/gliv-1.9.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=x11-libs/gtk+-2.6:2 virtual/opengl >x11-libs/gtkglext-1.0.6 virtual/pkgconfig >=sys-devel/bison-1.875 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.6:2 virtual/opengl >x11-libs/gtkglext-1.0.6 virtual/pkgconfig >=sys-devel/bison-1.875 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An image viewer that uses OpenGL
 EAPI=4
 HOMEPAGE=http://guichaz.free.fr/gliv/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.6:2 virtual/opengl >x11-libs/gtkglext-1.0.6
 SLOT=0
 SRC_URI=http://guichaz.free.fr/gliv/files/gliv-1.9.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=29a8a6df05514a2f5b1830159cd9f00c
diff --git a/metadata/md5-cache/media-gfx/gozer-0.7-r2 b/metadata/md5-cache/media-gfx/gozer-0.7-r2
index 4e78370815a1..2862d783f3a9 100644
--- a/metadata/md5-cache/media-gfx/gozer-0.7-r2
+++ b/metadata/md5-cache/media-gfx/gozer-0.7-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libXext >=media-libs/giblib-1.2.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libXext >=media-libs/giblib-1.2.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=tool for rendering arbitrary text as graphics, using ttfs and styles
 EAPI=2
 HOMEPAGE=http://www.linuxbrit.co.uk/gozer/
@@ -8,5 +8,5 @@ LICENSE=feh LGPL-2+
 RDEPEND=>=media-libs/giblib-1.2.1 media-libs/imlib2
 SLOT=0
 SRC_URI=http://www.linuxbrit.co.uk/downloads/gozer-0.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=c8932c616b9e38a2556565f69bf5579f
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.26.3-r3 b/metadata/md5-cache/media-gfx/graphviz-2.26.3-r3
index 330ae423499c..0f1b2ea6daf5 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.26.3-r3
+++ b/metadata/md5-cache/media-gfx/graphviz-2.26.3-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=>=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,zlib] >=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 ) virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=>=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,zlib] >=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 ) virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Open Source Graph Visualization Software
 EAPI=3
 HOMEPAGE=http://www.graphviz.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/expat-2.0.0 >=dev-libs/glib-2.11.1 >=media-libs/fontconfig-2.
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.26.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=469cb8d22a3b46831eacf134981b5558
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.26.3-r4 b/metadata/md5-cache/media-gfx/graphviz-2.26.3-r4
index 1255a5ab82bb..5fcbeef926bc 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.26.3-r4
+++ b/metadata/md5-cache/media-gfx/graphviz-2.26.3-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=>=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,zlib] >=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 ) virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=>=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,zlib] >=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 ) virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Open Source Graph Visualization Software
 EAPI=3
 HOMEPAGE=http://www.graphviz.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/expat-2.0.0 >=dev-libs/glib-2.11.1 >=media-libs/fontconfig-2.
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.26.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=198b2b61a665bdbf2b23d7fd1e9ff03f
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.28.0 b/metadata/md5-cache/media-gfx/graphviz-2.28.0
index 6c5107f3fd9f..94770893a20e 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.28.0
+++ b/metadata/md5-cache/media-gfx/graphviz-2.28.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/zlib >=dev-libs/expat-2 >=dev-libs/glib-2.11.1 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0 !<=sci-chemistry/cluster-1.3.081231 virtual/jpeg virtual/libiconv X? ( x11-libs/libXaw x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) cairo? ( >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10[svg] ) devil? ( media-libs/devil[png,jpeg] ) postscript? ( app-text/ghostscript-gpl ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) ruby? ( dev-lang/ruby ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3 ) virtual/pkgconfig sys-devel/flex java? ( dev-lang/swig ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) python? ( dev-lang/swig python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib >=dev-libs/expat-2 >=dev-libs/glib-2.11.1 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0 !<=sci-chemistry/cluster-1.3.081231 virtual/jpeg virtual/libiconv X? ( x11-libs/libXaw x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) cairo? ( >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10[svg] ) devil? ( media-libs/devil[png,jpeg] ) postscript? ( app-text/ghostscript-gpl ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) ruby? ( dev-lang/ruby ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3 ) virtual/pkgconfig sys-devel/flex java? ( dev-lang/swig ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) python? ( dev-lang/swig python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open Source Graph Visualization Software
 EAPI=5
 HOMEPAGE=http://www.graphviz.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.28.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6cba2e1ac4d2d3b7c4e09ab076fbe345
diff --git a/metadata/md5-cache/media-gfx/gthumb-3.2.0 b/metadata/md5-cache/media-gfx/gthumb-3.2.0
index f4968dbc7bbc..a2b50ee629d2 100644
--- a/metadata/md5-cache/media-gfx/gthumb-3.2.0
+++ b/metadata/md5-cache/media-gfx/gthumb-3.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.34.0:2 >=x11-libs/gtk+-3.4.0:3 media-libs/libpng:0= sys-libs/zlib x11-libs/libICE x11-libs/libSM cdr? ( >=app-cdr/brasero-3.2 ) exif? ( >=media-gfx/exiv2-0.21:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) http? ( || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.36:2.4 ) ) jpeg? ( virtual/jpeg:0= ) json? ( >=dev-libs/json-glib-0.15.0 ) libsecret? ( >=app-crypt/libsecret-0.11 ) slideshow? ( >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-1:1.0 ) svg? ( >=gnome-base/librsvg-2.34 ) tiff? ( media-libs/tiff:= ) raw? ( >=media-libs/libopenraw-0.0.8:= ) !raw? ( media-gfx/dcraw ) webkit? ( >=net-libs/webkit-gtk-1.10.0:3 ) webp? ( >=media-libs/libwebp-0.2.0 ) app-text/yelp-tools app-text/scrollkeeper >=dev-util/intltool-0.35 sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( ~app-text/docbook-xml-dtd-4.1.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.34.0:2 >=x11-libs/gtk+-3.4.0:3 media-libs/libpng:0= sys-libs/zlib x11-libs/libICE x11-libs/libSM cdr? ( >=app-cdr/brasero-3.2 ) exif? ( >=media-gfx/exiv2-0.21:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) http? ( || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.36:2.4 ) ) jpeg? ( virtual/jpeg:0= ) json? ( >=dev-libs/json-glib-0.15.0 ) libsecret? ( >=app-crypt/libsecret-0.11 ) slideshow? ( >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-1:1.0 ) svg? ( >=gnome-base/librsvg-2.34 ) tiff? ( media-libs/tiff:= ) raw? ( >=media-libs/libopenraw-0.0.8:= ) !raw? ( media-gfx/dcraw ) webkit? ( >=net-libs/webkit-gtk-1.10.0:3 ) webp? ( >=media-libs/libwebp-0.2.0 ) app-text/yelp-tools app-text/scrollkeeper >=dev-util/intltool-0.35 sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( ~app-text/docbook-xml-dtd-4.1.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Image viewer and browser for Gnome
 EAPI=5
 HOMEPAGE=https://live.gnome.org/gthumb
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.34.0:2 >=x11-libs/gtk+-3.4.0:3 media-libs/libpng:0= sys-libs/zlib x11-libs/libICE x11-libs/libSM cdr? ( >=app-cdr/brasero-3.2 ) exif? ( >=media-gfx/exiv2-0.21:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) http? ( || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.36:2.4 ) ) jpeg? ( virtual/jpeg:0= ) json? ( >=dev-libs/json-glib-0.15.0 ) libsecret? ( >=app-crypt/libsecret-0.11 ) slideshow? ( >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-1:1.0 ) svg? ( >=gnome-base/librsvg-2.34 ) tiff? ( media-libs/tiff:= ) raw? ( >=media-libs/libopenraw-0.0.8:= ) !raw? ( media-gfx/dcraw ) webkit? ( >=net-libs/webkit-gtk-1.10.0:3 ) webp? ( >=media-libs/libwebp-0.2.0 ) >=gnome-base/gsettings-desktop-schemas-0.1.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/gthumb/3.2/gthumb-3.2.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=250a303b15857209b2c84dec5e8642d8
diff --git a/metadata/md5-cache/media-gfx/gtkimageview-1.6.4 b/metadata/md5-cache/media-gfx/gtkimageview-1.6.4
index 0aaa1e8bfc6d..3de497b71a32 100644
--- a/metadata/md5-cache/media-gfx/gtkimageview-1.6.4
+++ b/metadata/md5-cache/media-gfx/gtkimageview-1.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=x11-libs/gtk+:2 gnome-base/gnome-common dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.8 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=x11-libs/gtk+:2 gnome-base/gnome-common dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.8 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A simple image viewer widget for GTK
 EAPI=4
 HOMEPAGE=http://trac.bjourne.webfactional.com/wiki/
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/gtkimageview-1.6.4.tar.gz?format=raw -> gtkimageview-1.6.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=40e6da3d06cb6c0cba8af21608b36df7
diff --git a/metadata/md5-cache/media-gfx/icoutils-0.29.1-r2 b/metadata/md5-cache/media-gfx/icoutils-0.29.1-r2
index 546166a1c77b..fa52f88ab43d 100644
--- a/metadata/md5-cache/media-gfx/icoutils-0.29.1-r2
+++ b/metadata/md5-cache/media-gfx/icoutils-0.29.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A set of programs for extracting and converting images in icon and cursor files (.ico, .cur)
 EAPI=2
 HOMEPAGE=http://www.nongnu.org/icoutils/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng nls? ( virtual/libintl ) >=dev-lang/perl-5.6 >=dev-perl/libwww-perl-5.64
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/icoutils/icoutils-0.29.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b3fec0c28c1aadfa822392b9c50a047b
diff --git a/metadata/md5-cache/media-gfx/icoutils-0.30.0 b/metadata/md5-cache/media-gfx/icoutils-0.30.0
index 58f32cc70bb0..9f84a861d9fa 100644
--- a/metadata/md5-cache/media-gfx/icoutils-0.30.0
+++ b/metadata/md5-cache/media-gfx/icoutils-0.30.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-lang/perl-5.6 >=dev-perl/libwww-perl-5.64 media-libs/libpng:0 sys-libs/zlib nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-lang/perl-5.6 >=dev-perl/libwww-perl-5.64 media-libs/libpng:0 sys-libs/zlib nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A set of programs for extracting and converting images in icon and cursor files (.ico, .cur)
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/icoutils/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.6 >=dev-perl/libwww-perl-5.64 media-libs/libpng:0 sys-libs/zlib nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://nongnu/icoutils/icoutils-0.30.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=752f9d78e99b862a7b66414a75d6a31c
diff --git a/metadata/md5-cache/media-gfx/imageworsener-0.9.8 b/metadata/md5-cache/media-gfx/imageworsener-0.9.8
index fb2c067bdc22..57ded8fc8f5e 100644
--- a/metadata/md5-cache/media-gfx/imageworsener-0.9.8
+++ b/metadata/md5-cache/media-gfx/imageworsener-0.9.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) webp? ( >=media-libs/libwebp-0.1.3 ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) webp? ( >=media-libs/libwebp-0.1.3 ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utility for image scaling and processing
 EAPI=4
 HOMEPAGE=http://entropymine.com/imageworsener/
@@ -10,5 +10,5 @@ RDEPEND=png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) webp? ( >=media-libs
 REQUIRED_USE=test? ( jpeg png webp zlib )
 SLOT=0
 SRC_URI=http://entropymine.com/imageworsener/imageworsener-src-0.9.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b92840ca59caf4767466fef61cc4036f
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.48.4 b/metadata/md5-cache/media-gfx/inkscape-0.48.4
index 7bd3e47387fb..9afb0d51156d 100644
--- a/metadata/md5-cache/media-gfx/inkscape-0.48.4
+++ b/metadata/md5-cache/media-gfx/inkscape-0.48.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 virtual/pkgconfig >=dev-util/intltool-0.29 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2* =dev-lang/python-2*[xml]
+DEPEND=>=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 virtual/pkgconfig >=dev-util/intltool-0.29 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2* =dev-lang/python-2*[xml]
 DESCRIPTION=A SVG based generic vector-drawing program
 EAPI=5
 HOMEPAGE=http://www.inkscape.org/
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/poppler-0.12.3-r3[cairo,xpdf-headers(+)] dev-cpp/glibmm >=dev
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/inkscape/inkscape-0.48.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5264c0fbfded6671a9efa72f275fc3cb
diff --git a/metadata/md5-cache/media-gfx/iscan-2.26.2 b/metadata/md5-cache/media-gfx/iscan-2.26.2
index 5f90c7c2d491..1e2fc1ce22af 100644
--- a/metadata/md5-cache/media-gfx/iscan-2.26.2
+++ b/metadata/md5-cache/media-gfx/iscan-2.26.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=media-gfx/iscan-data media-gfx/sane-backends virtual/udev virtual/libusb:0 X? ( x11-libs/gtk+:2 gimp? ( media-gfx/gimp ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff ) ) virtual/pkgconfig X? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-gfx/iscan-data media-gfx/sane-backends virtual/udev virtual/libusb:0 X? ( x11-libs/gtk+:2 gimp? ( media-gfx/gimp ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff ) ) virtual/pkgconfig X? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=EPSON Image Scan! for Linux (including sane-epkowa backend)
 EAPI=2
 HOMEPAGE=http://www.avasys.jp/english/linux_e/dl_scan.html
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/iscan-data media-gfx/sane-backends virtual/udev virtual/libusb
 RESTRICT=test
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fd70aea6338ecead0edc682502f05f3c
diff --git a/metadata/md5-cache/media-gfx/iscan-2.28.1.3 b/metadata/md5-cache/media-gfx/iscan-2.28.1.3
index 07a193290a6c..3577eb60da9a 100644
--- a/metadata/md5-cache/media-gfx/iscan-2.28.1.3
+++ b/metadata/md5-cache/media-gfx/iscan-2.28.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=media-gfx/iscan-data media-gfx/sane-backends virtual/udev virtual/libusb:0 X? ( x11-libs/gtk+:2 gimp? ( media-gfx/gimp ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff ) ) virtual/pkgconfig X? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-gfx/iscan-data media-gfx/sane-backends virtual/udev virtual/libusb:0 X? ( x11-libs/gtk+:2 gimp? ( media-gfx/gimp ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff ) ) virtual/pkgconfig X? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=EPSON Image Scan! for Linux (including sane-epkowa backend)
 EAPI=4
 HOMEPAGE=http://www.avasys.jp/english/linux_e/dl_scan.html
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/iscan-data media-gfx/sane-backends virtual/udev virtual/libusb
 RESTRICT=test
 SLOT=0
 SRC_URI=http://linux.avasys.jp/drivers/iscan/2.28.1/iscan_2.28.1-3.tar.gz doc? ( http://linux.avasys.jp/drivers/iscan/doc/userg_revL_e.pdf )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=859285650ed8c081cdbf2a125a14f212
diff --git a/metadata/md5-cache/media-gfx/iscan-2.29.1.5 b/metadata/md5-cache/media-gfx/iscan-2.29.1.5
index 9a17ec6fa329..2e950e048add 100644
--- a/metadata/md5-cache/media-gfx/iscan-2.29.1.5
+++ b/metadata/md5-cache/media-gfx/iscan-2.29.1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=media-gfx/iscan-data media-gfx/sane-backends virtual/udev virtual/libusb:0 X? ( x11-libs/gtk+:2 gimp? ( media-gfx/gimp ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff ) ) virtual/pkgconfig X? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-gfx/iscan-data media-gfx/sane-backends virtual/udev virtual/libusb:0 X? ( x11-libs/gtk+:2 gimp? ( media-gfx/gimp ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff ) ) virtual/pkgconfig X? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=EPSON Image Scan! for Linux (including sane-epkowa backend)
 EAPI=4
 HOMEPAGE=http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/iscan-data media-gfx/sane-backends virtual/udev virtual/libusb
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~flameeyes/avasys/iscan_2.29.1-5.tar.gz doc? ( http://dev.gentoo.org/~flameeyes/avasys/userg_revQ_e.pdf linguas_ja? ( http://dev.gentoo.org/~flameeyes/avasys/userg_revQ_j.pdf ) )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9dcec924ed52d203201f7095efd015ec
diff --git a/metadata/md5-cache/media-gfx/mscgen-0.18 b/metadata/md5-cache/media-gfx/mscgen-0.18
index 743bc41aecaa..84882369f5dc 100644
--- a/metadata/md5-cache/media-gfx/mscgen-0.18
+++ b/metadata/md5-cache/media-gfx/mscgen-0.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=png? ( media-libs/gd[png,truetype?] ) virtual/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=png? ( media-libs/gd[png,truetype?] ) virtual/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A message sequence chart generator
 EAPI=2
 HOMEPAGE=http://www.mcternan.me.uk/mscgen/
@@ -10,5 +10,5 @@ RDEPEND=png? ( media-libs/gd[png,truetype?] )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mcternan.me.uk/mscgen/software/mscgen-src-0.18.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6a028fad17eec51c70b479d00a308042
diff --git a/metadata/md5-cache/media-gfx/mscgen-0.20 b/metadata/md5-cache/media-gfx/mscgen-0.20
index c184e541f5a6..5013b9cb11a8 100644
--- a/metadata/md5-cache/media-gfx/mscgen-0.20
+++ b/metadata/md5-cache/media-gfx/mscgen-0.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=png? ( media-libs/gd[png,truetype?] ) virtual/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=png? ( media-libs/gd[png,truetype?] ) virtual/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A message sequence chart generator
 EAPI=4
 HOMEPAGE=http://www.mcternan.me.uk/mscgen/
@@ -10,5 +10,5 @@ RDEPEND=png? ( media-libs/gd[png,truetype?] )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mcternan.me.uk/mscgen/software/mscgen-src-0.20.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=0d1feecf51b3be2c66e8b001f165882f
diff --git a/metadata/md5-cache/media-gfx/nip2-7.26.3 b/metadata/md5-cache/media-gfx/nip2-7.26.3
index d6f8d69d94db..8db4c373594c 100644
--- a/metadata/md5-cache/media-gfx/nip2-7.26.3
+++ b/metadata/md5-cache/media-gfx/nip2-7.26.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare test
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=VIPS Image Processing Graphical User Interface
 EAPI=2
 HOMEPAGE=http://vips.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://www.vips.ecs.soton.ac.uk/supported/7.26/nip2-7.26.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ceb56e218220325d5a977c9d27945aba
diff --git a/metadata/md5-cache/media-gfx/nip2-7.26.4 b/metadata/md5-cache/media-gfx/nip2-7.26.4
index cc11279118a3..5853c329b076 100644
--- a/metadata/md5-cache/media-gfx/nip2-7.26.4
+++ b/metadata/md5-cache/media-gfx/nip2-7.26.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare test
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=VIPS Image Processing Graphical User Interface
 EAPI=2
 HOMEPAGE=http://vips.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://www.vips.ecs.soton.ac.uk/supported/7.26/nip2-7.26.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0e76a1753eb46b31998d705ebee865bd
diff --git a/metadata/md5-cache/media-gfx/openexr_viewers-1.0.2 b/metadata/md5-cache/media-gfx/openexr_viewers-1.0.2
index 84d6cdd685c4..aa43aba0af5d 100644
--- a/metadata/md5-cache/media-gfx/openexr_viewers-1.0.2
+++ b/metadata/md5-cache/media-gfx/openexr_viewers-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenEXR Viewers
 EAPI=2
 HOMEPAGE=http://openexr.com/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=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
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/openexr/openexr_viewers-1.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e0399cfa66ee824313824a032012fa85
diff --git a/metadata/md5-cache/media-gfx/openexr_viewers-2.0.0 b/metadata/md5-cache/media-gfx/openexr_viewers-2.0.0
index 17a031ed64af..773487507d29 100644
--- a/metadata/md5-cache/media-gfx/openexr_viewers-2.0.0
+++ b/metadata/md5-cache/media-gfx/openexr_viewers-2.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/ilmbase-2.0.0:= >=media-libs/openexr-2.0.0:= media-libs/ctl:= media-libs/openexr_ctl:= opengl? ( virtual/opengl x11-libs/fltk:1[opengl] cg? ( media-gfx/nvidia-cg-toolkit ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/ilmbase-2.0.0:= >=media-libs/openexr-2.0.0:= media-libs/ctl:= media-libs/openexr_ctl:= opengl? ( virtual/opengl x11-libs/fltk:1[opengl] cg? ( media-gfx/nvidia-cg-toolkit ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenEXR Viewers
 EAPI=5
 HOMEPAGE=http://openexr.com/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=media-libs/ilmbase-2.0.0:= >=media-libs/openexr-2.0.0:= media-libs/ctl:= media-libs/openexr_ctl:= opengl? ( virtual/opengl x11-libs/fltk:1[opengl] cg? ( media-gfx/nvidia-cg-toolkit ) )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ssuominen/openexr-2.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e1f46b8c4ee1aa9e45e79c18fd12758d
diff --git a/metadata/md5-cache/media-gfx/photoprint-0.4.2_pre2 b/metadata/md5-cache/media-gfx/photoprint-0.4.2_pre2
index fd6b6aeb1414..8c715a13f1a6 100644
--- a/metadata/md5-cache/media-gfx/photoprint-0.4.2_pre2
+++ b/metadata/md5-cache/media-gfx/photoprint-0.4.2_pre2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A utility for printing digital photographs
 EAPI=4
 HOMEPAGE=http://www.blackfiveimaging.co.uk/index.php?article=02Software%2F01PhotoPrint
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=http://www.blackfiveimaging.co.uk/photoprint/photoprint-0.4.2-pre2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7db3c088f08e96796e659558da045bcb
diff --git a/metadata/md5-cache/media-gfx/pinta-9999 b/metadata/md5-cache/media-gfx/pinta-9999
index fe0292c6fee9..4762c36dfcd2 100644
--- a/metadata/md5-cache/media-gfx/pinta-9999
+++ b/metadata/md5-cache/media-gfx/pinta-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=postinst postrm preinst prepare unpack
-DEPEND=dev-dotnet/atk-sharp:2 dev-dotnet/gdk-sharp:2 dev-dotnet/glib-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/pango-sharp:2 dev-lang/mono dev-util/intltool virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 dev-vcs/git
+DEPEND=dev-dotnet/atk-sharp:2 dev-dotnet/gdk-sharp:2 dev-dotnet/glib-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/pango-sharp:2 dev-lang/mono dev-util/intltool virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 dev-vcs/git
 DESCRIPTION=Simple Painting for Gtk
 EAPI=5
 HOMEPAGE=http://pinta-project.com
 LICENSE=MIT CC-BY-3.0
 RDEPEND=dev-dotnet/atk-sharp:2 dev-dotnet/gdk-sharp:2 dev-dotnet/glib-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/pango-sharp:2 dev-lang/mono x11-libs/cairo[X] x11-libs/gdk-pixbuf[X,jpeg,tiff] x11-themes/gnome-icon-theme
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=f055a5b49dadb1b0d5053046f7299f11
diff --git a/metadata/md5-cache/media-gfx/pixels2pgf-0.1 b/metadata/md5-cache/media-gfx/pixels2pgf-0.1
index 6f52d0079d99..53d03b93a3cd 100644
--- a/metadata/md5-cache/media-gfx/pixels2pgf-0.1
+++ b/metadata/md5-cache/media-gfx/pixels2pgf-0.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=media-libs/libsdl media-libs/sdl-image
 SLOT=0
 SRC_URI=mirror://github/mgorny/pixels2pgf/pixels2pgf-0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=40ed6ee35e0117dfcdb0b0dce5764b3f
diff --git a/metadata/md5-cache/media-gfx/pixels2pgf-9999 b/metadata/md5-cache/media-gfx/pixels2pgf-9999
index cc1198ef72fb..a63e0dc9ba39 100644
--- a/metadata/md5-cache/media-gfx/pixels2pgf-9999
+++ b/metadata/md5-cache/media-gfx/pixels2pgf-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-libs/libsdl media-libs/sdl-image dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl media-libs/sdl-image dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Convert pixel images (e.g. QRCode) to PGF/Tikz rectangles
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/pixels2pgf/
 LICENSE=BSD
 RDEPEND=media-libs/libsdl media-libs/sdl-image
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ee11b4f3be492830f802737d6b049f03
diff --git a/metadata/md5-cache/media-gfx/pixie-2.2.6-r1 b/metadata/md5-cache/media-gfx/pixie-2.2.6-r1
index 1e9719fabd68..efe42d17a4ac 100644
--- a/metadata/md5-cache/media-gfx/pixie-2.2.6-r1
+++ b/metadata/md5-cache/media-gfx/pixie-2.2.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg media-libs/tiff media-libs/libpng x11-libs/fltk:1[opengl] media-libs/openexr virtual/opengl sys-libs/zlib X? ( x11-libs/libXext x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdmcp x11-libs/libXi x11-libs/libXmu x11-libs/libXt )
 SLOT=0
 SRC_URI=mirror://sourceforge/pixie/Pixie-src-2.2.6.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b7463c06791809a28a587bcb5d06a803
diff --git a/metadata/md5-cache/media-gfx/pngnq-1.1 b/metadata/md5-cache/media-gfx/pngnq-1.1
index c63534eb4c05..522762a2ef81 100644
--- a/metadata/md5-cache/media-gfx/pngnq-1.1
+++ b/metadata/md5-cache/media-gfx/pngnq-1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=media-libs/libpng:0= || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libpng:0= || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Pngnq is a tool for quantizing PNG images in RGBA format.
 EAPI=5
 HOMEPAGE=http://pngnq.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=BSD pngnq rwpng
 RDEPEND=media-libs/libpng:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/pngnq/pngnq-1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6c6b9a7dee31fd122030225f963ab50f
diff --git a/metadata/md5-cache/media-gfx/pngtools-0.4-r2 b/metadata/md5-cache/media-gfx/pngtools-0.4-r2
index 5da5f4d405e0..e7dee81778dd 100644
--- a/metadata/md5-cache/media-gfx/pngtools-0.4-r2
+++ b/metadata/md5-cache/media-gfx/pngtools-0.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=media-libs/libpng-1.4:0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libpng-1.4:0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A series of tools for the PNG image format
 EAPI=4
 HOMEPAGE=http://www.stillhq.com/pngtools/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.4:0
 SLOT=0
 SRC_URI=http://www.stillhq.com/pngtools/source/pngtools_0_4.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c3416468eabca5523291737f078e61c7
diff --git a/metadata/md5-cache/media-gfx/potrace-1.10-r1 b/metadata/md5-cache/media-gfx/potrace-1.10-r1
index 2cf02cc60481..c831b026ebf6 100644
--- a/metadata/md5-cache/media-gfx/potrace-1.10-r1
+++ b/metadata/md5-cache/media-gfx/potrace-1.10-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://potrace.sourceforge.net/download/potrace-1.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cb018ef313bc49c577e38b6178a17ea1
diff --git a/metadata/md5-cache/media-gfx/potrace-1.11 b/metadata/md5-cache/media-gfx/potrace-1.11
index 73026c357b03..645a9cd5ca81 100644
--- a/metadata/md5-cache/media-gfx/potrace-1.11
+++ b/metadata/md5-cache/media-gfx/potrace-1.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://potrace.sourceforge.net/download/potrace-1.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=83fc240be2589f036b5ecf9ab108d922
diff --git a/metadata/md5-cache/media-gfx/povray-3.7.0_rc3 b/metadata/md5-cache/media-gfx/povray-3.7.0_rc3
index 60e4713f545f..1a5ce313a9c9 100644
--- a/metadata/md5-cache/media-gfx/povray-3.7.0_rc3
+++ b/metadata/md5-cache/media-gfx/povray-3.7.0_rc3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install preinst prepare test
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Persistence of Vision Raytracer
 EAPI=3
 HOMEPAGE=http://www.povray.org/
@@ -9,5 +9,5 @@ LICENSE=povlegal-3.6
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://www.povray.org/redirect/www.povray.org/beta/source/povray-3.7.0.RC3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eda5e99d74b836d97c777693f5671b75
diff --git a/metadata/md5-cache/media-gfx/povray-3.7.0_rc6 b/metadata/md5-cache/media-gfx/povray-3.7.0_rc6
index 5671dee1509a..144b647b9a22 100644
--- a/metadata/md5-cache/media-gfx/povray-3.7.0_rc6
+++ b/metadata/md5-cache/media-gfx/povray-3.7.0_rc6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure preinst prepare test
-DEPEND=>=dev-libs/boost-1.50.0[threads(+)] media-libs/libpng:0 sys-libs/zlib virtual/jpeg mkl? ( sci-libs/mkl ) openexr? ( media-libs/ilmbase media-libs/openexr ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libsdl ) sys-devel/boost-m4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/boost-1.50.0[threads(+)] media-libs/libpng:0 sys-libs/zlib virtual/jpeg mkl? ( sci-libs/mkl ) openexr? ( media-libs/ilmbase media-libs/openexr ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libsdl ) sys-devel/boost-m4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Persistence of Vision Raytracer
 EAPI=4
 HOMEPAGE=http://www.povray.org/
@@ -9,5 +9,5 @@ LICENSE=povlegal-3.6
 RDEPEND=>=dev-libs/boost-1.50.0[threads(+)] media-libs/libpng:0 sys-libs/zlib virtual/jpeg mkl? ( sci-libs/mkl ) openexr? ( media-libs/ilmbase media-libs/openexr ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libsdl )
 SLOT=0
 SRC_URI=http://www.povray.org/redirect/www.povray.org/beta/source/povray-3.7.0.RC6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9f9402ef7e6c9ce41a309d6199c7e571
diff --git a/metadata/md5-cache/media-gfx/povray-3.7.0_rc7 b/metadata/md5-cache/media-gfx/povray-3.7.0_rc7
index 2024aec317b0..867f1c354d7c 100644
--- a/metadata/md5-cache/media-gfx/povray-3.7.0_rc7
+++ b/metadata/md5-cache/media-gfx/povray-3.7.0_rc7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare test
-DEPEND=>=dev-libs/boost-1.50.0[threads(+)] media-libs/libpng:0 sys-libs/zlib virtual/jpeg mkl? ( sci-libs/mkl ) openexr? ( media-libs/ilmbase media-libs/openexr ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libsdl ) sys-devel/boost-m4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/boost-1.50.0[threads(+)] media-libs/libpng:0 sys-libs/zlib virtual/jpeg mkl? ( sci-libs/mkl ) openexr? ( media-libs/ilmbase media-libs/openexr ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libsdl ) sys-devel/boost-m4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=The Persistence of Vision Raytracer
 EAPI=5
 HOMEPAGE=http://www.povray.org/
@@ -9,5 +9,5 @@ LICENSE=povlegal-3.6
 RDEPEND=>=dev-libs/boost-1.50.0[threads(+)] media-libs/libpng:0 sys-libs/zlib virtual/jpeg mkl? ( sci-libs/mkl ) openexr? ( media-libs/ilmbase media-libs/openexr ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libsdl )
 SLOT=0
 SRC_URI=http://www.povray.org/redirect/www.povray.org/beta/source/povray-3.7.0.RC7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=28508d5902798463d9e78915eaeb849b
diff --git a/metadata/md5-cache/media-gfx/pstoedit-3.50 b/metadata/md5-cache/media-gfx/pstoedit-3.50
index 6169c303c32e..7a8986c2e5f9 100644
--- a/metadata/md5-cache/media-gfx/pstoedit-3.50
+++ b/metadata/md5-cache/media-gfx/pstoedit-3.50
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Translate PostScript and PDF graphics into other vector formats
 EAPI=2
 HOMEPAGE=http://www.pstoedit.net/pstoedit
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pstoedit/pstoedit-3.50.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e7158dd80b5e36824ddbff38c2c7ed7f
diff --git a/metadata/md5-cache/media-gfx/pstoedit-3.50-r1 b/metadata/md5-cache/media-gfx/pstoedit-3.50-r1
index 46bfe07ad5fa..8fe189da1bfe 100644
--- a/metadata/md5-cache/media-gfx/pstoedit-3.50-r1
+++ b/metadata/md5-cache/media-gfx/pstoedit-3.50-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Translate PostScript and PDF graphics into other vector formats
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/pstoedit/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pstoedit/pstoedit-3.50.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b9bf0403dc84ef9f40be5d5d43d14d66
diff --git a/metadata/md5-cache/media-gfx/pstoedit-3.60 b/metadata/md5-cache/media-gfx/pstoedit-3.60
index c2da8aeda52b..33e11aa0d38c 100644
--- a/metadata/md5-cache/media-gfx/pstoedit-3.60
+++ b/metadata/md5-cache/media-gfx/pstoedit-3.60
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Translate PostScript and PDF graphics into other vector formats
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/pstoedit/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pstoedit/pstoedit-3.60.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a4984d102a0f6d55bd472ca8568bad0c
diff --git a/metadata/md5-cache/media-gfx/pstoedit-3.61 b/metadata/md5-cache/media-gfx/pstoedit-3.61
index db98779d740a..13b9822841fa 100644
--- a/metadata/md5-cache/media-gfx/pstoedit-3.61
+++ b/metadata/md5-cache/media-gfx/pstoedit-3.61
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Translate PostScript and PDF graphics into other vector formats
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/pstoedit/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pstoedit/pstoedit-3.61.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3f0f561752bbb5985d7755abb4dee850
diff --git a/metadata/md5-cache/media-gfx/qrencode-3.1.1 b/metadata/md5-cache/media-gfx/qrencode-3.1.1
index 6a12e945ac4a..f46f447466db 100644
--- a/metadata/md5-cache/media-gfx/qrencode-3.1.1
+++ b/metadata/md5-cache/media-gfx/qrencode-3.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=media-libs/libpng virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libpng virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C library for encoding data in a QR Code symbol
 EAPI=2
 HOMEPAGE=http://fukuchi.org/works/qrencode/
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/libpng
 SLOT=0
 SRC_URI=http://fukuchi.org/works/qrencode/qrencode-3.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f17cc1cc3920f8a491eb5cefa151a24f
diff --git a/metadata/md5-cache/media-gfx/qrencode-3.2.0 b/metadata/md5-cache/media-gfx/qrencode-3.2.0
index 4b9c70e0df5f..524525b3f522 100644
--- a/metadata/md5-cache/media-gfx/qrencode-3.2.0
+++ b/metadata/md5-cache/media-gfx/qrencode-3.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libpng virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libpng virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C library for encoding data in a QR Code symbol
 EAPI=4
 HOMEPAGE=http://fukuchi.org/works/qrencode/
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/libpng
 SLOT=0
 SRC_URI=http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c028e8f8b4819373b638f7fa8c39a857
diff --git a/metadata/md5-cache/media-gfx/qrencode-3.3.0 b/metadata/md5-cache/media-gfx/qrencode-3.3.0
index 567badd6e18c..c2d93e75ba84 100644
--- a/metadata/md5-cache/media-gfx/qrencode-3.3.0
+++ b/metadata/md5-cache/media-gfx/qrencode-3.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libpng virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libpng virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C library for encoding data in a QR Code symbol
 EAPI=4
 HOMEPAGE=http://fukuchi.org/works/qrencode/
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/libpng
 SLOT=0
 SRC_URI=http://fukuchi.org/works/qrencode/qrencode-3.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8988d44c512b26bcb955d50dcb55da4b
diff --git a/metadata/md5-cache/media-gfx/qrencode-3.3.1 b/metadata/md5-cache/media-gfx/qrencode-3.3.1
index a0ab5ccf2eda..884e4fbc5862 100644
--- a/metadata/md5-cache/media-gfx/qrencode-3.3.1
+++ b/metadata/md5-cache/media-gfx/qrencode-3.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libpng virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libpng virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C library for encoding data in a QR Code symbol
 EAPI=4
 HOMEPAGE=http://fukuchi.org/works/qrencode/
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/libpng
 SLOT=0
 SRC_URI=http://fukuchi.org/works/qrencode/qrencode-3.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1ed73d1ee597c9c73f5a2b101f952779
diff --git a/metadata/md5-cache/media-gfx/qrencode-3.4.1 b/metadata/md5-cache/media-gfx/qrencode-3.4.1
index 8cfd6f656981..2319070d9fcf 100644
--- a/metadata/md5-cache/media-gfx/qrencode-3.4.1
+++ b/metadata/md5-cache/media-gfx/qrencode-3.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libpng virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libpng virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C library for encoding data in a QR Code symbol
 EAPI=4
 HOMEPAGE=http://fukuchi.org/works/qrencode/
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/libpng
 SLOT=0
 SRC_URI=http://fukuchi.org/works/qrencode/qrencode-3.4.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=14d4079774a2addf27c25cfe64f10752
diff --git a/metadata/md5-cache/media-gfx/qrencode-3.4.2 b/metadata/md5-cache/media-gfx/qrencode-3.4.2
index 7ec6821226ab..0008049c88e4 100644
--- a/metadata/md5-cache/media-gfx/qrencode-3.4.2
+++ b/metadata/md5-cache/media-gfx/qrencode-3.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libpng virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libpng virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C library for encoding data in a QR Code symbol
 EAPI=4
 HOMEPAGE=http://fukuchi.org/works/qrencode/
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/libpng
 SLOT=0
 SRC_URI=http://fukuchi.org/works/qrencode/qrencode-3.4.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e81d0679ccf8ef3f0ec25c41bc63e087
diff --git a/metadata/md5-cache/media-gfx/rawstudio-2.0 b/metadata/md5-cache/media-gfx/rawstudio-2.0
index 4d685eb5b3e9..b8633231eec4 100644
--- a/metadata/md5-cache/media-gfx/rawstudio-2.0
+++ b/metadata/md5-cache/media-gfx/rawstudio-2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A program for reading and manipulating raw images from digital cameras
 EAPI=4
 HOMEPAGE=http://rawstudio.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2 CC-BY-SA-3.0
 RDEPEND=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
 SLOT=0
 SRC_URI=http://rawstudio.org/files/release/rawstudio-2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7927c188e307235bea472a0c2073171a
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.6.3 b/metadata/md5-cache/media-gfx/ristretto-0.6.3
index bbe52de3b279..9d7b24e4871b 100644
--- a/metadata/md5-cache/media-gfx/ristretto-0.6.3
+++ b/metadata/md5-cache/media-gfx/ristretto-0.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.24 media-libs/libexif x11-libs/cairo >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/ristretto/0.6/ristretto-0.6.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=99361b946ce08338d43654bae31f4b1b
diff --git a/metadata/md5-cache/media-gfx/sam2p-0.47 b/metadata/md5-cache/media-gfx/sam2p-0.47
index 81a25e16f413..330a805a5d9e 100644
--- a/metadata/md5-cache/media-gfx/sam2p-0.47
+++ b/metadata/md5-cache/media-gfx/sam2p-0.47
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/perl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utility to convert raster images to EPS, PDF and many others
 EAPI=2
 HOMEPAGE=http://code.google.com/p/sam2p/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://sam2p.googlecode.com/files/sam2p-0.47.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ef55f2ba9bd35cd5e450ea7fedccca60
diff --git a/metadata/md5-cache/media-gfx/sam2p-0.48 b/metadata/md5-cache/media-gfx/sam2p-0.48
index 0ff8833f6605..547f578118f1 100644
--- a/metadata/md5-cache/media-gfx/sam2p-0.48
+++ b/metadata/md5-cache/media-gfx/sam2p-0.48
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/perl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utility to convert raster images to EPS, PDF and many others
 EAPI=2
 HOMEPAGE=http://code.google.com/p/sam2p/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://sam2p.googlecode.com/files/sam2p-0.48.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0b34295e5e0d354ebfc12f46550883a3
diff --git a/metadata/md5-cache/media-gfx/sam2p-0.49.1 b/metadata/md5-cache/media-gfx/sam2p-0.49.1
index 2721be390565..9500afe083ff 100644
--- a/metadata/md5-cache/media-gfx/sam2p-0.49.1
+++ b/metadata/md5-cache/media-gfx/sam2p-0.49.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/perl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utility to convert raster images to EPS, PDF and many others
 EAPI=4
 HOMEPAGE=http://code.google.com/p/sam2p/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://sam2p.googlecode.com/files/sam2p-0.49.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=151a2e35a2c9e67895785963090c1bd4
diff --git a/metadata/md5-cache/media-gfx/sfftobmp-3.1.2 b/metadata/md5-cache/media-gfx/sfftobmp-3.1.2
index 6c9ff1c50e3b..a79a4def6e8d 100644
--- a/metadata/md5-cache/media-gfx/sfftobmp-3.1.2
+++ b/metadata/md5-cache/media-gfx/sfftobmp-3.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/boost media-libs/tiff virtual/jpeg:0 app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/boost media-libs/tiff virtual/jpeg:0 app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=sff to bmp converter
 EAPI=2
 HOMEPAGE=http://sfftools.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=HPND MIT
 RDEPEND=dev-libs/boost media-libs/tiff virtual/jpeg:0
 SLOT=0
 SRC_URI=mirror://sourceforge/sfftools/sfftobmp3_1_2_src.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=53f4521f2067f2b5aeae6d26377226c4
diff --git a/metadata/md5-cache/media-gfx/sfftobmp-3.1.2-r1 b/metadata/md5-cache/media-gfx/sfftobmp-3.1.2-r1
index a3e22c3feb48..41dc4fefb898 100644
--- a/metadata/md5-cache/media-gfx/sfftobmp-3.1.2-r1
+++ b/metadata/md5-cache/media-gfx/sfftobmp-3.1.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=dev-libs/boost-1.49 media-libs/tiff:0 virtual/jpeg:0 app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/boost-1.49 media-libs/tiff:0 virtual/jpeg:0 app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=sff to bmp converter
 EAPI=5
 HOMEPAGE=http://sfftools.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=HPND MIT
 RDEPEND=>=dev-libs/boost-1.49 media-libs/tiff:0 virtual/jpeg:0
 SLOT=0
 SRC_URI=mirror://sourceforge/sfftools/sfftobmp3_1_2_src.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=98480c66b3956c34ec996e89a659111c
diff --git a/metadata/md5-cache/media-gfx/splashutils-1.5.4.4-r1 b/metadata/md5-cache/media-gfx/splashutils-1.5.4.4-r1
index b89ffcb77353..226853a92b5c 100644
--- a/metadata/md5-cache/media-gfx/splashutils-1.5.4.4-r1
+++ b/metadata/md5-cache/media-gfx/splashutils-1.5.4.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Framebuffer splash utilities.
 EAPI=2
 HOMEPAGE=http://fbsplash.berlios.de
@@ -10,5 +10,5 @@ RDEPEND=gpm? ( sys-libs/gpm ) truetype? ( >=media-libs/freetype-2[static-libs] |
 RESTRICT=test
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8ccba05f9ff30d52bd3d19cb9235887b
diff --git a/metadata/md5-cache/media-gfx/splashutils-1.5.4.4-r2 b/metadata/md5-cache/media-gfx/splashutils-1.5.4.4-r2
index 9729f1034d7c..75a448157390 100644
--- a/metadata/md5-cache/media-gfx/splashutils-1.5.4.4-r2
+++ b/metadata/md5-cache/media-gfx/splashutils-1.5.4.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=gpm? ( sys-libs/gpm[static-libs(+)] ) truetype? ( >=media-libs/freetype-2[static-libs] app-arch/bzip2[static-libs(+)] sys-libs/zlib[static-libs(+)] ) png? ( >=media-libs/libpng-1.4.3[static-libs] sys-libs/zlib[static-libs(+)] ) mng? ( media-libs/lcms:0[static-libs] media-libs/libmng[static-libs(+)] ) 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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gpm? ( sys-libs/gpm[static-libs(+)] ) truetype? ( >=media-libs/freetype-2[static-libs] app-arch/bzip2[static-libs(+)] sys-libs/zlib[static-libs(+)] ) png? ( >=media-libs/libpng-1.4.3[static-libs] sys-libs/zlib[static-libs(+)] ) mng? ( media-libs/lcms:0[static-libs] media-libs/libmng[static-libs(+)] ) 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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Framebuffer splash utilities.
 EAPI=4
 HOMEPAGE=http://fbsplash.berlios.de
@@ -10,5 +10,5 @@ RDEPEND=gpm? ( sys-libs/gpm[static-libs(+)] ) truetype? ( >=media-libs/freetype-
 RESTRICT=test
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5148c3a8702c557f49d35007a08dd636
diff --git a/metadata/md5-cache/media-gfx/tgif-4.2.5 b/metadata/md5-cache/media-gfx/tgif-4.2.5
index e54dc21c4dad..8ecb6b456879 100644
--- a/metadata/md5-cache/media-gfx/tgif-4.2.5
+++ b/metadata/md5-cache/media-gfx/tgif-4.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Xlib base 2-D drawing facility under X11
 EAPI=5
 HOMEPAGE=http://bourbon.usc.edu/tgif/index.html
@@ -8,5 +8,5 @@ LICENSE=QPL-1.0
 RDEPEND=sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-proto/xproto media-libs/netpbm
 SLOT=0
 SRC_URI=ftp://bourbon.usc.edu/pub/tgif/tgif-QPL-4.2.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7be37e15ab3a14ddadf702c099f8b8b4
diff --git a/metadata/md5-cache/media-gfx/tif22pnm-0.14 b/metadata/md5-cache/media-gfx/tif22pnm-0.14
index 4f77815bfd4b..615af3922e59 100644
--- a/metadata/md5-cache/media-gfx/tif22pnm-0.14
+++ b/metadata/md5-cache/media-gfx/tif22pnm-0.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=media-libs/libpng-1.2:0 media-libs/tiff:0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libpng-1.2:0 media-libs/tiff:0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=tif22pnm and png22pnm command-line converters
 EAPI=4
 HOMEPAGE=http://pts.szit.bme.hu/ http://code.google.com/p/sam2p/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2:0 media-libs/tiff:0
 SLOT=0
 SRC_URI=http://sam2p.googlecode.com/files/tif22pnm-0.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4064deb4f15677b1d1885863e2b30a94
diff --git a/metadata/md5-cache/media-gfx/tintii-2.5.3 b/metadata/md5-cache/media-gfx/tintii-2.5.3
index 55f4df06242e..340e8b7bb44f 100644
--- a/metadata/md5-cache/media-gfx/tintii-2.5.3
+++ b/metadata/md5-cache/media-gfx/tintii-2.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=x11-libs/wxGTK:2.8[X] dev-libs/boost || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/wxGTK:2.8[X] dev-libs/boost || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A photo editor for selective color, saturation, and hue shift adjustments
 EAPI=4
 HOMEPAGE=http://www.indii.org/software/tintii
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/wxGTK:2.8[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/tint/tintii-2.5.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=aace6284ac3c9e549f0a2a266809c15c
diff --git a/metadata/md5-cache/media-gfx/tintii-2.6.1 b/metadata/md5-cache/media-gfx/tintii-2.6.1
index 21c9d02fdac3..334bb8a3b618 100644
--- a/metadata/md5-cache/media-gfx/tintii-2.6.1
+++ b/metadata/md5-cache/media-gfx/tintii-2.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=x11-libs/wxGTK:2.8[X] dev-libs/boost || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/wxGTK:2.8[X] dev-libs/boost || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A photo editor for selective color, saturation, and hue shift adjustments
 EAPI=4
 HOMEPAGE=http://www.indii.org/software/tintii
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/wxGTK:2.8[X]
 SLOT=0
 SRC_URI=http://www.indii.org/files/tint/releases/tintii-2.6.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=f4e6af3eee604604c3893b9f6ecf6d0a
diff --git a/metadata/md5-cache/media-gfx/ufraw-0.18 b/metadata/md5-cache/media-gfx/ufraw-0.18
index 46fe4a005220..990dc9533770 100644
--- a/metadata/md5-cache/media-gfx/ufraw-0.18
+++ b/metadata/md5-cache/media-gfx/ufraw-0.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=RAW Image format viewer and GIMP plugin
 EAPI=4
 HOMEPAGE=http://ufraw.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ufraw/ufraw-0.18.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=58d16560f907fb08420fd6ff9f9b898b
diff --git a/metadata/md5-cache/media-gfx/ufraw-0.19 b/metadata/md5-cache/media-gfx/ufraw-0.19
index 7360baf25368..0c3110f6bf42 100644
--- a/metadata/md5-cache/media-gfx/ufraw-0.19
+++ b/metadata/md5-cache/media-gfx/ufraw-0.19
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2 >=media-gfx/exiv2-0.11 virtual/jpeg media-libs/lcms:0 >=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-libs/glib:2 >=media-gfx/exiv2-0.11 virtual/jpeg media-libs/lcms:0 >=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=RAW Image format viewer and GIMP plugin
 EAPI=5
 HOMEPAGE=http://ufraw.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=media-gfx/exiv2-0.11 virtual/jpeg media-libs/lcms:0 >=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ufraw/ufraw-0.19.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=86b0157d574f0794b68596628dc8b282
diff --git a/metadata/md5-cache/media-gfx/ufraw-0.19.1 b/metadata/md5-cache/media-gfx/ufraw-0.19.1
index c7fa2c3c4d9a..5d3d648fc7ab 100644
--- a/metadata/md5-cache/media-gfx/ufraw-0.19.1
+++ b/metadata/md5-cache/media-gfx/ufraw-0.19.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2 >=media-gfx/exiv2-0.11 virtual/jpeg media-libs/lcms:0 >=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-libs/glib:2 >=media-gfx/exiv2-0.11 virtual/jpeg media-libs/lcms:0 >=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=RAW Image format viewer and GIMP plugin
 EAPI=5
 HOMEPAGE=http://ufraw.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=media-gfx/exiv2-0.11 virtual/jpeg media-libs/lcms:0 >=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ufraw/ufraw-0.19.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=989b9e62f536f936fda81c5d43a12bdc
diff --git a/metadata/md5-cache/media-gfx/ufraw-0.19.2 b/metadata/md5-cache/media-gfx/ufraw-0.19.2
index fde385a24c97..be9d80a02f29 100644
--- a/metadata/md5-cache/media-gfx/ufraw-0.19.2
+++ b/metadata/md5-cache/media-gfx/ufraw-0.19.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2 >=media-gfx/exiv2-0.11 virtual/jpeg media-libs/lcms:0 >=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-libs/glib:2 >=media-gfx/exiv2-0.11 virtual/jpeg media-libs/lcms:0 >=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=RAW Image format viewer and GIMP plugin
 EAPI=5
 HOMEPAGE=http://ufraw.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=media-gfx/exiv2-0.11 virtual/jpeg media-libs/lcms:0 >=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ufraw/ufraw-0.19.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=07df2bb1e6508affa1f6ce16b9b9eb86
diff --git a/metadata/md5-cache/media-gfx/viewer-0.8.0 b/metadata/md5-cache/media-gfx/viewer-0.8.0
index 8efa40d0bccc..fcca9d603af1 100644
--- a/metadata/md5-cache/media-gfx/viewer-0.8.0
+++ b/metadata/md5-cache/media-gfx/viewer-0.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=virtual/opengl media-libs/freeglut x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/opengl media-libs/freeglut x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A stereo pair image viewer (supports ppm's only)
 EAPI=2
 HOMEPAGE=http://www-users.cs.umn.edu/~wburdick/geowall/viewer.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/opengl media-libs/freeglut x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM
 SLOT=0
 SRC_URI=http://www-users.cs.umn.edu/~wburdick/ftp/geowall/viewer-0.8.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=1db31515d374d775321115c8449d8510
diff --git a/metadata/md5-cache/media-gfx/viewnior-1.3 b/metadata/md5-cache/media-gfx/viewnior-1.3
index 94191305b177..ec927d974af2 100644
--- a/metadata/md5-cache/media-gfx/viewnior-1.3
+++ b/metadata/md5-cache/media-gfx/viewnior-1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.20:2 x11-misc/shared-mime-info >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.20:2 x11-misc/shared-mime-info >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Fast and simple image viewer
 EAPI=4
 HOMEPAGE=http://xsisqox.github.com/Viewnior/index.html
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.20:2 x11-misc/shared-mime-info
 SLOT=0
 SRC_URI=mirror://github/xsisqox/Viewnior/viewnior-1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=2d8cee56b39b8824d339b2eaa5c509e0
diff --git a/metadata/md5-cache/media-gfx/xloadimage-4.1-r11 b/metadata/md5-cache/media-gfx/xloadimage-4.1-r11
index 6868fd326725..a13a6e0ec90c 100644
--- a/metadata/md5-cache/media-gfx/xloadimage-4.1-r11
+++ b/metadata/md5-cache/media-gfx/xloadimage-4.1-r11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/libX11 tiff? ( media-libs/tiff ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg:0 ) !media-gfx/xli || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 tiff? ( media-libs/tiff ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg:0 ) !media-gfx/xli || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=utility to view many different types of images under X11
 EAPI=2
 HOMEPAGE=http://world.std.com/~jimf/xloadimage.html
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 tiff? ( media-libs/tiff ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg:0 )
 SLOT=0
 SRC_URI=ftp://ftp.x.org/R5contrib/xloadimage.4.1.tar.gz mirror://gentoo/xloadimage-4.1-gentoo-r1.diff.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=626d8866e7c83f3522bf34b7d0a339ac
diff --git a/metadata/md5-cache/media-gfx/xsvg-0.2.1 b/metadata/md5-cache/media-gfx/xsvg-0.2.1
index 7c421a6fa41e..5bbb36cd7e77 100644
--- a/metadata/md5-cache/media-gfx/xsvg-0.2.1
+++ b/metadata/md5-cache/media-gfx/xsvg-0.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/cairo[X] x11-libs/libsvg-cairo x11-libs/libXt x11-libs/libXcursor || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/cairo[X] x11-libs/libsvg-cairo x11-libs/libXt x11-libs/libXcursor || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a command line viewer for SVG files
 EAPI=2
 HOMEPAGE=http://cairographics.org
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=x11-libs/cairo[X] x11-libs/libsvg-cairo
 SLOT=0
 SRC_URI=http://cairographics.org/snapshots/xsvg-0.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bcc1b0b9ba8c5871d0e9da179f282d96
diff --git a/metadata/md5-cache/media-gfx/zbar-0.10-r1 b/metadata/md5-cache/media-gfx/zbar-0.10-r1
index ab1446f56071..628158e755b0 100644
--- a/metadata/md5-cache/media-gfx/zbar-0.10-r1
+++ b/metadata/md5-cache/media-gfx/zbar-0.10-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=gtk? ( =dev-libs/glib-2* x11-libs/gtk+:2 ) imagemagick? ( >=media-gfx/imagemagick-6.2.6 ) jpeg? ( virtual/jpeg ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) X? ( x11-libs/libXext xv? ( x11-libs/libXv ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=gtk? ( =dev-libs/glib-2* x11-libs/gtk+:2 ) imagemagick? ( >=media-gfx/imagemagick-6.2.6 ) jpeg? ( virtual/jpeg ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) X? ( x11-libs/libXext xv? ( x11-libs/libXv ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=Library and tools for reading barcodes from images or video
 EAPI=4
 HOMEPAGE=http://zbar.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=gtk? ( =dev-libs/glib-2* x11-libs/gtk+:2 ) imagemagick? ( >=media-gfx/imagemagick-6.2.6 ) jpeg? ( virtual/jpeg ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) X? ( x11-libs/libXext xv? ( x11-libs/libXv ) ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=mirror://sourceforge/zbar/zbar-0.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3805ee413b27e9071b4379cc65079091
diff --git a/metadata/md5-cache/media-gfx/zbar-0.10-r2 b/metadata/md5-cache/media-gfx/zbar-0.10-r2
index 15e69e1f0db9..17856a4a6732 100644
--- a/metadata/md5-cache/media-gfx/zbar-0.10-r2
+++ b/metadata/md5-cache/media-gfx/zbar-0.10-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=gtk? ( =dev-libs/glib-2* x11-libs/gtk+:2 ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) jpeg? ( virtual/jpeg ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) X? ( x11-libs/libXext xv? ( x11-libs/libXv ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=gtk? ( =dev-libs/glib-2* x11-libs/gtk+:2 ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) jpeg? ( virtual/jpeg ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) X? ( x11-libs/libXext xv? ( x11-libs/libXv ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=Library and tools for reading barcodes from images or video
 EAPI=5
 HOMEPAGE=http://zbar.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=gtk? ( =dev-libs/glib-2* x11-libs/gtk+:2 ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) jpeg? ( virtual/jpeg ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) X? ( x11-libs/libXext xv? ( x11-libs/libXv ) ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=mirror://sourceforge/zbar/zbar-0.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6eee5c81ff2356e697d90f3b2c26196a
diff --git a/metadata/md5-cache/media-gfx/zbar-0.10-r3 b/metadata/md5-cache/media-gfx/zbar-0.10-r3
index db0f1ea04d14..ae57fa494bf0 100644
--- a/metadata/md5-cache/media-gfx/zbar-0.10-r3
+++ b/metadata/md5-cache/media-gfx/zbar-0.10-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) jpeg? ( virtual/jpeg ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) X? ( x11-libs/libXext xv? ( x11-libs/libXv ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) jpeg? ( virtual/jpeg ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) X? ( x11-libs/libXext xv? ( x11-libs/libXv ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=Library and tools for reading barcodes from images or video
 EAPI=5
 HOMEPAGE=http://zbar.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) jpeg? ( virtual/jpeg ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) X? ( x11-libs/libXext xv? ( x11-libs/libXv ) ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=mirror://sourceforge/zbar/zbar-0.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dfe945f939965bae046bafb499fa6337
diff --git a/metadata/md5-cache/media-libs/FusionSound-1.1.1-r1 b/metadata/md5-cache/media-libs/FusionSound-1.1.1-r1
index 9be69dfc6d69..e1ed6f737c48 100644
--- a/metadata/md5-cache/media-libs/FusionSound-1.1.1-r1
+++ b/metadata/md5-cache/media-libs/FusionSound-1.1.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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 ) virtual/pkgconfig sys-apps/sed || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig sys-apps/sed || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Audio sub system for multiple applications
 EAPI=4
 HOMEPAGE=http://www.directfb.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://www.directfb.org/downloads/Core/FusionSound-1.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c2a852b37c402bac0d6ec72073d2912d
diff --git a/metadata/md5-cache/media-libs/SoQt-1.5.0-r1 b/metadata/md5-cache/media-libs/SoQt-1.5.0-r1
index b46f56de3372..136cb38449b7 100644
--- a/metadata/md5-cache/media-libs/SoQt-1.5.0-r1
+++ b/metadata/md5-cache/media-libs/SoQt-1.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 PEL )
 RDEPEND=>=media-libs/coin-3.1.3 virtual/opengl dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4
 SLOT=0
 SRC_URI=http://ftp.coin3d.org/coin/src/all/SoQt-1.5.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db5ec3d257dfe2a6685dbc7c5cde982c
diff --git a/metadata/md5-cache/media-libs/a52dec-0.7.4-r6 b/metadata/md5-cache/media-libs/a52dec-0.7.4-r6
index 03698a0a5723..0d7d5382055b 100644
--- a/metadata/md5-cache/media-libs/a52dec-0.7.4-r6
+++ b/metadata/md5-cache/media-libs/a52dec-0.7.4-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=djbfft? ( sci-libs/djbfft ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=djbfft? ( sci-libs/djbfft ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=library for decoding ATSC A/52 streams used in DVD
 EAPI=3
 HOMEPAGE=http://liba52.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=djbfft? ( sci-libs/djbfft )
 SLOT=0
 SRC_URI=http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=70ce1be30f70717ed6e5afbb714a70e9
diff --git a/metadata/md5-cache/media-libs/aalib-1.4_rc5 b/metadata/md5-cache/media-libs/aalib-1.4_rc5
index 3d07ec8ee727..cbbb0f78ef17 100644
--- a/metadata/md5-cache/media-libs/aalib-1.4_rc5
+++ b/metadata/md5-cache/media-libs/aalib-1.4_rc5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=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.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A ASCII-Graphics Library
 HOMEPAGE=http://aa-project.sourceforge.net/aalib/
 IUSE=X slang gpm
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libX11 ) slang? ( >=sys-libs/slang-1.4.2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/aa-project/aalib-1.4rc5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fc7b42907831eea8b1f04be6b1ada8e0
diff --git a/metadata/md5-cache/media-libs/aalib-1.4_rc5-r4 b/metadata/md5-cache/media-libs/aalib-1.4_rc5-r4
index d27143e5fa3e..691314d48990 100644
--- a/metadata/md5-cache/media-libs/aalib-1.4_rc5-r4
+++ b/metadata/md5-cache/media-libs/aalib-1.4_rc5-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A ASCII-Graphics Library
 EAPI=4
 HOMEPAGE=http://aa-project.sourceforge.net/aalib/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libX11 ) slang? ( >=sys-libs/slang-1.4.2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/aa-project/aalib-1.4rc5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed9eb3c16b983fae9c0ed9c71954591d
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.0.25-r1 b/metadata/md5-cache/media-libs/alsa-lib-1.0.25-r1
index 70b267987475..a44f062f6d90 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.0.25-r1
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.0.25-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=>=media-sound/alsa-headers-1.0.25 doc? ( >=app-doc/doxygen-1.2.6 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=>=media-sound/alsa-headers-1.0.25 doc? ( >=app-doc/doxygen-1.2.6 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Advanced Linux Sound Architecture Library
 EAPI=4
 HOMEPAGE=http://www.alsa-project.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://alsaproject/lib/alsa-lib-1.0.25.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bf4b9fa71d5858ce502d5e31f1409e33
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.0.26 b/metadata/md5-cache/media-libs/alsa-lib-1.0.26
index 66d2261bd4aa..cc8cd741bf36 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.0.26
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.0.26
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=media-sound/alsa-headers-1.0.25 doc? ( >=app-doc/doxygen-1.2.6 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+DEPEND=>=media-sound/alsa-headers-1.0.25 doc? ( >=app-doc/doxygen-1.2.6 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 DESCRIPTION=Advanced Linux Sound Architecture Library
 EAPI=4
 HOMEPAGE=http://www.alsa-project.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=mirror://alsaproject/lib/alsa-lib-1.0.26.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e778faf823be5688802220b586717bd9
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.0.26-r1 b/metadata/md5-cache/media-libs/alsa-lib-1.0.26-r1
index dc7de8aab376..6ca3453ce1c3 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.0.26-r1
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.0.26-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=python? ( python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) >=media-sound/alsa-headers-1.0.25 doc? ( >=app-doc/doxygen-1.2.6 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=python? ( python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) >=media-sound/alsa-headers-1.0.25 doc? ( >=app-doc/doxygen-1.2.6 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Advanced Linux Sound Architecture Library
 EAPI=5
 HOMEPAGE=http://www.alsa-project.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=python? ( python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 SLOT=0
 SRC_URI=mirror://alsaproject/lib/alsa-lib-1.0.26.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=12b9099596b8c757dbfe7362011eab2a
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.0.26-r2 b/metadata/md5-cache/media-libs/alsa-lib-1.0.26-r2
index 56460cc21efe..aa2f3b571bf1 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.0.26-r2
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.0.26-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=python? ( python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) >=media-sound/alsa-headers-1.0.25 doc? ( >=app-doc/doxygen-1.2.6 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=python? ( python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) >=media-sound/alsa-headers-1.0.25 doc? ( >=app-doc/doxygen-1.2.6 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Advanced Linux Sound Architecture Library
 EAPI=5
 HOMEPAGE=http://www.alsa-project.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=python? ( python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 SLOT=0
 SRC_URI=mirror://alsaproject/lib/alsa-lib-1.0.26.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d42f791560fd6437e4705ba7101371c7
diff --git a/metadata/md5-cache/media-libs/alsa-oss-1.0.17 b/metadata/md5-cache/media-libs/alsa-oss-1.0.17
index 308cd1511fb2..be4daaf06144 100644
--- a/metadata/md5-cache/media-libs/alsa-oss-1.0.17
+++ b/metadata/md5-cache/media-libs/alsa-oss-1.0.17
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.0.17
 SLOT=0
 SRC_URI=mirror://alsaproject/oss-lib/alsa-oss-1.0.17.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c63ada4df083cc714db54143974084c9
diff --git a/metadata/md5-cache/media-libs/alsa-oss-1.0.25 b/metadata/md5-cache/media-libs/alsa-oss-1.0.25
index 597207364667..830dc89059c3 100644
--- a/metadata/md5-cache/media-libs/alsa-oss-1.0.25
+++ b/metadata/md5-cache/media-libs/alsa-oss-1.0.25
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=media-libs/alsa-lib-1.0.25 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/alsa-lib-1.0.25 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Advanced Linux Sound Architecture OSS compatibility layer.
 EAPI=4
 HOMEPAGE=http://www.alsa-project.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.0.25
 SLOT=0
 SRC_URI=mirror://alsaproject/oss-lib/alsa-oss-1.0.25.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8e9422ea15eafa9ec5296ceb4dd0948a
diff --git a/metadata/md5-cache/media-libs/atlas-c++-0.6.1 b/metadata/md5-cache/media-libs/atlas-c++-0.6.1
index abf94b05418f..8f7e300dee64 100644
--- a/metadata/md5-cache/media-libs/atlas-c++-0.6.1
+++ b/metadata/md5-cache/media-libs/atlas-c++-0.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Atlas protocol, used in role playing games at worldforge.
 HOMEPAGE=http://www.worldforge.org/dev/eng/libraries/atlas_cpp
 IUSE=bzip2 doc zlib
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/worldforge/Atlas-C++-0.6.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=46dfe7b0357a2a6c37328c7c9b9435f7
diff --git a/metadata/md5-cache/media-libs/atlas-c++-0.6.1-r1 b/metadata/md5-cache/media-libs/atlas-c++-0.6.1-r1
index 9fb903af53e9..46707bb9783d 100644
--- a/metadata/md5-cache/media-libs/atlas-c++-0.6.1-r1
+++ b/metadata/md5-cache/media-libs/atlas-c++-0.6.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Atlas protocol, used in role playing games at worldforge.
 EAPI=2
 HOMEPAGE=http://www.worldforge.org/dev/eng/libraries/atlas_cpp
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/worldforge/Atlas-C++-0.6.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d171ef437481f84f84152e3edba0e9d8
diff --git a/metadata/md5-cache/media-libs/atlas-c++-0.6.2 b/metadata/md5-cache/media-libs/atlas-c++-0.6.2
index f84cf26efb70..96aa3e996a1e 100644
--- a/metadata/md5-cache/media-libs/atlas-c++-0.6.2
+++ b/metadata/md5-cache/media-libs/atlas-c++-0.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Atlas protocol, used in role playing games at worldforge.
 EAPI=2
 HOMEPAGE=http://www.worldforge.org/dev/eng/libraries/atlas_cpp
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/worldforge/Atlas-C++-0.6.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=07bdc652c63326b5a771e761d6ff63d7
diff --git a/metadata/md5-cache/media-libs/aubio-0.3.2-r1 b/metadata/md5-cache/media-libs/aubio-0.3.2-r1
index 4e29b3c9c448..307ea69a1955 100644
--- a/metadata/md5-cache/media-libs/aubio-0.3.2-r1
+++ b/metadata/md5-cache/media-libs/aubio-0.3.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=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 virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=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 virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=Library for audio labelling
 EAPI=3
 HOMEPAGE=http://aubio.piem.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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* )
 SLOT=0
 SRC_URI=http://aubio.piem.org/pub/aubio-0.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3d4608e614c84e0faa3fd28cb889e0c4
diff --git a/metadata/md5-cache/media-libs/aubio-0.3.2-r2 b/metadata/md5-cache/media-libs/aubio-0.3.2-r2
index ba2e7ec39ba6..ac63c1757ecb 100644
--- a/metadata/md5-cache/media-libs/aubio-0.3.2-r2
+++ b/metadata/md5-cache/media-libs/aubio-0.3.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=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 virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=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 virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=Library for audio labelling
 EAPI=3
 HOMEPAGE=http://aubio.piem.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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* )
 SLOT=0
 SRC_URI=http://aubio.piem.org/pub/aubio-0.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3446eb15e1e73ef1770327cae67c96bb
diff --git a/metadata/md5-cache/media-libs/audiofile-0.3.4 b/metadata/md5-cache/media-libs/audiofile-0.3.4
index 4e143e65be30..3d8e9d4b6e3e 100644
--- a/metadata/md5-cache/media-libs/audiofile-0.3.4
+++ b/metadata/md5-cache/media-libs/audiofile-0.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
 DESCRIPTION=An elegant API for accessing audio files
 EAPI=4
 HOMEPAGE=http://www.68k.org/~michael/audiofile/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86
 LICENSE=GPL-2 LGPL-2
 SLOT=0
 SRC_URI=mirror://gnome/sources/audiofile/0.3/audiofile-0.3.4.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8b7be700f29bfb1927bc2b9cad0ea755
diff --git a/metadata/md5-cache/media-libs/audiofile-0.3.5 b/metadata/md5-cache/media-libs/audiofile-0.3.5
index 731ae217d530..92b73533e094 100644
--- a/metadata/md5-cache/media-libs/audiofile-0.3.5
+++ b/metadata/md5-cache/media-libs/audiofile-0.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=test? ( dev-cpp/gtest ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
+DEPEND=test? ( dev-cpp/gtest ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
 DESCRIPTION=An elegant API for accessing audio files
 EAPI=5
 HOMEPAGE=http://www.68k.org/~michael/audiofile/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86
 LICENSE=GPL-2 LGPL-2
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/audiofile/0.3/audiofile-0.3.5.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aad4bc1c90979053a342ddb6f23c96a3
diff --git a/metadata/md5-cache/media-libs/audiofile-0.3.6 b/metadata/md5-cache/media-libs/audiofile-0.3.6
index 90dcd2da5990..2068dea5710c 100644
--- a/metadata/md5-cache/media-libs/audiofile-0.3.6
+++ b/metadata/md5-cache/media-libs/audiofile-0.3.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=flac? ( >=media-libs/flac-1.2.1 ) virtual/pkgconfig test? ( dev-cpp/gtest ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
+DEPEND=flac? ( >=media-libs/flac-1.2.1 ) virtual/pkgconfig test? ( dev-cpp/gtest ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
 DESCRIPTION=An elegant API for accessing audio files
 EAPI=5
 HOMEPAGE=http://www.68k.org/~michael/audiofile/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=flac? ( >=media-libs/flac-1.2.1 )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/audiofile/0.3/audiofile-0.3.6.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9ee772aa7616a8342596cf90bd5b81d3
diff --git a/metadata/md5-cache/media-libs/babl-0.1.10 b/metadata/md5-cache/media-libs/babl-0.1.10
index 4ed5f3056b2b..4d01d3a7dcc2 100644
--- a/metadata/md5-cache/media-libs/babl-0.1.10
+++ b/metadata/md5-cache/media-libs/babl-0.1.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=introspection? ( >=dev-libs/gobject-introspection-0.10 ) >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=introspection? ( >=dev-libs/gobject-introspection-0.10 ) >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A dynamic, any to any, pixel format conversion library
 EAPI=3
 HOMEPAGE=http://www.gegl.org/babl/
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=introspection? ( >=dev-libs/gobject-introspection-0.10 )
 SLOT=0
 SRC_URI=ftp://ftp.gimp.org/pub/babl/0.1/babl-0.1.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=26f0458b8fc2abd0a7bd4d37a130f6b3
diff --git a/metadata/md5-cache/media-libs/babl-0.1.4-r2 b/metadata/md5-cache/media-libs/babl-0.1.4-r2
index 5cb7817edf3b..063c68dd2a73 100644
--- a/metadata/md5-cache/media-libs/babl-0.1.4-r2
+++ b/metadata/md5-cache/media-libs/babl-0.1.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A dynamic, any to any, pixel format conversion library
 EAPI=3
 HOMEPAGE=http://www.gegl.org/babl/
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
 SLOT=0
 SRC_URI=ftp://ftp.gimp.org/pub/babl/0.1/babl-0.1.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=34b22240e62605c43f70415fd40020fb
diff --git a/metadata/md5-cache/media-libs/babl-0.1.6 b/metadata/md5-cache/media-libs/babl-0.1.6
index 7b087cfb5a5b..e7ff421fc82a 100644
--- a/metadata/md5-cache/media-libs/babl-0.1.6
+++ b/metadata/md5-cache/media-libs/babl-0.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=introspection? ( >=dev-libs/gobject-introspection-0.10 ) >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=introspection? ( >=dev-libs/gobject-introspection-0.10 ) >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A dynamic, any to any, pixel format conversion library
 EAPI=3
 HOMEPAGE=http://www.gegl.org/babl/
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=introspection? ( >=dev-libs/gobject-introspection-0.10 )
 SLOT=0
 SRC_URI=ftp://ftp.gimp.org/pub/babl/0.1/babl-0.1.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8bfe682063269c1ad0dd6b6b6d96906e
diff --git a/metadata/md5-cache/media-libs/babl-0.1.8 b/metadata/md5-cache/media-libs/babl-0.1.8
index 579b0583b9e3..d875d0c3947d 100644
--- a/metadata/md5-cache/media-libs/babl-0.1.8
+++ b/metadata/md5-cache/media-libs/babl-0.1.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=introspection? ( >=dev-libs/gobject-introspection-0.10 ) >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=introspection? ( >=dev-libs/gobject-introspection-0.10 ) >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A dynamic, any to any, pixel format conversion library
 EAPI=3
 HOMEPAGE=http://www.gegl.org/babl/
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=introspection? ( >=dev-libs/gobject-introspection-0.10 )
 SLOT=0
 SRC_URI=ftp://ftp.gimp.org/pub/babl/0.1/babl-0.1.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ece920900030a6962cff4476600251ee
diff --git a/metadata/md5-cache/media-libs/babl-9999 b/metadata/md5-cache/media-libs/babl-9999
index ade7b8c46ced..dfdb7fcae8e8 100644
--- a/metadata/md5-cache/media-libs/babl-9999
+++ b/metadata/md5-cache/media-libs/babl-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=introspection? ( >=dev-libs/gobject-introspection-0.10 ) >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=introspection? ( >=dev-libs/gobject-introspection-0.10 ) >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=A dynamic, any to any, pixel format conversion library
 EAPI=4
 HOMEPAGE=http://www.gegl.org/babl/
@@ -7,5 +7,5 @@ IUSE=altivec +introspection sse mmx vala
 LICENSE=LGPL-3
 RDEPEND=introspection? ( >=dev-libs/gobject-introspection-0.10 )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b5b8336133d4f5310c898ff38edc7d1d
diff --git a/metadata/md5-cache/media-libs/bio2jack-0.9-r1 b/metadata/md5-cache/media-libs/bio2jack-0.9-r1
index 48ccdfd084f6..ca737e2dcac4 100644
--- a/metadata/md5-cache/media-libs/bio2jack-0.9-r1
+++ b/metadata/md5-cache/media-libs/bio2jack-0.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libsamplerate media-sound/jack-audio-connection-kit virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsamplerate media-sound/jack-audio-connection-kit virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for porting blocked I/O OSS/ALSA audio applications to JACK
 EAPI=4
 HOMEPAGE=http://bio2jack.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsamplerate media-sound/jack-audio-connection-kit
 SLOT=0
 SRC_URI=mirror://sourceforge/bio2jack/bio2jack-0.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=fec94e808379f08335f3e6fc4b732ba7
diff --git a/metadata/md5-cache/media-libs/cal3d-0.11.0-r1 b/metadata/md5-cache/media-libs/cal3d-0.11.0-r1
index 44480525430e..fa49cd68c193 100644
--- a/metadata/md5-cache/media-libs/cal3d-0.11.0-r1
+++ b/metadata/md5-cache/media-libs/cal3d-0.11.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=doc? ( app-doc/doxygen app-text/docbook-sgml-utils ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen app-text/docbook-sgml-utils ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Cal3D is a skeletal based character animation library
 EAPI=2
 HOMEPAGE=http://home.gna.org/cal3d
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~ia64 ppc x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://download.gna.org/cal3d/sources/cal3d-0.11.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4487aceccdab4d3a34ff01a3b898341c
diff --git a/metadata/md5-cache/media-libs/ccaudio2-2.0.5 b/metadata/md5-cache/media-libs/ccaudio2-2.0.5
index 7e9c65d05723..997504ef4c37 100644
--- a/metadata/md5-cache/media-libs/ccaudio2-2.0.5
+++ b/metadata/md5-cache/media-libs/ccaudio2-2.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/ucommon gsm? ( media-sound/gsm ) speex? ( media-libs/speex ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/ucommon gsm? ( media-sound/gsm ) speex? ( media-libs/speex ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C++ class framework for manipulating audio data
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/ccaudio
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/ucommon gsm? ( media-sound/gsm ) speex? ( media-libs/speex )
 REQUIRED_USE=^^ ( gsm speex )
 SLOT=0
 SRC_URI=mirror://gnu/ccaudio/ccaudio2-2.0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8fd21128cbe25356512a8ff4df79e41f
diff --git a/metadata/md5-cache/media-libs/celt-0.6.1 b/metadata/md5-cache/media-libs/celt-0.6.1
index b56152a476f6..976c648809b1 100644
--- a/metadata/md5-cache/media-libs/celt-0.6.1
+++ b/metadata/md5-cache/media-libs/celt-0.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install unpack
-DEPEND=ogg? ( media-libs/libogg ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ogg? ( media-libs/libogg ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=CELT is a very low delay audio codec designed for high-quality communications.
 EAPI=2
 HOMEPAGE=http://www.celt-codec.org/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ogg? ( media-libs/libogg )
 SLOT=0
 SRC_URI=http://downloads.us.xiph.org/releases/celt/celt-0.6.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=bcd6e4e2e9e239651a927f44f5449f87
diff --git a/metadata/md5-cache/media-libs/coin-3.1.3-r2 b/metadata/md5-cache/media-libs/coin-3.1.3-r2
index 4b2631599671..9497f737b91c 100644
--- a/metadata/md5-cache/media-libs/coin-3.1.3-r2
+++ b/metadata/md5-cache/media-libs/coin-3.1.3-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 PEL )
 RDEPEND=dev-libs/expat media-libs/fontconfig media-libs/freetype:2 virtual/opengl virtual/glu x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext bzip2? ( app-arch/bzip2 ) javascript? ( dev-lang/spidermonkey ) openal? ( media-libs/openal ) simage? ( media-libs/simage ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=ftp://ftp.coin3d.org/pub/coin/src/all/Coin-3.1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=93dd6f4b258de5e206477a1a0c2c3a98
diff --git a/metadata/md5-cache/media-libs/compface-1.5.1 b/metadata/md5-cache/media-libs/compface-1.5.1
index d497d401fcec..b047aaae1c69 100644
--- a/metadata/md5-cache/media-libs/compface-1.5.1
+++ b/metadata/md5-cache/media-libs/compface-1.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utilities and library to convert to/from X-Face format
 EAPI=4
 HOMEPAGE=http://www.xemacs.org/Download/optLibs.html
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/aux/compface-1.5.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d353091af5757a9c03d02c8e373309c8
diff --git a/metadata/md5-cache/media-libs/devil-1.7.8-r1 b/metadata/md5-cache/media-libs/devil-1.7.8-r1
index 0214403cb505..b72699fd101a 100644
--- a/metadata/md5-cache/media-libs/devil-1.7.8-r1
+++ b/metadata/md5-cache/media-libs/devil-1.7.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=allegro? ( media-libs/allegro:0 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) lcms? ( =media-libs/lcms-1* ) mng? ( media-libs/libmng ) nvtt? ( media-gfx/nvidia-texture-tools ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0 ) sdl? ( media-libs/libsdl ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) X? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXrender ) virtual/pkgconfig X? ( x11-proto/xextproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=allegro? ( media-libs/allegro:0 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) lcms? ( =media-libs/lcms-1* ) mng? ( media-libs/libmng ) nvtt? ( media-gfx/nvidia-texture-tools ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0 ) sdl? ( media-libs/libsdl ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) X? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXrender ) virtual/pkgconfig X? ( x11-proto/xextproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=DevIL image library
 EAPI=2
 HOMEPAGE=http://openil.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=allegro? ( media-libs/allegro:0 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) lcms? ( =media-libs/lcms-1* ) mng? ( media-libs/libmng ) nvtt? ( media-gfx/nvidia-texture-tools ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0 ) sdl? ( media-libs/libsdl ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) X? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXrender )
 SLOT=0
 SRC_URI=mirror://sourceforge/openil/DevIL-1.7.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c8ca9ef4074fce4d1ae173f83ba8a242
diff --git a/metadata/md5-cache/media-libs/dssi-1.1.0 b/metadata/md5-cache/media-libs/dssi-1.1.0
index a143de4aa08c..3046a8e279ed 100644
--- a/metadata/md5-cache/media-libs/dssi-1.1.0
+++ b/metadata/md5-cache/media-libs/dssi-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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? ( dev-qt/qtgui:4 ) sys-apps/sed virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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? ( dev-qt/qtgui:4 ) sys-apps/sed virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Plugin API for software instruments with user interfaces
 EAPI=2
 HOMEPAGE=http://dssi.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD LGPL-2.1
 RDEPEND=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? ( dev-qt/qtgui:4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dssi/dssi-1.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=056155277d7e87859698594ae823888c
diff --git a/metadata/md5-cache/media-libs/dssi-1.1.1 b/metadata/md5-cache/media-libs/dssi-1.1.1
index 61eada0ce80f..1b9fc8d62252 100644
--- a/metadata/md5-cache/media-libs/dssi-1.1.1
+++ b/metadata/md5-cache/media-libs/dssi-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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? ( dev-qt/qtgui:4 ) sys-apps/sed virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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? ( dev-qt/qtgui:4 ) sys-apps/sed virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Plugin API for software instruments with user interfaces
 EAPI=2
 HOMEPAGE=http://dssi.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD LGPL-2.1
 RDEPEND=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? ( dev-qt/qtgui:4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dssi/dssi-1.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=f1fb77b5e945fabdf5004e046cf681eb
diff --git a/metadata/md5-cache/media-libs/edje-1.7.6 b/metadata/md5-cache/media-libs/edje-1.7.6
index 3d5af31d3630..b027416ebb66 100644
--- a/metadata/md5-cache/media-libs/edje-1.7.6
+++ b/metadata/md5-cache/media-libs/edje-1.7.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-lang/lua >=dev-libs/eet-1.7.6 >=dev-libs/eina-1.7.6 >=dev-libs/embryo-1.7.4 >=media-libs/evas-1.7.6 >=dev-libs/ecore-1.7.6 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
+DEPEND=dev-lang/lua >=dev-libs/eet-1.7.6 >=dev-libs/eina-1.7.6 >=dev-libs/embryo-1.7.4 >=media-libs/evas-1.7.6 >=dev-libs/ecore-1.7.6 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
 DESCRIPTION=graphical layout and animation library
 EAPI=2
 HOMEPAGE=http://www.enlightenment.org/pages/edje.html
@@ -9,5 +9,5 @@ LICENSE=BSD-2 GPL-2
 RDEPEND=dev-lang/lua >=dev-libs/eet-1.7.6 >=dev-libs/eina-1.7.6 >=dev-libs/embryo-1.7.4 >=media-libs/evas-1.7.6 >=dev-libs/ecore-1.7.6 nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=http://download.enlightenment.org/releases/edje-1.7.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	enlightenment	59018f068e8f700839d3c75f86495011	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	enlightenment	59018f068e8f700839d3c75f86495011	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1bdd2e99b58a8b6074f15b713c7aed1e
diff --git a/metadata/md5-cache/media-libs/elementary-1.7.5 b/metadata/md5-cache/media-libs/elementary-1.7.5
index 4bd885bc3178..b79b18bdace8 100644
--- a/metadata/md5-cache/media-libs/elementary-1.7.5
+++ b/metadata/md5-cache/media-libs/elementary-1.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/ecore-1.7.5[evas,fbcon?,opengl?,sdl?,X?,xcb?] >=dev-libs/eet-1.7.4 >=media-libs/evas-1.7.5[fbcon?,opengl?,X?,xcb?] >=media-libs/edje-1.7.4 dbus? ( >=dev-libs/e_dbus-1.7.5 ) emotion? ( >=media-libs/emotion-1.7.4 ) ethumb? ( >=media-libs/ethumb-1.7.5 ) xdg? ( >=dev-libs/efreet-1.7.5 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
+DEPEND=>=dev-libs/ecore-1.7.5[evas,fbcon?,opengl?,sdl?,X?,xcb?] >=dev-libs/eet-1.7.4 >=media-libs/evas-1.7.5[fbcon?,opengl?,X?,xcb?] >=media-libs/edje-1.7.4 dbus? ( >=dev-libs/e_dbus-1.7.5 ) emotion? ( >=media-libs/emotion-1.7.4 ) ethumb? ( >=media-libs/ethumb-1.7.5 ) xdg? ( >=dev-libs/efreet-1.7.5 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
 DESCRIPTION=Basic widget set, based on EFL for mobile touch-screen devices.
 EAPI=2
 HOMEPAGE=http://trac.enlightenment.org/e/wiki/Elementary
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/ecore-1.7.5[evas,fbcon?,opengl?,sdl?,X?,xcb?] >=dev-libs/eet-1.7.4 >=media-libs/evas-1.7.5[fbcon?,opengl?,X?,xcb?] >=media-libs/edje-1.7.4 dbus? ( >=dev-libs/e_dbus-1.7.5 ) emotion? ( >=media-libs/emotion-1.7.4 ) ethumb? ( >=media-libs/ethumb-1.7.5 ) xdg? ( >=dev-libs/efreet-1.7.5 ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=http://download.enlightenment.org/releases/elementary-1.7.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	enlightenment	59018f068e8f700839d3c75f86495011	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	enlightenment	59018f068e8f700839d3c75f86495011	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f0d684c4e4501246e261dfd58af7fb7e
diff --git a/metadata/md5-cache/media-libs/emotion-1.7.4-r1 b/metadata/md5-cache/media-libs/emotion-1.7.4-r1
index b3adf5fa148a..a37d8e7bdc53 100644
--- a/metadata/md5-cache/media-libs/emotion-1.7.4-r1
+++ b/metadata/md5-cache/media-libs/emotion-1.7.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=media-libs/evas-1.7.4 >=media-libs/edje-1.7.4 >=dev-libs/ecore-1.7.4 >=dev-libs/eeze-1.7.4 vlc? ( media-video/vlc ) xine? ( >=media-libs/xine-lib-1.1.1 ) !gstreamer? ( !vlc? ( !xine? ( >=media-libs/xine-lib-1.1.1 ) ) ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-good-0.10* =media-plugins/gst-plugins-ffmpeg-0.10* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
+DEPEND=>=media-libs/evas-1.7.4 >=media-libs/edje-1.7.4 >=dev-libs/ecore-1.7.4 >=dev-libs/eeze-1.7.4 vlc? ( media-video/vlc ) xine? ( >=media-libs/xine-lib-1.1.1 ) !gstreamer? ( !vlc? ( !xine? ( >=media-libs/xine-lib-1.1.1 ) ) ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-good-0.10* =media-plugins/gst-plugins-ffmpeg-0.10* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
 DESCRIPTION=video libraries for e17
 EAPI=2
 HOMEPAGE=http://www.enlightenment.org/
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=media-libs/evas-1.7.4 >=media-libs/edje-1.7.4 >=dev-libs/ecore-1.7.4 >=dev-libs/eeze-1.7.4 vlc? ( media-video/vlc ) xine? ( >=media-libs/xine-lib-1.1.1 ) !gstreamer? ( !vlc? ( !xine? ( >=media-libs/xine-lib-1.1.1 ) ) ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-good-0.10* =media-plugins/gst-plugins-ffmpeg-0.10* ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=http://download.enlightenment.org/releases/emotion-1.7.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	enlightenment	59018f068e8f700839d3c75f86495011	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	enlightenment	59018f068e8f700839d3c75f86495011	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b2c0c9989ed6c88bb88c68af9ca74783
diff --git a/metadata/md5-cache/media-libs/ethumb-1.7.5 b/metadata/md5-cache/media-libs/ethumb-1.7.5
index efb81e517a2f..46c315ef1163 100644
--- a/metadata/md5-cache/media-libs/ethumb-1.7.5
+++ b/metadata/md5-cache/media-libs/ethumb-1.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/eina-1.7.4 >=dev-libs/ecore-1.7.5 >=media-libs/edje-1.7.4 >=media-libs/evas-1.7.5 media-libs/libexif dbus? ( >=dev-libs/e_dbus-1.7.5 ) emotion? ( >=media-libs/emotion-1.7.4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
+DEPEND=>=dev-libs/eina-1.7.4 >=dev-libs/ecore-1.7.5 >=media-libs/edje-1.7.4 >=media-libs/evas-1.7.5 media-libs/libexif dbus? ( >=dev-libs/e_dbus-1.7.5 ) emotion? ( >=media-libs/emotion-1.7.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
 DESCRIPTION=Enlightenment thumbnailing library (meant to replace epsilon)
 EAPI=2
 HOMEPAGE=http://trac.enlightenment.org/e/wiki/Ethumb
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/eina-1.7.4 >=dev-libs/ecore-1.7.5 >=media-libs/edje-1.7.4 >=media-libs/evas-1.7.5 media-libs/libexif dbus? ( >=dev-libs/e_dbus-1.7.5 ) emotion? ( >=media-libs/emotion-1.7.4 ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=http://download.enlightenment.org/releases/ethumb-1.7.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	enlightenment	59018f068e8f700839d3c75f86495011	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	enlightenment	59018f068e8f700839d3c75f86495011	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ccdc0068e1d40fa66cd7df6207aba362
diff --git a/metadata/md5-cache/media-libs/exempi-2.1.1 b/metadata/md5-cache/media-libs/exempi-2.1.1
index 50501b73863c..bc543f5e9c36 100644
--- a/metadata/md5-cache/media-libs/exempi-2.1.1
+++ b/metadata/md5-cache/media-libs/exempi-2.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/expat virtual/libiconv sys-libs/zlib sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/expat virtual/libiconv sys-libs/zlib sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Exempi is a port of the Adobe XMP SDK to work on UNIX
 EAPI=2
 HOMEPAGE=http://libopenraw.freedesktop.org/wiki/Exempi
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat virtual/libiconv sys-libs/zlib
 RESTRICT=test
 SLOT=2
 SRC_URI=http://libopenraw.freedesktop.org/download/exempi-2.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=af5617ae341276bab944cf77d3bd4f8e
diff --git a/metadata/md5-cache/media-libs/exempi-2.2.0 b/metadata/md5-cache/media-libs/exempi-2.2.0
index 390170e4bb19..522a5428cc85 100644
--- a/metadata/md5-cache/media-libs/exempi-2.2.0
+++ b/metadata/md5-cache/media-libs/exempi-2.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/expat-2 virtual/libiconv sys-libs/zlib sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/expat-2 virtual/libiconv sys-libs/zlib sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Exempi is a port of the Adobe XMP SDK to work on UNIX
 EAPI=4
 HOMEPAGE=http://libopenraw.freedesktop.org/wiki/Exempi
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/expat-2 virtual/libiconv sys-libs/zlib
 RESTRICT=test
 SLOT=2
 SRC_URI=http://libopenraw.freedesktop.org/download/exempi-2.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d28b79b6bfed78b7b14b26d757465ae8
diff --git a/metadata/md5-cache/media-libs/faac-1.28-r3 b/metadata/md5-cache/media-libs/faac-1.28-r3
index 0dcb961485e7..3036c9f97d4a 100644
--- a/metadata/md5-cache/media-libs/faac-1.28-r3
+++ b/metadata/md5-cache/media-libs/faac-1.28-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libmp4v2:0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libmp4v2:0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free MPEG-4 audio codecs by AudioCoding.com
 EAPI=4
 HOMEPAGE=http://www.audiocoding.com
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MPEG-4
 RDEPEND=media-libs/libmp4v2:0
 SLOT=0
 SRC_URI=mirror://sourceforge/faac/faac-1.28.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6886aff9ae71812c30df0d9c4dc41b37
diff --git a/metadata/md5-cache/media-libs/faad2-2.7-r2 b/metadata/md5-cache/media-libs/faad2-2.7-r2
index eb3a59efad07..6b0350f9092e 100644
--- a/metadata/md5-cache/media-libs/faad2-2.7-r2
+++ b/metadata/md5-cache/media-libs/faad2-2.7-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=AAC audio decoding library
 EAPI=3
 HOMEPAGE=http://www.audiocoding.com/faad2.html
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/faac/faad2-2.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=766435f04c640dd8fda4adb79c09a18d
diff --git a/metadata/md5-cache/media-libs/fdk-aac-0.1.0 b/metadata/md5-cache/media-libs/fdk-aac-0.1.0
index 7b514509fca2..bcbe2810e05a 100644
--- a/metadata/md5-cache/media-libs/fdk-aac-0.1.0
+++ b/metadata/md5-cache/media-libs/fdk-aac-0.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Fraunhofer AAC codec library
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/opencore-amr/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-macos
 LICENSE=FraunhoferFDK
 SLOT=0
 SRC_URI=mirror://sourceforge/opencore-amr/fdk-aac-0.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0e7224ae7be5994ecd7f4df96e13fa68
diff --git a/metadata/md5-cache/media-libs/fdk-aac-0.1.1 b/metadata/md5-cache/media-libs/fdk-aac-0.1.1
index 098a21f1fa95..dcd9381748ad 100644
--- a/metadata/md5-cache/media-libs/fdk-aac-0.1.1
+++ b/metadata/md5-cache/media-libs/fdk-aac-0.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Fraunhofer AAC codec library
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/opencore-amr/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-macos
 LICENSE=FraunhoferFDK
 SLOT=0
 SRC_URI=mirror://sourceforge/opencore-amr/fdk-aac-0.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=11ac744b06d6971f6352b945bf0820a7
diff --git a/metadata/md5-cache/media-libs/ffmpegsource-2.17 b/metadata/md5-cache/media-libs/ffmpegsource-2.17
index 7236cd4bd6ad..f4d2303d6404 100644
--- a/metadata/md5-cache/media-libs/ffmpegsource-2.17
+++ b/metadata/md5-cache/media-libs/ffmpegsource-2.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib >=virtual/ffmpeg-0.9 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib >=virtual/ffmpeg-0.9 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An FFmpeg based source library for easy frame accurate access
 EAPI=4
 HOMEPAGE=https://code.google.com/p/ffmpegsource/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib >=virtual/ffmpeg-0.9
 SLOT=0
 SRC_URI=https://ffmpegsource.googlecode.com/files/ffms-2.17-src.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=99857b67e425c72830cbfc651058df60
diff --git a/metadata/md5-cache/media-libs/ffmpegsource-2.17.3_pre743 b/metadata/md5-cache/media-libs/ffmpegsource-2.17.3_pre743
index a74d3754c7ac..8cd269efd46f 100644
--- a/metadata/md5-cache/media-libs/ffmpegsource-2.17.3_pre743
+++ b/metadata/md5-cache/media-libs/ffmpegsource-2.17.3_pre743
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib >=virtual/ffmpeg-0.9 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib >=virtual/ffmpeg-0.9 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An FFmpeg based source library for easy frame accurate access
 EAPI=4
 HOMEPAGE=https://code.google.com/p/ffmpegsource/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib >=virtual/ffmpeg-0.9
 SLOT=0
 SRC_URI=http://rion-overlay.googlecode.com/files/ffmpegsource-2.17.3_pre743.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d8839f5ecf02babc8745415baf0d05de
diff --git a/metadata/md5-cache/media-libs/ffmpegsource-2.17.4_pre753 b/metadata/md5-cache/media-libs/ffmpegsource-2.17.4_pre753
index b4b29b16ced9..7503d759809d 100644
--- a/metadata/md5-cache/media-libs/ffmpegsource-2.17.4_pre753
+++ b/metadata/md5-cache/media-libs/ffmpegsource-2.17.4_pre753
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib >=virtual/ffmpeg-9 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib >=virtual/ffmpeg-9 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An FFmpeg based source library for easy frame accurate access
 EAPI=5
 HOMEPAGE=https://code.google.com/p/ffmpegsource/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib >=virtual/ffmpeg-9
 SLOT=0
 SRC_URI=http://rion-overlay.googlecode.com/files/ffmpegsource-2.17.4_pre753.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d257a8de64d0fdc6da4717c4a083d687
diff --git a/metadata/md5-cache/media-libs/ffmpegsource-9999 b/metadata/md5-cache/media-libs/ffmpegsource-9999
index c1ded1246e84..0d76a22875e6 100644
--- a/metadata/md5-cache/media-libs/ffmpegsource-9999
+++ b/metadata/md5-cache/media-libs/ffmpegsource-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare test unpack
-DEPEND=sys-libs/zlib >=virtual/ffmpeg-9 virtual/pkgconfig || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib >=virtual/ffmpeg-9 virtual/pkgconfig || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An FFmpeg based source library for easy frame accurate access
 EAPI=4
 HOMEPAGE=https://code.google.com/p/ffmpegsource/
@@ -7,5 +7,5 @@ IUSE=static-libs
 LICENSE=MIT
 RDEPEND=sys-libs/zlib >=virtual/ffmpeg-9
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2460f2797234ba2f54bf2d8bea79b8ba
diff --git a/metadata/md5-cache/media-libs/flac-1.2.1-r3 b/metadata/md5-cache/media-libs/flac-1.2.1-r3
index 31a804473b00..a2cdec3f28cd 100644
--- a/metadata/md5-cache/media-libs/flac-1.2.1-r3
+++ b/metadata/md5-cache/media-libs/flac-1.2.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=ogg? ( >=media-libs/libogg-1.1.3 ) x86? ( dev-lang/nasm ) !elibc_uclibc? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ogg? ( >=media-libs/libogg-1.1.3 ) x86? ( dev-lang/nasm ) !elibc_uclibc? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=free lossless audio encoder and decoder
 EAPI=2
 HOMEPAGE=http://flac.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=BSD FDL-1.2 GPL-2 LGPL-2.1
 RDEPEND=ogg? ( >=media-libs/libogg-1.1.3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/flac/flac-1.2.1.tar.gz mirror://gentoo/flac-1.2.1-embedded-m4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=77dee8cb0d2e30372ef90122bd58e137
diff --git a/metadata/md5-cache/media-libs/flac-1.2.1-r4 b/metadata/md5-cache/media-libs/flac-1.2.1-r4
index 34b4a8934600..4dc1a5bd964b 100644
--- a/metadata/md5-cache/media-libs/flac-1.2.1-r4
+++ b/metadata/md5-cache/media-libs/flac-1.2.1-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=ogg? ( >=media-libs/libogg-1.1.3 ) x86? ( dev-lang/nasm ) !elibc_uclibc? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ogg? ( >=media-libs/libogg-1.1.3 ) x86? ( dev-lang/nasm ) !elibc_uclibc? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=free lossless audio encoder and decoder
 EAPI=2
 HOMEPAGE=http://flac.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=BSD FDL-1.2 GPL-2 LGPL-2.1
 RDEPEND=ogg? ( >=media-libs/libogg-1.1.3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/flac/flac-1.2.1.tar.gz mirror://gentoo/flac-1.2.1-embedded-m4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c1b825b96d6b2d872ef21957c731da89
diff --git a/metadata/md5-cache/media-libs/flickcurl-1.22 b/metadata/md5-cache/media-libs/flickcurl-1.22
index 1478047aed72..e9fb6254cb55 100644
--- a/metadata/md5-cache/media-libs/flickcurl-1.22
+++ b/metadata/md5-cache/media-libs/flickcurl-1.22
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=net-misc/curl-7.10.0 >=dev-libs/libxml2-2.6.8:2 raptor? ( media-libs/raptor:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-misc/curl-7.10.0 >=dev-libs/libxml2-2.6.8:2 raptor? ( media-libs/raptor:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C library for the Flickr API
 EAPI=4
 HOMEPAGE=http://librdf.org/flickcurl/
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-2 Apache-2.0 )
 RDEPEND=>=net-misc/curl-7.10.0 >=dev-libs/libxml2-2.6.8:2 raptor? ( media-libs/raptor:2 )
 SLOT=0
 SRC_URI=http://download.dajobe.org/flickcurl/flickcurl-1.22.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=df54fa9d175750a16ce1c37a1850e059
diff --git a/metadata/md5-cache/media-libs/flickcurl-1.23 b/metadata/md5-cache/media-libs/flickcurl-1.23
index ddef17392b9a..ae2b0139f97c 100644
--- a/metadata/md5-cache/media-libs/flickcurl-1.23
+++ b/metadata/md5-cache/media-libs/flickcurl-1.23
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=net-misc/curl-7.10.0 >=dev-libs/libxml2-2.6.8:2 raptor? ( media-libs/raptor:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-misc/curl-7.10.0 >=dev-libs/libxml2-2.6.8:2 raptor? ( media-libs/raptor:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C library for the Flickr API
 EAPI=4
 HOMEPAGE=http://librdf.org/flickcurl/
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-2 Apache-2.0 )
 RDEPEND=>=net-misc/curl-7.10.0 >=dev-libs/libxml2-2.6.8:2 raptor? ( media-libs/raptor:2 )
 SLOT=0
 SRC_URI=http://download.dajobe.org/flickcurl/flickcurl-1.23.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c07c074c48eb582188f85ea786380215
diff --git a/metadata/md5-cache/media-libs/fnlib-0.5-r2 b/metadata/md5-cache/media-libs/fnlib-0.5-r2
index a0619afef2ce..e7a5c18bdcfd 100644
--- a/metadata/md5-cache/media-libs/fnlib-0.5-r2
+++ b/metadata/md5-cache/media-libs/fnlib-0.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/imlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/imlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Font Library for enlightenment
 EAPI=2
 HOMEPAGE=http://www.enlightenment.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/imlib
 SLOT=0
 SRC_URI=mirror://sourceforge/enlightenment/fnlib-0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=fcada1698eeac306c428aa0b3ff3c3ca
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.10.2 b/metadata/md5-cache/media-libs/fontconfig-2.10.2
index 7d8bb56eb05b..4e2907beb72e 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.10.2
+++ b/metadata/md5-cache/media-libs/fontconfig-2.10.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3 virtual/pkgconfig doc? ( app-text/docbook-sgml-utils[jadetex] =app-text/docbook-sgml-dtd-3.1* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3 virtual/pkgconfig doc? ( app-text/docbook-sgml-utils[jadetex] =app-text/docbook-sgml-dtd-3.1* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for configuring and customizing font access
 EAPI=5
 HOMEPAGE=http://fontconfig.org/
@@ -10,5 +10,5 @@ PDEPEND=app-admin/eselect-fontconfig virtual/ttf-fonts
 RDEPEND=>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.10.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d56e423afbd244899582bcbdca7469b2
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.10.2-r1 b/metadata/md5-cache/media-libs/fontconfig-2.10.2-r1
index b4f3c7f7fa16..9254a798c88a 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.10.2-r1
+++ b/metadata/md5-cache/media-libs/fontconfig-2.10.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=>=media-libs/freetype-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=dev-libs/expat-1.95.3 abi_x86_32? ( amd64? ( app-emulation/emul-linux-x86-baselibs[development] ) !<=app-emulation/emul-linux-x86-xlibs-20130224 ) virtual/pkgconfig doc? ( app-text/docbook-sgml-utils[jadetex] =app-text/docbook-sgml-dtd-3.1* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/freetype-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=dev-libs/expat-1.95.3 abi_x86_32? ( amd64? ( app-emulation/emul-linux-x86-baselibs[development] ) !<=app-emulation/emul-linux-x86-xlibs-20130224 ) virtual/pkgconfig doc? ( app-text/docbook-sgml-utils[jadetex] =app-text/docbook-sgml-dtd-3.1* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for configuring and customizing font access
 EAPI=5
 HOMEPAGE=http://fontconfig.org/
@@ -10,5 +10,5 @@ PDEPEND=app-admin/eselect-fontconfig virtual/ttf-fonts
 RDEPEND=>=media-libs/freetype-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=dev-libs/expat-1.95.3 abi_x86_32? ( amd64? ( app-emulation/emul-linux-x86-baselibs[development] ) !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.10.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=81f3cc1f931af709c292babc8b832dd7
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.10.91 b/metadata/md5-cache/media-libs/fontconfig-2.10.91
index f4188b13fafd..fa77d969643e 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.10.91
+++ b/metadata/md5-cache/media-libs/fontconfig-2.10.91
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=>=media-libs/freetype-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=dev-libs/expat-1.95.3 abi_x86_32? ( amd64? ( app-emulation/emul-linux-x86-baselibs[development] ) !<=app-emulation/emul-linux-x86-xlibs-20130224 ) virtual/pkgconfig doc? ( app-text/docbook-sgml-utils[jadetex] =app-text/docbook-sgml-dtd-3.1* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/freetype-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=dev-libs/expat-1.95.3 abi_x86_32? ( amd64? ( app-emulation/emul-linux-x86-baselibs[development] ) !<=app-emulation/emul-linux-x86-xlibs-20130224 ) virtual/pkgconfig doc? ( app-text/docbook-sgml-utils[jadetex] =app-text/docbook-sgml-dtd-3.1* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for configuring and customizing font access
 EAPI=5
 HOMEPAGE=http://fontconfig.org/
@@ -10,5 +10,5 @@ PDEPEND=app-admin/eselect-fontconfig virtual/ttf-fonts
 RDEPEND=>=media-libs/freetype-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=dev-libs/expat-1.95.3 abi_x86_32? ( amd64? ( app-emulation/emul-linux-x86-baselibs[development] ) !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.10.91.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f0b1135ee6a47bf665ac33f34ade24b9
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.8.0-r1 b/metadata/md5-cache/media-libs/fontconfig-2.8.0-r1
index 485215013be8..e0aadc5ce14b 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.8.0-r1
+++ b/metadata/md5-cache/media-libs/fontconfig-2.8.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3 virtual/pkgconfig doc? ( app-text/docbook-sgml-utils[jadetex] =app-text/docbook-sgml-dtd-3.1* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3 virtual/pkgconfig doc? ( app-text/docbook-sgml-utils[jadetex] =app-text/docbook-sgml-dtd-3.1* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for configuring and customizing font access
 EAPI=2
 HOMEPAGE=http://fontconfig.org/
@@ -10,5 +10,5 @@ PDEPEND=app-admin/eselect-fontconfig virtual/ttf-fonts
 RDEPEND=>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.8.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fa7d5fafe24c561cd5f0119c444cec8f
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.8.0-r2 b/metadata/md5-cache/media-libs/fontconfig-2.8.0-r2
index 80f28c0b8057..90dc27b2afb0 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.8.0-r2
+++ b/metadata/md5-cache/media-libs/fontconfig-2.8.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3 virtual/pkgconfig doc? ( app-text/docbook-sgml-utils[jadetex] =app-text/docbook-sgml-dtd-3.1* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3 virtual/pkgconfig doc? ( app-text/docbook-sgml-utils[jadetex] =app-text/docbook-sgml-dtd-3.1* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for configuring and customizing font access
 EAPI=4
 HOMEPAGE=http://fontconfig.org/
@@ -10,5 +10,5 @@ PDEPEND=app-admin/eselect-fontconfig virtual/ttf-fonts
 RDEPEND=>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.8.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bcf1d7bf83f0c616e9f8b1b4c45d7352
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.9.0 b/metadata/md5-cache/media-libs/fontconfig-2.9.0
index 086c78567177..c587a78068ac 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.9.0
+++ b/metadata/md5-cache/media-libs/fontconfig-2.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3 virtual/pkgconfig doc? ( app-text/docbook-sgml-utils[jadetex] =app-text/docbook-sgml-dtd-3.1* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3 virtual/pkgconfig doc? ( app-text/docbook-sgml-utils[jadetex] =app-text/docbook-sgml-dtd-3.1* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for configuring and customizing font access
 EAPI=4
 HOMEPAGE=http://fontconfig.org/
@@ -10,5 +10,5 @@ PDEPEND=app-admin/eselect-fontconfig virtual/ttf-fonts
 RDEPEND=>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.9.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eff5b8f2164a8dd14b8364cd83ee2de8
diff --git a/metadata/md5-cache/media-libs/freealut-1.1.0-r1 b/metadata/md5-cache/media-libs/freealut-1.1.0-r1
index 364fef6eb8ae..ee63a7df7953 100644
--- a/metadata/md5-cache/media-libs/freealut-1.1.0-r1
+++ b/metadata/md5-cache/media-libs/freealut-1.1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=media-libs/openal || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/openal || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The OpenAL Utility Toolkit
 EAPI=2
 HOMEPAGE=http://www.openal.org/
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/openal
 SLOT=0
 SRC_URI=http://connect.creativelabs.com/openal/Downloads/ALUT/freealut-1.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a19afbc836607ace54cff4329e05cd39
diff --git a/metadata/md5-cache/media-libs/freeglut-2.6.0 b/metadata/md5-cache/media-libs/freeglut-2.6.0
index 950fb49952b8..9c8dae57a751 100644
--- a/metadata/md5-cache/media-libs/freeglut-2.6.0
+++ b/metadata/md5-cache/media-libs/freeglut-2.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=virtual/opengl virtual/glu >=x11-libs/libXi-1.3 x11-libs/libXxf86vm || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/opengl virtual/glu >=x11-libs/libXi-1.3 x11-libs/libXxf86vm || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library
 EAPI=3
 HOMEPAGE=http://freeglut.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=virtual/opengl virtual/glu >=x11-libs/libXi-1.3 x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=mirror://sourceforge/freeglut/freeglut-2.6.0.tar.gz mpx? ( http://tisch.sourceforge.net/freeglut-2.6.0-mpx-r6.patch )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1853daa8ff2139124e78962936e023c8
diff --git a/metadata/md5-cache/media-libs/freetype-1.4_pre20080316-r2 b/metadata/md5-cache/media-libs/freetype-1.4_pre20080316-r2
index d9c5523bf677..08726fd191ef 100644
--- a/metadata/md5-cache/media-libs/freetype-1.4_pre20080316-r2
+++ b/metadata/md5-cache/media-libs/freetype-1.4_pre20080316-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=kpathsea? ( virtual/tex-base ) >=sys-devel/autoconf-2.59 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=kpathsea? ( virtual/tex-base ) >=sys-devel/autoconf-2.59 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Freetype font rendering engine
 HOMEPAGE=http://www.freetype.org/
 IUSE=doc nls kpathsea
@@ -8,5 +8,5 @@ LICENSE=FTL
 RDEPEND=kpathsea? ( virtual/tex-base ) nls? ( sys-devel/gettext )
 SLOT=1
 SRC_URI=mirror://gentoo/freetype-1.4_pre20080316.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2eb0ebf4bb3836d9f4fa03622eb66dce
diff --git a/metadata/md5-cache/media-libs/freetype-2.4.11-r2 b/metadata/md5-cache/media-libs/freetype-2.4.11-r2
index fdf476e1216c..ef4d50ac7e42 100644
--- a/metadata/md5-cache/media-libs/freetype-2.4.11-r2
+++ b/metadata/md5-cache/media-libs/freetype-2.4.11-r2
@@ -9,5 +9,5 @@ LICENSE=FTL GPL-2
 RDEPEND=sys-libs/zlib amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs ) ) bzip2? ( app-arch/bzip2 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) infinality? ( media-libs/fontconfig-infinality ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=2
 SRC_URI=mirror://sourceforge/freetype/freetype-2.4.11.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.4.11.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.4.11.tar.bz2 ) infinality? ( http://dev.gentoo.org/~polynomial-c/freetype-2.4.11-infinality-patches.tar.xz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ad65725036bc44bf0b2ab32a3b6b7ffb
diff --git a/metadata/md5-cache/media-libs/freetype-2.4.9-r1 b/metadata/md5-cache/media-libs/freetype-2.4.9-r1
index dac2f55a67da..f2ab4f95a3e6 100644
--- a/metadata/md5-cache/media-libs/freetype-2.4.9-r1
+++ b/metadata/md5-cache/media-libs/freetype-2.4.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A high-quality and portable font engine
 EAPI=4
 HOMEPAGE=http://www.freetype.org/
@@ -9,5 +9,5 @@ LICENSE=FTL GPL-2
 RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp )
 SLOT=2
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=45a9edd28820ea17cba195a62a197e8d
diff --git a/metadata/md5-cache/media-libs/freeverb3-2.5.13-r2 b/metadata/md5-cache/media-libs/freeverb3-2.5.13-r2
index 5697425a0690..dcdcda3e793a 100644
--- a/metadata/md5-cache/media-libs/freeverb3-2.5.13-r2
+++ b/metadata/md5-cache/media-libs/freeverb3-2.5.13-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High Quality Reverb and Impulse Response Convolution library including XMMS/Audacious Effect plugins
 EAPI=2
 HOMEPAGE=http://freeverb3.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/freeverb3/freeverb3-2.5.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c705561d1902a0aa34e54de43b092b77
diff --git a/metadata/md5-cache/media-libs/ftgl-2.1.3_rc5 b/metadata/md5-cache/media-libs/ftgl-2.1.3_rc5
index 896cd7c89b95..c874fda189b6 100644
--- a/metadata/md5-cache/media-libs/ftgl-2.1.3_rc5
+++ b/metadata/md5-cache/media-libs/ftgl-2.1.3_rc5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/freetype-2.0.9 virtual/opengl virtual/glu media-libs/freeglut || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/freetype-2.0.9 virtual/opengl virtual/glu media-libs/freeglut || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=library to use arbitrary fonts in OpenGL applications
 EAPI=4
 HOMEPAGE=http://ftgl.wiki.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=media-libs/freetype-2.0.9 virtual/opengl virtual/glu media-libs/freeglut
 SLOT=0
 SRC_URI=mirror://sourceforge/ftgl/ftgl-2.1.3-rc5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=19670a455e5f19a0088a70937ac14fb0
diff --git a/metadata/md5-cache/media-libs/gavl-1.2.0 b/metadata/md5-cache/media-libs/gavl-1.2.0
index 37702cd89280..ca6de1342088 100644
--- a/metadata/md5-cache/media-libs/gavl-1.2.0
+++ b/metadata/md5-cache/media-libs/gavl-1.2.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 hppa ppc ~ppc64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/gmerlin/gavl-1.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=100da81137928f17719ccde5ea5403a5
diff --git a/metadata/md5-cache/media-libs/gavl-1.4.0 b/metadata/md5-cache/media-libs/gavl-1.4.0
index 6e2768847cef..b2d4b92463f8 100644
--- a/metadata/md5-cache/media-libs/gavl-1.4.0
+++ b/metadata/md5-cache/media-libs/gavl-1.4.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/gmerlin/gavl-1.4.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d3e07c365c104d114f513fe3b4c80b35
diff --git a/metadata/md5-cache/media-libs/gd-2.0.35-r3 b/metadata/md5-cache/media-libs/gd-2.0.35-r3
index 2e2361dd65c5..5a25e7170f5c 100644
--- a/metadata/md5-cache/media-libs/gd-2.0.35-r3
+++ b/metadata/md5-cache/media-libs/gd-2.0.35-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A graphics library for fast image creation
 EAPI=2
 HOMEPAGE=http://libgd.org/ http://www.boutell.com/gd/
@@ -9,5 +9,5 @@ LICENSE=gd IJG HPND BSD
 RDEPEND=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 )
 SLOT=2
 SRC_URI=http://libgd.org/releases/gd-2.0.35.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=84a637c725accb4302c1f05d94f7f25d
diff --git a/metadata/md5-cache/media-libs/gegl-0.1.6 b/metadata/md5-cache/media-libs/gegl-0.1.6
index 3d5774c2cb23..07865c4dd410 100644
--- a/metadata/md5-cache/media-libs/gegl-0.1.6
+++ b/metadata/md5-cache/media-libs/gegl-0.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=>=media-libs/babl-0.1.4 <media-libs/babl-0.1.8 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/babl-0.1.4 <media-libs/babl-0.1.8 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A graph based image processing framework
 EAPI=4
 HOMEPAGE=http://www.gegl.org/
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/babl-0.1.4 <media-libs/babl-0.1.8 dev-libs/glib:2 x11-libs/
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.gimp.org/pub/gegl/0.1/gegl-0.1.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2fd3741dca5ae00d635b759edd1d1eeb
diff --git a/metadata/md5-cache/media-libs/gegl-0.1.6-r1 b/metadata/md5-cache/media-libs/gegl-0.1.6-r1
index 24e3ede23930..85a064c187ab 100644
--- a/metadata/md5-cache/media-libs/gegl-0.1.6-r1
+++ b/metadata/md5-cache/media-libs/gegl-0.1.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=>=media-libs/babl-0.1.4 <media-libs/babl-0.1.8 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/babl-0.1.4 <media-libs/babl-0.1.8 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A graph based image processing framework
 EAPI=4
 HOMEPAGE=http://www.gegl.org/
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/babl-0.1.4 <media-libs/babl-0.1.8 dev-libs/glib:2 x11-libs/
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.gimp.org/pub/gegl/0.1/gegl-0.1.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e09e91d6d44d7fc26b19c7abb69ad24f
diff --git a/metadata/md5-cache/media-libs/gegl-0.1.8 b/metadata/md5-cache/media-libs/gegl-0.1.8
index 5fdc7d6a17ed..978ddbe19566 100644
--- a/metadata/md5-cache/media-libs/gegl-0.1.8
+++ b/metadata/md5-cache/media-libs/gegl-0.1.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/babl-0.1.6[introspection?] <media-libs/babl-0.1.8[introspection?] >=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 ) virtual/pkgconfig >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/babl-0.1.6[introspection?] <media-libs/babl-0.1.8[introspection?] >=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 ) virtual/pkgconfig >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A graph based image processing framework
 EAPI=4
 HOMEPAGE=http://www.gegl.org/
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/babl-0.1.6[introspection?] <media-libs/babl-0.1.8[introspec
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.gimp.org/pub/gegl/0.1/gegl-0.1.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cb7b3ab6484b3a80d2985bfc931e1ad9
diff --git a/metadata/md5-cache/media-libs/gegl-0.1.8-r1 b/metadata/md5-cache/media-libs/gegl-0.1.8-r1
index 669be251a806..dc480c01f068 100644
--- a/metadata/md5-cache/media-libs/gegl-0.1.8-r1
+++ b/metadata/md5-cache/media-libs/gegl-0.1.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/babl-0.1.6[introspection?] <media-libs/babl-0.1.8[introspection?] >=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 ) virtual/pkgconfig >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/babl-0.1.6[introspection?] <media-libs/babl-0.1.8[introspection?] >=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 ) virtual/pkgconfig >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A graph based image processing framework
 EAPI=4
 HOMEPAGE=http://www.gegl.org/
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/babl-0.1.6[introspection?] <media-libs/babl-0.1.8[introspec
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.gimp.org/pub/gegl/0.1/gegl-0.1.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0f6611b643e509efacc73eddb5ac3380
diff --git a/metadata/md5-cache/media-libs/gegl-0.2.0 b/metadata/md5-cache/media-libs/gegl-0.2.0
index be57e1ab945b..b617636e742d 100644
--- a/metadata/md5-cache/media-libs/gegl-0.2.0
+++ b/metadata/md5-cache/media-libs/gegl-0.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/babl-0.1.10[introspection?] >=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/intltool-0.40.1 virtual/pkgconfig >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/babl-0.1.10[introspection?] >=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/intltool-0.40.1 virtual/pkgconfig >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A graph based image processing framework
 EAPI=4
 HOMEPAGE=http://www.gegl.org/
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/babl-0.1.10[introspection?] >=dev-libs/glib-2.28:2 >=x11-li
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.gimp.org/pub/gegl/0.2/gegl-0.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4ded372e7b062dbd9a71a20fe1079f01
diff --git a/metadata/md5-cache/media-libs/gegl-0.2.0-r1 b/metadata/md5-cache/media-libs/gegl-0.2.0-r1
index 6442efaab1a0..68b0c4bf4b51 100644
--- a/metadata/md5-cache/media-libs/gegl-0.2.0-r1
+++ b/metadata/md5-cache/media-libs/gegl-0.2.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/babl-0.1.10[introspection?] >=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/intltool-0.40.1 virtual/pkgconfig >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/babl-0.1.10[introspection?] >=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/intltool-0.40.1 virtual/pkgconfig >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A graph based image processing framework
 EAPI=4
 HOMEPAGE=http://www.gegl.org/
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/babl-0.1.10[introspection?] >=dev-libs/glib-2.28:2 >=x11-li
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.gimp.org/pub/gegl/0.2/gegl-0.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ec882baf6b54bc62b84d3b324f631a56
diff --git a/metadata/md5-cache/media-libs/gegl-9999 b/metadata/md5-cache/media-libs/gegl-9999
index 462b7e30cee7..8a8a6d710d75 100644
--- a/metadata/md5-cache/media-libs/gegl-9999
+++ b/metadata/md5-cache/media-libs/gegl-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=media-libs/babl-0.1.10[introspection?] >=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/intltool-0.40.1 virtual/pkgconfig >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=media-libs/babl-0.1.10[introspection?] >=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/intltool-0.40.1 virtual/pkgconfig >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=A graph based image processing framework
 EAPI=4
 HOMEPAGE=http://www.gegl.org/
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=media-libs/babl-0.1.10[introspection?] >=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 )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9ef771a58d154014adad48f6636cfeec
diff --git a/metadata/md5-cache/media-libs/glu-9.0.0 b/metadata/md5-cache/media-libs/glu-9.0.0
index 5c5a13295eff..6eab7c71df70 100644
--- a/metadata/md5-cache/media-libs/glu-9.0.0
+++ b/metadata/md5-cache/media-libs/glu-9.0.0
@@ -9,5 +9,5 @@ LICENSE=SGI-B-2.0
 RDEPEND=virtual/opengl !<media-libs/mesa-9 multilib? ( !app-emulation/emul-linux-x86-opengl )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/glu/glu-9.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fa7721e1483a2f8b8c171cc7690476f6
diff --git a/metadata/md5-cache/media-libs/grilo-0.1.18-r1 b/metadata/md5-cache/media-libs/grilo-0.1.18-r1
index 5f6ca89310c3..3210edb9adac 100644
--- a/metadata/md5-cache/media-libs/grilo-0.1.18-r1
+++ b/metadata/md5-cache/media-libs/grilo-0.1.18-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.22:2 dev-libs/libxml2:2 gtk? ( >=x11-libs/gtk+-3.0:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9 ) network? ( >=net-libs/libsoup-2.33.4:2.4 ) virtual/pkgconfig gnome-base/gnome-common doc? ( >=dev-util/gtk-doc-1.10 ) vala? ( dev-lang/vala:0.12[vapigen] ) test? ( dev-python/pygobject:2 dev-python/pygobject:3 media-plugins/grilo-plugins:0.1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.22:2 dev-libs/libxml2:2 gtk? ( >=x11-libs/gtk+-3.0:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9 ) network? ( >=net-libs/libsoup-2.33.4:2.4 ) virtual/pkgconfig gnome-base/gnome-common doc? ( >=dev-util/gtk-doc-1.10 ) vala? ( dev-lang/vala:0.12[vapigen] ) test? ( dev-python/pygobject:2 dev-python/pygobject:3 media-plugins/grilo-plugins:0.1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A framework for easy media discovery and browsing
 EAPI=4
 HOMEPAGE=https://live.gnome.org/Grilo
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.22:2 dev-libs/libxml2:2 gtk? ( >=x11-libs/gtk+-3.0:3 )
 RESTRICT=test
 SLOT=0.1
 SRC_URI=mirror://gnome/sources/grilo/0.1/grilo-0.1.18.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f643dffaf9ee7f47ed5d848868e85b46
diff --git a/metadata/md5-cache/media-libs/guilib-1.2.1 b/metadata/md5-cache/media-libs/guilib-1.2.1
index 567f1ffabf45..d52870e62a7c 100644
--- a/metadata/md5-cache/media-libs/guilib-1.2.1
+++ b/metadata/md5-cache/media-libs/guilib-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/libsdl-1.0.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libsdl-1.0.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a simple widget set for SDL
 EAPI=4
 HOMEPAGE=http://www.libsdl.org/projects/GUIlib/
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=media-libs/libsdl-1.0.1
 SLOT=0
 SRC_URI=http://www.libsdl.org/projects/GUIlib/src/GUIlib-1.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=66cb2fb3ba6bc116f758c1d61e01d104
diff --git a/metadata/md5-cache/media-libs/hamlib-1.2.15 b/metadata/md5-cache/media-libs/hamlib-1.2.15
index 40909e42dbc4..7207a851968c 100644
--- a/metadata/md5-cache/media-libs/hamlib-1.2.15
+++ b/metadata/md5-cache/media-libs/hamlib-1.2.15
@@ -10,5 +10,5 @@ RDEPEND==virtual/libusb-0* dev-libs/libxml2 tcl? ( dev-lang/tcl ) python? ( =dev
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/hamlib/hamlib-1.2.15.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0ec21a792dd2db52e4c3d32d93109f95
diff --git a/metadata/md5-cache/media-libs/hamlib-1.2.15.2 b/metadata/md5-cache/media-libs/hamlib-1.2.15.2
index 939a56c68b0c..0df3bff26a23 100644
--- a/metadata/md5-cache/media-libs/hamlib-1.2.15.2
+++ b/metadata/md5-cache/media-libs/hamlib-1.2.15.2
@@ -10,5 +10,5 @@ RDEPEND==virtual/libusb-0* dev-libs/libxml2 tcl? ( dev-lang/tcl ) python? ( =dev
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/hamlib/hamlib-1.2.15.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=02fea34d7834149ba5bad8fea98d9f22
diff --git a/metadata/md5-cache/media-libs/hamlib-1.2.15.3 b/metadata/md5-cache/media-libs/hamlib-1.2.15.3
index dff2a63f202d..4e6c7c0c4085 100644
--- a/metadata/md5-cache/media-libs/hamlib-1.2.15.3
+++ b/metadata/md5-cache/media-libs/hamlib-1.2.15.3
@@ -10,5 +10,5 @@ RDEPEND==virtual/libusb-0* dev-libs/libxml2 tcl? ( dev-lang/tcl ) python? ( =dev
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/hamlib/hamlib-1.2.15.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0bac7576ce53aea853396c6b43d40135
diff --git a/metadata/md5-cache/media-libs/harfbuzz-0.9.12 b/metadata/md5-cache/media-libs/harfbuzz-0.9.12
index 1fd38cecd67f..c2f6b66a38df 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-0.9.12
+++ b/metadata/md5-cache/media-libs/harfbuzz-0.9.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 dev-libs/icu:= media-gfx/graphite2:= media-libs/freetype:2= x11-libs/cairo:= virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 dev-libs/icu:= media-gfx/graphite2:= media-libs/freetype:2= x11-libs/cairo:= virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An OpenType text shaping engine
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/HarfBuzz
@@ -9,5 +9,5 @@ LICENSE=Old-MIT ISC icu
 RDEPEND=dev-libs/glib:2 dev-libs/icu:= media-gfx/graphite2:= media-libs/freetype:2= x11-libs/cairo:=
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.12.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7295965654ccf5facce6468774c90285
diff --git a/metadata/md5-cache/media-libs/harfbuzz-9999 b/metadata/md5-cache/media-libs/harfbuzz-9999
index 51a2042c16e3..60e6530cd8f1 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-9999
+++ b/metadata/md5-cache/media-libs/harfbuzz-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/glib:2 dev-libs/icu:= media-gfx/graphite2:= media-libs/freetype:2= x11-libs/cairo:= virtual/pkgconfig dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 dev-libs/icu:= media-gfx/graphite2:= media-libs/freetype:2= x11-libs/cairo:= virtual/pkgconfig dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An OpenType text shaping engine
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/HarfBuzz
@@ -7,5 +7,5 @@ IUSE=static-libs
 LICENSE=Old-MIT ISC icu
 RDEPEND=dev-libs/glib:2 dev-libs/icu:= media-gfx/graphite2:= media-libs/freetype:2= x11-libs/cairo:=
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9a8b854f985c30ceeb15db9f1a6a96e5
diff --git a/metadata/md5-cache/media-libs/id3lib-3.8.3-r8 b/metadata/md5-cache/media-libs/id3lib-3.8.3-r8
index 762511b63dfc..8183f36a7090 100644
--- a/metadata/md5-cache/media-libs/id3lib-3.8.3-r8
+++ b/metadata/md5-cache/media-libs/id3lib-3.8.3-r8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Id3 library for C/C++
 EAPI=4
 HOMEPAGE=http://id3lib.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9601db14f97d4e8eb55851989f76c401
diff --git a/metadata/md5-cache/media-libs/ilmbase-2.0.0 b/metadata/md5-cache/media-libs/ilmbase-2.0.0
index 2ec9732850c4..4474adf7463e 100644
--- a/metadata/md5-cache/media-libs/ilmbase-2.0.0
+++ b/metadata/md5-cache/media-libs/ilmbase-2.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenEXR ILM Base libraries
 EAPI=5
 HOMEPAGE=http://openexr.com/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 -arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86
 LICENSE=BSD
 SLOT=0/10
 SRC_URI=http://dev.gentoo.org/~ssuominen/openexr-2.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=780ee16f453fb1af970d998a8d9658a5
diff --git a/metadata/md5-cache/media-libs/imlib-1.9.15-r3 b/metadata/md5-cache/media-libs/imlib-1.9.15-r3
index a8d5ae4c3c0e..a776b341780c 100644
--- a/metadata/md5-cache/media-libs/imlib-1.9.15-r3
+++ b/metadata/md5-cache/media-libs/imlib-1.9.15-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Image loading and rendering library
 EAPI=2
 HOMEPAGE=http://ftp.acc.umu.se/pub/GNOME/sources/imlib/1.9/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://gnome/sources/imlib/1.9/imlib-1.9.15.tar.bz2 mirror://gentoo/gtk-1-for-imlib.m4.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=46469b6b36fe68065f95fabaf6dfc66f
diff --git a/metadata/md5-cache/media-libs/jasper-1.900.1-r6 b/metadata/md5-cache/media-libs/jasper-1.900.1-r6
index 4a100868f83b..55cd98c38092 100644
--- a/metadata/md5-cache/media-libs/jasper-1.900.1-r6
+++ b/metadata/md5-cache/media-libs/jasper-1.900.1-r6
@@ -9,5 +9,5 @@ LICENSE=JasPer2.0
 RDEPEND=jpeg? ( virtual/jpeg amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs ) ) ) opengl? ( virtual/opengl media-libs/freeglut amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-opengl ) ) )
 SLOT=0
 SRC_URI=http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip mirror://gentoo/jasper-1.900.1-fixes-20120611.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7e2ae81bfb1d33951e2a533dd5ddb57d
diff --git a/metadata/md5-cache/media-libs/jbig2dec-0.11-r1 b/metadata/md5-cache/media-libs/jbig2dec-0.11-r1
index 7eec740df27c..9a2508cffa80 100644
--- a/metadata/md5-cache/media-libs/jbig2dec-0.11-r1
+++ b/metadata/md5-cache/media-libs/jbig2dec-0.11-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=png? ( >=media-libs/libpng-1.2:0 ) test? ( app-arch/unzip ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=png? ( >=media-libs/libpng-1.2:0 ) test? ( app-arch/unzip ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A decoder implementation of the JBIG2 image compression format
 EAPI=4
 HOMEPAGE=http://jbig2dec.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=png? ( >=media-libs/libpng-1.2:0 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ghostscript.com/~giles/jbig2/jbig2dec/jbig2dec-0.11.tar.gz test? ( http://jbig2dec.sourceforge.net/ubc/jb2streams.zip )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4a193ac596e13ff53ce286ee2f416cbd
diff --git a/metadata/md5-cache/media-libs/jbig2enc-0.28 b/metadata/md5-cache/media-libs/jbig2enc-0.28
index f195489a0411..460019f3abec 100644
--- a/metadata/md5-cache/media-libs/jbig2enc-0.28
+++ b/metadata/md5-cache/media-libs/jbig2enc-0.28
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/leptonica[gif?,jpeg?,png?,tiff?,webp?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/leptonica[gif?,jpeg?,png?,tiff?,webp?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=JBIG2 Encoder and libs
 EAPI=5
 HOMEPAGE=https://github.com/agl/jbig2enc
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=media-libs/leptonica[gif?,jpeg?,png?,tiff?,webp?]
 SLOT=0
 SRC_URI=https://github.com/agl/jbig2enc/archive/0.28.tar.gz -> jbig2enc-0.28.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=115385a10357aac7c9a53a8b83fe7c5c
diff --git a/metadata/md5-cache/media-libs/lcms-1.19 b/metadata/md5-cache/media-libs/lcms-1.19
index e02bc154209e..34da99caa2e8 100644
--- a/metadata/md5-cache/media-libs/lcms-1.19
+++ b/metadata/md5-cache/media-libs/lcms-1.19
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=tiff? ( media-libs/tiff:0 ) jpeg? ( virtual/jpeg ) zlib? ( sys-libs/zlib ) python? ( >=dev-lang/swig-1.3.31 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=tiff? ( media-libs/tiff:0 ) jpeg? ( virtual/jpeg ) zlib? ( sys-libs/zlib ) python? ( >=dev-lang/swig-1.3.31 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=A lightweight, speed optimized color management engine
 EAPI=3
 HOMEPAGE=http://www.littlecms.com/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=tiff? ( media-libs/tiff:0 ) jpeg? ( virtual/jpeg ) zlib? ( sys-libs/zlib ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://www.littlecms.com/lcms-1.19.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=96ce5758aef885df1932b58f3c0e65b1
diff --git a/metadata/md5-cache/media-libs/leptonica-1.68 b/metadata/md5-cache/media-libs/leptonica-1.68
index 6e2c59267f8e..3cc0fb83baf2 100644
--- a/metadata/md5-cache/media-libs/leptonica-1.68
+++ b/metadata/md5-cache/media-libs/leptonica-1.68
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) webp? ( media-libs/libwebp ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://www.leptonica.com/source/leptonica-1.68.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b6d5f08efd41c066c1d71d04832ab749
diff --git a/metadata/md5-cache/media-libs/leptonica-1.69 b/metadata/md5-cache/media-libs/leptonica-1.69
index cb35aaf61d6b..a3ea9d740f13 100644
--- a/metadata/md5-cache/media-libs/leptonica-1.69
+++ b/metadata/md5-cache/media-libs/leptonica-1.69
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) webp? ( media-libs/libwebp ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://www.leptonica.com/source/leptonica-1.69.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8a960409132e99a7855d01d41d09c89a
diff --git a/metadata/md5-cache/media-libs/libXcm-0.5.2-r1 b/metadata/md5-cache/media-libs/libXcm-0.5.2-r1
index b14eb12818f0..81772c3f0dea 100644
--- a/metadata/md5-cache/media-libs/libXcm-0.5.2-r1
+++ b/metadata/md5-cache/media-libs/libXcm-0.5.2-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=X? ( x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/oyranos/libXcm/libXcm-0.4.x/libXcm-0.5.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=03432fa8015f9ffb309b3d349a71543b
diff --git a/metadata/md5-cache/media-libs/libaacplus-2.0.2 b/metadata/md5-cache/media-libs/libaacplus-2.0.2
index 97a5d5f16081..dd46a476369b 100644
--- a/metadata/md5-cache/media-libs/libaacplus-2.0.2
+++ b/metadata/md5-cache/media-libs/libaacplus-2.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!media-sound/aacplusenc fftw? ( sci-libs/fftw:3.0 ) app-arch/unzip virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!media-sound/aacplusenc fftw? ( sci-libs/fftw:3.0 ) app-arch/unzip virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HE-AAC+ v2 library, based on the reference implementation
 EAPI=4
 HOMEPAGE=http://tipok.org.ua/node/17
@@ -11,5 +11,5 @@ REQUIRED_USE=!bindist
 RESTRICT=mirror
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=73476a57e840d4d015b35d10700a2c39
diff --git a/metadata/md5-cache/media-libs/libaacs-0.5.0 b/metadata/md5-cache/media-libs/libaacs-0.5.0
index bdcee3a180e2..354a074c3c2b 100644
--- a/metadata/md5-cache/media-libs/libaacs-0.5.0
+++ b/metadata/md5-cache/media-libs/libaacs-0.5.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt dev-libs/libgpg-error
 SLOT=0
 SRC_URI=ftp://ftp.videolan.org/pub/videolan/libaacs/0.5.0/libaacs-0.5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=33cd59aa56b32a0006163d59494b63fc
diff --git a/metadata/md5-cache/media-libs/libaacs-0.6.0 b/metadata/md5-cache/media-libs/libaacs-0.6.0
index c89967011423..2a48e7f9261e 100644
--- a/metadata/md5-cache/media-libs/libaacs-0.6.0
+++ b/metadata/md5-cache/media-libs/libaacs-0.6.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt dev-libs/libgpg-error
 SLOT=0
 SRC_URI=ftp://ftp.videolan.org/pub/videolan/libaacs/0.6.0/libaacs-0.6.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0bee590a689c0e86302255a66fac1519
diff --git a/metadata/md5-cache/media-libs/libafterimage-1.20 b/metadata/md5-cache/media-libs/libafterimage-1.20
index 32d31b5538d7..96d27bbc1cce 100644
--- a/metadata/md5-cache/media-libs/libafterimage-1.20
+++ b/metadata/md5-cache/media-libs/libafterimage-1.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) virtual/pkgconfig x11-proto/xextproto !!x11-wm/afterstep || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig x11-proto/xextproto !!x11-wm/afterstep || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Afterstep's standalone generic image manipulation library
 EAPI=3
 HOMEPAGE=http://www.afterstep.org/afterimage/index.php
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=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 )
 SLOT=0
 SRC_URI=ftp://ftp.afterstep.org/stable/libAfterImage/libAfterImage-1.20.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8a573141fe0f651ce5e1595309e38938
diff --git a/metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r1 b/metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r1
index f10022b86b6d..ce7ab0982013 100644
--- a/metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r1
+++ b/metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=a LGPL version of libart
 EAPI=3
 HOMEPAGE=http://www.levien.com/libart
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.21.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9e090bada2449caf6a04c85f9772d0cc
diff --git a/metadata/md5-cache/media-libs/libbluray-0.2.2 b/metadata/md5-cache/media-libs/libbluray-0.2.2
index 05f977da7bbb..2258556c691c 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.2.2
+++ b/metadata/md5-cache/media-libs/libbluray-0.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install preinst prepare setup
-DEPEND=xml? ( dev-libs/libxml2 ) java? ( >=virtual/jdk-1.6 dev-java/ant-core ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=xml? ( dev-libs/libxml2 ) java? ( >=virtual/jdk-1.6 dev-java/ant-core ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=Blu-ray playback libraries
 EAPI=4
 HOMEPAGE=http://www.videolan.org/developers/libbluray.html
@@ -10,5 +10,5 @@ RDEPEND=xml? ( dev-libs/libxml2 ) aacs? ( media-libs/libaacs ) java? ( >=virtual
 REQUIRED_USE=utils? ( static-libs )
 SLOT=0
 SRC_URI=ftp://ftp.videolan.org/pub/videolan/libbluray/0.2.2/libbluray-0.2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b573824a9d31ae334f5bc420c6156c54
diff --git a/metadata/md5-cache/media-libs/libbluray-0.2.3 b/metadata/md5-cache/media-libs/libbluray-0.2.3
index f26be558943e..58dbb7f5b7a6 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.2.3
+++ b/metadata/md5-cache/media-libs/libbluray-0.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install preinst prepare setup
-DEPEND=xml? ( dev-libs/libxml2 ) java? ( >=virtual/jdk-1.6 dev-java/ant-core ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=xml? ( dev-libs/libxml2 ) java? ( >=virtual/jdk-1.6 dev-java/ant-core ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=Blu-ray playback libraries
 EAPI=4
 HOMEPAGE=http://www.videolan.org/developers/libbluray.html
@@ -10,5 +10,5 @@ RDEPEND=xml? ( dev-libs/libxml2 ) aacs? ( media-libs/libaacs ) java? ( >=virtual
 REQUIRED_USE=utils? ( static-libs )
 SLOT=0
 SRC_URI=ftp://ftp.videolan.org/pub/videolan/libbluray/0.2.3/libbluray-0.2.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=de04e08be180dfa2a2203e46eb843881
diff --git a/metadata/md5-cache/media-libs/libbluray-9999 b/metadata/md5-cache/media-libs/libbluray-9999
index 7efc8aa09f66..9a4459057d94 100644
--- a/metadata/md5-cache/media-libs/libbluray-9999
+++ b/metadata/md5-cache/media-libs/libbluray-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install preinst prepare setup unpack
-DEPEND=xml? ( dev-libs/libxml2 ) java? ( >=virtual/jdk-1.6 dev-java/ant-core ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) dev-vcs/git
+DEPEND=xml? ( dev-libs/libxml2 ) java? ( >=virtual/jdk-1.6 dev-java/ant-core ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) dev-vcs/git
 DESCRIPTION=Blu-ray playback libraries
 EAPI=4
 HOMEPAGE=http://www.videolan.org/developers/libbluray.html
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=xml? ( dev-libs/libxml2 ) aacs? ( media-libs/libaacs ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=utils? ( static-libs )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2a9cd217b9b38740f8dfd99a288922eb
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta17 b/metadata/md5-cache/media-libs/libcaca-0.99_beta17
index a13853d2bf19..dca46648a84a 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta17
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install preinst prepare setup
-DEPEND=imlib? ( media-libs/imlib2 ) mono? ( dev-lang/mono ) ncurses? ( >=sys-libs/ncurses-5.3 ) opengl? ( virtual/glu 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 ) virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base dev-texlive/texlive-fontsrecommended ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=imlib? ( media-libs/imlib2 ) mono? ( dev-lang/mono ) ncurses? ( >=sys-libs/ncurses-5.3 ) opengl? ( virtual/glu 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 ) virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base dev-texlive/texlive-fontsrecommended ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=A library that creates colored ASCII-art graphics
 EAPI=2
 HOMEPAGE=http://libcaca.zoy.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 ISC LGPL-2.1 WTFPL-2
 RDEPEND=imlib? ( media-libs/imlib2 ) mono? ( dev-lang/mono ) ncurses? ( >=sys-libs/ncurses-5.3 ) opengl? ( virtual/glu 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 )
 SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta17.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8db71f475093b293fc2f142441135723
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta18 b/metadata/md5-cache/media-libs/libcaca-0.99_beta18
index 115be0c62dfe..8233e8891488 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta18
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=imlib? ( media-libs/imlib2 ) mono? ( dev-lang/mono ) ncurses? ( >=sys-libs/ncurses-5.3 ) opengl? ( virtual/glu 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 ) virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-tex/xcolor ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+DEPEND=imlib? ( media-libs/imlib2 ) mono? ( dev-lang/mono ) ncurses? ( >=sys-libs/ncurses-5.3 ) opengl? ( virtual/glu 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 ) virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-tex/xcolor ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 DESCRIPTION=A library that creates colored ASCII-art graphics
 EAPI=4
 HOMEPAGE=http://libcaca.zoy.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 ISC LGPL-2.1 WTFPL-2
 RDEPEND=imlib? ( media-libs/imlib2 ) mono? ( dev-lang/mono ) ncurses? ( >=sys-libs/ncurses-5.3 ) opengl? ( virtual/glu 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 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta18.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e40a83f4210af4badf3384b9653a675e
diff --git a/metadata/md5-cache/media-libs/libcanberra-0.29 b/metadata/md5-cache/media-libs/libcanberra-0.29
index 5fcfb9637bdb..bf669ff06573 100644
--- a/metadata/md5-cache/media-libs/libcanberra-0.29
+++ b/metadata/md5-cache/media-libs/libcanberra-0.29
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libvorbis >=sys-devel/libtool-2.2.6b alsa? ( media-libs/alsa-lib udev? ( >=virtual/udev-171 ) ) gstreamer? ( >=media-libs/gstreamer-0.10.15:0.10 ) gtk? ( >=x11-libs/gtk+-2.20.0:2 ) gtk3? ( x11-libs/gtk+:3 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) tdb? ( sys-libs/tdb ) app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libvorbis >=sys-devel/libtool-2.2.6b alsa? ( media-libs/alsa-lib udev? ( >=virtual/udev-171 ) ) gstreamer? ( >=media-libs/gstreamer-0.10.15:0.10 ) gtk? ( >=x11-libs/gtk+-2.20.0:2 ) gtk3? ( x11-libs/gtk+:3 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) tdb? ( sys-libs/tdb ) app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Portable sound event library
 EAPI=4
 HOMEPAGE=http://0pointer.de/lennart/projects/libcanberra/
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libvorbis >=sys-devel/libtool-2.2.6b alsa? ( media-libs/alsa-
 REQUIRED_USE=udev? ( alsa )
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.29.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fbe35f7eeca670dd2bba535c4f1a1583
diff --git a/metadata/md5-cache/media-libs/libcdr-9999 b/metadata/md5-cache/media-libs/libcdr-9999
index 1912ea0659b6..e598933103f2 100644
--- a/metadata/md5-cache/media-libs/libcdr-9999
+++ b/metadata/md5-cache/media-libs/libcdr-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 dev-libs/icu:= media-libs/lcms:2 sys-libs/zlib dev-libs/boost sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 dev-libs/icu:= media-libs/lcms:2 sys-libs/zlib dev-libs/boost sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Library parsing the Corel cdr documents
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/libcdr
@@ -7,5 +7,5 @@ IUSE=doc static-libs
 LICENSE=LGPL-2.1
 RDEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 dev-libs/icu:= media-libs/lcms:2 sys-libs/zlib
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d6e213202422d99cad0db52cf949e0b0
diff --git a/metadata/md5-cache/media-libs/libdc1394-2.1.3-r1 b/metadata/md5-cache/media-libs/libdc1394-2.1.3-r1
index ecbee9afa0f1..20c228381810 100644
--- a/metadata/md5-cache/media-libs/libdc1394-2.1.3-r1
+++ b/metadata/md5-cache/media-libs/libdc1394-2.1.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-libs/libraw1394-1.2.0 virtual/libusb:1 X? ( x11-libs/libSM x11-libs/libXv ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/libraw1394-1.2.0 virtual/libusb:1 X? ( x11-libs/libSM x11-libs/libXv ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library to interface with IEEE 1394 cameras following the IIDC specification
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/libdc1394/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-libs/libraw1394-1.2.0 virtual/libusb:1 X? ( x11-libs/libSM x11-libs/libXv )
 SLOT=2
 SRC_URI=mirror://sourceforge/libdc1394/libdc1394-2.1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=90c0a41f7f912e1e1468f399b8959bb6
diff --git a/metadata/md5-cache/media-libs/libdca-0.0.5-r2 b/metadata/md5-cache/media-libs/libdca-0.0.5-r2
index 776917ca8644..df2587b83451 100644
--- a/metadata/md5-cache/media-libs/libdca-0.0.5-r2
+++ b/metadata/md5-cache/media-libs/libdca-0.0.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=!media-libs/libdts || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!media-libs/libdts || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=library for decoding DTS Coherent Acoustics streams used in DVD
 EAPI=3
 HOMEPAGE=http://www.videolan.org/developers/libdca.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!media-libs/libdts
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c91fbaa0ca425da99b7ce624e06db249
diff --git a/metadata/md5-cache/media-libs/libdiscid-0.3.0 b/metadata/md5-cache/media-libs/libdiscid-0.3.0
index 0fd940098af0..9cd2378dd9b6 100644
--- a/metadata/md5-cache/media-libs/libdiscid-0.3.0
+++ b/metadata/md5-cache/media-libs/libdiscid-0.3.0
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/libdiscid-0.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ba44224cd3b4daf5e97b616af240a725
diff --git a/metadata/md5-cache/media-libs/libdiscid-0.5.0 b/metadata/md5-cache/media-libs/libdiscid-0.5.0
index 2e7b64729656..b0bab7e1dca2 100644
--- a/metadata/md5-cache/media-libs/libdiscid-0.5.0
+++ b/metadata/md5-cache/media-libs/libdiscid-0.5.0
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/libdiscid-0.5.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=673d17e01f7d1533b5fea778340eeab5
diff --git a/metadata/md5-cache/media-libs/libdvb-0.5.5.1-r3 b/metadata/md5-cache/media-libs/libdvb-0.5.5.1-r3
index ff4a9dee7e06..f52a36963e6d 100644
--- a/metadata/md5-cache/media-libs/libdvb-0.5.5.1-r3
+++ b/metadata/md5-cache/media-libs/libdvb-0.5.5.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=virtual/linuxtv-dvb-headers || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/linuxtv-dvb-headers || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=libdvb package with added CAM library and libdvbmpegtools as well as dvb-mpegtools
 HOMEPAGE=http://www.metzlerbros.org/dvb/
 IUSE=doc
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/linuxtv-dvb-headers
 SLOT=0
 SRC_URI=http://www.metzlerbros.org/dvb/libdvb-0.5.5.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e64d44065325882fbe6cdf6c6d4f5631
diff --git a/metadata/md5-cache/media-libs/libdvdcss-1.2.12 b/metadata/md5-cache/media-libs/libdvdcss-1.2.12
index 08181540b96f..ec313f4e1104 100644
--- a/metadata/md5-cache/media-libs/libdvdcss-1.2.12
+++ b/metadata/md5-cache/media-libs/libdvdcss-1.2.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=doc? ( app-doc/doxygen virtual/latex-base dev-tex/xcolor dev-texlive/texlive-latexextra ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen virtual/latex-base dev-tex/xcolor dev-texlive/texlive-latexextra ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A portable abstraction library for DVD decryption
 EAPI=4
 HOMEPAGE=http://www.videolan.org/developers/libdvdcss.html
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86
 LICENSE=GPL-2
 SLOT=1.2
 SRC_URI=http://www.videolan.org/pub/libdvdcss/1.2.12/libdvdcss-1.2.12.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=da4e02a792708972f5a2ed5e9f368b17
diff --git a/metadata/md5-cache/media-libs/libdvdcss-1.2.13 b/metadata/md5-cache/media-libs/libdvdcss-1.2.13
index 9a98eba7471b..72d1afa036bc 100644
--- a/metadata/md5-cache/media-libs/libdvdcss-1.2.13
+++ b/metadata/md5-cache/media-libs/libdvdcss-1.2.13
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86
 LICENSE=GPL-2
 SLOT=1.2
 SRC_URI=http://www.videolan.org/pub/libdvdcss/1.2.13/libdvdcss-1.2.13.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bcd611a766a0a217a9bcf18a8d73043d
diff --git a/metadata/md5-cache/media-libs/libdvdnav-4.2.0 b/metadata/md5-cache/media-libs/libdvdnav-4.2.0
index 5afac51c451a..c1526fd3f386 100644
--- a/metadata/md5-cache/media-libs/libdvdnav-4.2.0
+++ b/metadata/md5-cache/media-libs/libdvdnav-4.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=media-libs/libdvdread-4.2.0 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libdvdread-4.2.0 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for DVD navigation tools
 EAPI=4
 HOMEPAGE=http://dvdnav.mplayerhq.hu/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libdvdread-4.2.0
 SLOT=0
 SRC_URI=http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5efa368f8e5c4c10fc14a7107d0778d0
diff --git a/metadata/md5-cache/media-libs/libdvdnav-9999 b/metadata/md5-cache/media-libs/libdvdnav-9999
index 66b582440db5..d28cb9644701 100644
--- a/metadata/md5-cache/media-libs/libdvdnav-9999
+++ b/metadata/md5-cache/media-libs/libdvdnav-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install preinst prepare unpack
-DEPEND=>=media-libs/libdvdread-9999 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=>=media-libs/libdvdread-9999 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=Library for DVD navigation tools
 EAPI=4
 HOMEPAGE=http://dvdnav.mplayerhq.hu/
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdvdread-9999
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0f4f08ab6fcd014837487a3b10f0a8f4
diff --git a/metadata/md5-cache/media-libs/libdvdread-4.2.0 b/metadata/md5-cache/media-libs/libdvdread-4.2.0
index 25c535ba95ee..7746b7c3cddf 100644
--- a/metadata/md5-cache/media-libs/libdvdread-4.2.0
+++ b/metadata/md5-cache/media-libs/libdvdread-4.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=!<media-libs/libdvdnav-4.2.0 css? ( media-libs/libdvdcss ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!<media-libs/libdvdnav-4.2.0 css? ( media-libs/libdvdcss ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for DVD navigation tools
 EAPI=4
 HOMEPAGE=http://dvdnav.mplayerhq.hu/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<media-libs/libdvdnav-4.2.0 css? ( media-libs/libdvdcss )
 SLOT=0
 SRC_URI=http://dvdnav.mplayerhq.hu/releases/libdvdread-4.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=334a750cc06a740d114e62f0cf2fa84e
diff --git a/metadata/md5-cache/media-libs/libdvdread-9999 b/metadata/md5-cache/media-libs/libdvdread-9999
index 735be8d27dcf..a014f937a9b9 100644
--- a/metadata/md5-cache/media-libs/libdvdread-9999
+++ b/metadata/md5-cache/media-libs/libdvdread-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install preinst prepare unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=Library for DVD navigation tools
 EAPI=4
 HOMEPAGE=http://dvdnav.mplayerhq.hu/
 IUSE=+css
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=abebde53916048199b13bb22f2fb2bc6
diff --git a/metadata/md5-cache/media-libs/libemf-1.0.4 b/metadata/md5-cache/media-libs/libemf-1.0.4
index b4b592c30847..612ef7411a6d 100644
--- a/metadata/md5-cache/media-libs/libemf-1.0.4
+++ b/metadata/md5-cache/media-libs/libemf-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library implementation of ECMA-234 API for the generation of enhanced metafiles.
 EAPI=4
 HOMEPAGE=http://libemf.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/libemf/libEMF-1.0.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f6e28c4bdeb49b6dd7bff440507d6f18
diff --git a/metadata/md5-cache/media-libs/libexif-gtk-0.3.5-r2 b/metadata/md5-cache/media-libs/libexif-gtk-0.3.5-r2
index 10cda5314916..f99a79d115a5 100644
--- a/metadata/md5-cache/media-libs/libexif-gtk-0.3.5-r2
+++ b/metadata/md5-cache/media-libs/libexif-gtk-0.3.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/gtk+:2 >=media-libs/libexif-0.6.12 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 >=media-libs/libexif-0.6.12 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK+ frontend to the libexif library (parsing, editing, and saving EXIF data)
 EAPI=4
 HOMEPAGE=http://libexif.sf.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 >=media-libs/libexif-0.6.12
 SLOT=0
 SRC_URI=mirror://sourceforge/libexif/libexif-gtk-0.3.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=19b8cb877a15a37a75c9468d23ec6b80
diff --git a/metadata/md5-cache/media-libs/libfame-0.9.1-r1 b/metadata/md5-cache/media-libs/libfame-0.9.1-r1
index a9d24d4b288d..c4e2bf10274b 100644
--- a/metadata/md5-cache/media-libs/libfame-0.9.1-r1
+++ b/metadata/md5-cache/media-libs/libfame-0.9.1-r1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/fame/libfame-0.9.1.tar.gz http://digilander.libero.it/dgp85/gentoo/libfame-patches-2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e15ab3b07f502046d5c570d52e9bd6b1
diff --git a/metadata/md5-cache/media-libs/libgii-1.0.2 b/metadata/md5-cache/media-libs/libgii-1.0.2
index eee52c10bfb5..1b132f9533c9 100644
--- a/metadata/md5-cache/media-libs/libgii-1.0.2
+++ b/metadata/md5-cache/media-libs/libgii-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libXxf86dga ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.11 ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=X? ( x11-libs/libX11 x11-libs/libXxf86dga ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.11 ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Fast and safe graphics and drivers for about any graphics card to the Linux kernel (sometimes)
 HOMEPAGE=http://www.ggi-project.org
 IUSE=X
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXxf86dga )
 SLOT=0
 SRC_URI=mirror://sourceforge/ggi/libgii-1.0.2.src.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7c42549c828d3623a9b883e97d1bc34d
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.4.14 b/metadata/md5-cache/media-libs/libgphoto2-2.4.14
index e0f677879722..2992dcd337a4 100644
--- a/metadata/md5-cache/media-libs/libgphoto2-2.4.14
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.4.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=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 virtual/pkgconfig sys-devel/flex >=sys-devel/gettext-0.18.1 doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig sys-devel/flex >=sys-devel/gettext-0.18.1 doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library that implements support for numerous digital cameras
 EAPI=4
 HOMEPAGE=http://www.gphoto.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.4.14.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ec51d70378ab45d3c12cae513f7cbd28
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.4.14-r1 b/metadata/md5-cache/media-libs/libgphoto2-2.4.14-r1
index 2275837fd4a8..1cd6375ce38c 100644
--- a/metadata/md5-cache/media-libs/libgphoto2-2.4.14-r1
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.4.14-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=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 virtual/pkgconfig sys-devel/flex >=sys-devel/gettext-0.18.1 doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=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 virtual/pkgconfig sys-devel/flex >=sys-devel/gettext-0.18.1 doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Library that implements support for numerous digital cameras
 EAPI=4
 HOMEPAGE=http://www.gphoto.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.4.14.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6fa31e3ba5d9cd3531b7ff671564b024
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.1.1 b/metadata/md5-cache/media-libs/libgphoto2-2.5.1.1
index 61c9d44ca3fd..3ab0749b6683 100644
--- a/metadata/md5-cache/media-libs/libgphoto2-2.5.1.1
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.5.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=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 virtual/pkgconfig sys-devel/flex >=sys-devel/gettext-0.14.1 doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=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 virtual/pkgconfig sys-devel/flex >=sys-devel/gettext-0.14.1 doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Library that implements support for numerous digital cameras
 EAPI=5
 HOMEPAGE=http://www.gphoto.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0/6
 SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dcc73842e994f007956b842907bf2207
diff --git a/metadata/md5-cache/media-libs/libiec61883-1.1.0 b/metadata/md5-cache/media-libs/libiec61883-1.1.0
index 792aaf7220a4..21b439c4aea9 100644
--- a/metadata/md5-cache/media-libs/libiec61883-1.1.0
+++ b/metadata/md5-cache/media-libs/libiec61883-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=>=sys-libs/libraw1394-1.2.1 virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/libraw1394-1.2.1 virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=library for capturing video (dv or mpeg2) over the IEEE 1394 bus
 HOMEPAGE=http://www.linux1394.org
 IUSE=examples
@@ -8,5 +8,5 @@ LICENSE=|| ( LGPL-2.1 GPL-2 )
 RDEPEND=>=sys-libs/libraw1394-1.2.1
 SLOT=0
 SRC_URI=http://www.linux1394.org/dl/libiec61883-1.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b4113ae5e0ac9589092904d0104042ac
diff --git a/metadata/md5-cache/media-libs/libiec61883-1.2.0 b/metadata/md5-cache/media-libs/libiec61883-1.2.0
index 52f1e56beca4..13680d72be25 100644
--- a/metadata/md5-cache/media-libs/libiec61883-1.2.0
+++ b/metadata/md5-cache/media-libs/libiec61883-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=sys-libs/libraw1394-1.2.1 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/libraw1394-1.2.1 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for capturing video (dv or mpeg2) over the IEEE 1394 bus
 EAPI=4
 HOMEPAGE=http://dennedy.org/cgi-bin/gitweb.cgi?p=dennedy.org/libiec61883.git
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-2 )
 RDEPEND=>=sys-libs/libraw1394-1.2.1
 SLOT=0
 SRC_URI=mirror://kernel/linux/libs/ieee1394/libiec61883-1.2.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=79fdf3c91116690c6f066a1c262f0fa1
diff --git a/metadata/md5-cache/media-libs/libilbc-9999 b/metadata/md5-cache/media-libs/libilbc-9999
index 346b71d6d4c9..91bf62b552bd 100644
--- a/metadata/md5-cache/media-libs/libilbc-9999
+++ b/metadata/md5-cache/media-libs/libilbc-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install prepare unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Packaged version of iLBC codec from the WebRTC project
 EAPI=4
 HOMEPAGE=https://github.com/dekkers/libilbc
 LICENSE=BSD
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e734723185241921f54582769f40a10d
diff --git a/metadata/md5-cache/media-libs/libirman-0.4.5 b/metadata/md5-cache/media-libs/libirman-0.4.5
index c3b0308b90c4..70c4b4ad1c32 100644
--- a/metadata/md5-cache/media-libs/libirman-0.4.5
+++ b/metadata/md5-cache/media-libs/libirman-0.4.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=library for Irman control of Unix software
 EAPI=4
 HOMEPAGE=http://www.lirc.org/software/snapshots/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2 LGPL-2
 SLOT=0
 SRC_URI=http://www.lirc.org/software/snapshots/libirman-0.4.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=80da2e416b16d648b1784aba943e797d
diff --git a/metadata/md5-cache/media-libs/liblrdf-0.5.0 b/metadata/md5-cache/media-libs/liblrdf-0.5.0
index a220e17c6df5..af38606c3ed7 100644
--- a/metadata/md5-cache/media-libs/liblrdf-0.5.0
+++ b/metadata/md5-cache/media-libs/liblrdf-0.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test unpack
-DEPEND=>=dev-libs/openssl-1 media-libs/raptor:2 >=media-libs/ladspa-sdk-1.12 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/openssl-1 media-libs/raptor:2 >=media-libs/ladspa-sdk-1.12 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for the manipulation of RDF file in LADSPA plugins
 EAPI=4
 HOMEPAGE=http://github.com/swh/LRDF
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/openssl-1 media-libs/raptor:2 >=media-libs/ladspa-sdk-1.12
 SLOT=0
 SRC_URI=http://github.com/swh/LRDF/tarball/0.5.0 -> liblrdf-0.5.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=76a8587e6480928519cab73092849bbf
diff --git a/metadata/md5-cache/media-libs/libmad-0.15.1b-r6 b/metadata/md5-cache/media-libs/libmad-0.15.1b-r6
index 65f98b68f00f..aca4f01e5b6a 100644
--- a/metadata/md5-cache/media-libs/libmad-0.15.1b-r6
+++ b/metadata/md5-cache/media-libs/libmad-0.15.1b-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION="M"peg "A"udio "D"ecoder library
 HOMEPAGE=http://mad.sourceforge.net
 IUSE=debug
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/mad/libmad-0.15.1b.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fec70d4baff2f406ad1a0dc4584e9051
diff --git a/metadata/md5-cache/media-libs/libmad-0.15.1b-r7 b/metadata/md5-cache/media-libs/libmad-0.15.1b-r7
index 951547544cf3..f5f6c4d1e90c 100644
--- a/metadata/md5-cache/media-libs/libmad-0.15.1b-r7
+++ b/metadata/md5-cache/media-libs/libmad-0.15.1b-r7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION="M"peg "A"udio "D"ecoder library
 EAPI=4
 HOMEPAGE=http://mad.sourceforge.net
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/mad/libmad-0.15.1b.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2c24c2053b55b905afa72b8beb0da771
diff --git a/metadata/md5-cache/media-libs/libmediainfo-0.7.61 b/metadata/md5-cache/media-libs/libmediainfo-0.7.61
index bf9f7581e543..8aad225fc85b 100644
--- a/metadata/md5-cache/media-libs/libmediainfo-0.7.61
+++ b/metadata/md5-cache/media-libs/libmediainfo-0.7.61
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib dev-libs/tinyxml2 >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib dev-libs/tinyxml2 >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MediaInfo libraries
 EAPI=4
 HOMEPAGE=http://mediainfo.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=sys-libs/zlib dev-libs/tinyxml2 >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
 SLOT=0
 SRC_URI=mirror://sourceforge/mediainfo/source/libmediainfo/0.7.61/libmediainfo_0.7.61.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ecf0d41e3490dbb2410c5512d97d2e30
diff --git a/metadata/md5-cache/media-libs/libmediainfo-0.7.62 b/metadata/md5-cache/media-libs/libmediainfo-0.7.62
index 7090fb067d43..705ac5d558f7 100644
--- a/metadata/md5-cache/media-libs/libmediainfo-0.7.62
+++ b/metadata/md5-cache/media-libs/libmediainfo-0.7.62
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib dev-libs/tinyxml2 >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib dev-libs/tinyxml2 >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MediaInfo libraries
 EAPI=5
 HOMEPAGE=http://mediainfo.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=sys-libs/zlib dev-libs/tinyxml2 >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
 SLOT=0
 SRC_URI=mirror://sourceforge/mediainfo/source/libmediainfo/0.7.62/libmediainfo_0.7.62.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=371d6d23cd5fb329bf1e08db7d07c8f5
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.2.0 b/metadata/md5-cache/media-libs/libmikmod-3.2.0
index 46e412a5418a..e9a3296ae9e3 100644
--- a/metadata/md5-cache/media-libs/libmikmod-3.2.0
+++ b/metadata/md5-cache/media-libs/libmikmod-3.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=alsa? ( media-libs/alsa-lib ) !media-libs/libmikmod:2 oss? ( virtual/os-headers ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=alsa? ( media-libs/alsa-lib ) !media-libs/libmikmod:2 oss? ( virtual/os-headers ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library to play a wide range of module formats
 EAPI=5
 HOMEPAGE=http://mikmod.shlomifish.org/
@@ -10,5 +10,5 @@ RDEPEND=alsa? ( media-libs/alsa-lib ) !media-libs/libmikmod:2
 REQUIRED_USE=|| ( alsa oss coreaudio )
 SLOT=0
 SRC_URI=http://mikmod.shlomifish.org/files/libmikmod-3.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2bbf07b5d42cb42793dd0ea986d01ad8
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.2.0-r1 b/metadata/md5-cache/media-libs/libmikmod-3.2.0-r1
index 32442896c618..5fd11f131d0d 100644
--- a/metadata/md5-cache/media-libs/libmikmod-3.2.0-r1
+++ b/metadata/md5-cache/media-libs/libmikmod-3.2.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( media-libs/alsa-lib:= ) !media-libs/libmikmod:2 oss? ( virtual/os-headers ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=alsa? ( media-libs/alsa-lib:= ) !media-libs/libmikmod:2 oss? ( virtual/os-headers ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library to play a wide range of module formats
 EAPI=5
 HOMEPAGE=http://mikmod.shlomifish.org/
@@ -10,5 +10,5 @@ RDEPEND=alsa? ( media-libs/alsa-lib:= ) !media-libs/libmikmod:2
 REQUIRED_USE=|| ( alsa oss coreaudio )
 SLOT=0
 SRC_URI=http://mikmod.shlomifish.org/files/libmikmod-3.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multilib-minimal	17ae39785bd22c9cf6159d6f11f87a04	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multilib-minimal	17ae39785bd22c9cf6159d6f11f87a04	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4bc9a0f5cecf23727e91c9cbc5d8a15e
diff --git a/metadata/md5-cache/media-libs/libmng-1.0.10-r1 b/metadata/md5-cache/media-libs/libmng-1.0.10-r1
index 6d5f6afba370..733c04cf0c87 100644
--- a/metadata/md5-cache/media-libs/libmng-1.0.10-r1
+++ b/metadata/md5-cache/media-libs/libmng-1.0.10-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=virtual/jpeg >=sys-libs/zlib-1.1.4 lcms? ( =media-libs/lcms-1* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/jpeg >=sys-libs/zlib-1.1.4 lcms? ( =media-libs/lcms-1* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Multiple Image Networkgraphics lib (animated png's)
 EAPI=3
 HOMEPAGE=http://www.libmng.com/
@@ -9,5 +9,5 @@ LICENSE=libmng
 RDEPEND=virtual/jpeg >=sys-libs/zlib-1.1.4 lcms? ( =media-libs/lcms-1* )
 SLOT=0
 SRC_URI=mirror://sourceforge/libmng/libmng-1.0.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=561f1d7a5e1d4fee169772ab7d8cfcec
diff --git a/metadata/md5-cache/media-libs/libmodplug-0.8.8.2 b/metadata/md5-cache/media-libs/libmodplug-0.8.8.2
index 26838b69642a..c9c945437fe8 100644
--- a/metadata/md5-cache/media-libs/libmodplug-0.8.8.2
+++ b/metadata/md5-cache/media-libs/libmodplug-0.8.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for playing MOD-like music files
 EAPI=2
 HOMEPAGE=http://modplug-xmms.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-f
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/modplug-xmms/libmodplug-0.8.8.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4cf02d3f6d5e62184f39a5c588c5bf95
diff --git a/metadata/md5-cache/media-libs/libmodplug-0.8.8.4 b/metadata/md5-cache/media-libs/libmodplug-0.8.8.4
index ad90061cf814..be2ab1acf1a0 100644
--- a/metadata/md5-cache/media-libs/libmodplug-0.8.8.4
+++ b/metadata/md5-cache/media-libs/libmodplug-0.8.8.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for playing MOD-like music files
 EAPI=4
 HOMEPAGE=http://modplug-xmms.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/modplug-xmms/libmodplug-0.8.8.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a2e52e8f155aecb75a376a176affc7df
diff --git a/metadata/md5-cache/media-libs/libmp3splt-0.7 b/metadata/md5-cache/media-libs/libmp3splt-0.7
index 1267d481884f..42afe1c1c7e1 100644
--- a/metadata/md5-cache/media-libs/libmp3splt-0.7
+++ b/metadata/md5-cache/media-libs/libmp3splt-0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a library for mp3splt to split mp3 and ogg files without decoding.
 EAPI=2
 HOMEPAGE=http://mp3splt.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libmad media-libs/libvorbis media-libs/libogg media-libs/libid3tag pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3splt/libmp3splt-0.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2cb829a474ebe5d0558a168db847af8d
diff --git a/metadata/md5-cache/media-libs/libmp3splt-0.7.0.920 b/metadata/md5-cache/media-libs/libmp3splt-0.7.0.920
index 139cf5915328..4d6be8e4f597 100644
--- a/metadata/md5-cache/media-libs/libmp3splt-0.7.0.920
+++ b/metadata/md5-cache/media-libs/libmp3splt-0.7.0.920
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a library for mp3splt to split mp3 and ogg files without decoding.
 EAPI=2
 HOMEPAGE=http://mp3splt.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libmad media-libs/libvorbis media-libs/libogg media-libs/libid3tag pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://ioalex.net/testing_downloads/snapshots/920/libmp3splt-0.7.0.920.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=444fcf62b262ebec329a31c66f69548e
diff --git a/metadata/md5-cache/media-libs/libmp3splt-0.7.1 b/metadata/md5-cache/media-libs/libmp3splt-0.7.1
index 4f1bbe997939..1c55866fb072 100644
--- a/metadata/md5-cache/media-libs/libmp3splt-0.7.1
+++ b/metadata/md5-cache/media-libs/libmp3splt-0.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a library for mp3splt to split mp3 and ogg files without decoding.
 EAPI=2
 HOMEPAGE=http://mp3splt.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libmad media-libs/libvorbis media-libs/libogg media-libs/libid3tag pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3splt/libmp3splt-0.7.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a56f4a450cf480ee89b00575635b9e17
diff --git a/metadata/md5-cache/media-libs/libmp3splt-0.7.2 b/metadata/md5-cache/media-libs/libmp3splt-0.7.2
index 968611925253..7c83837bdbb1 100644
--- a/metadata/md5-cache/media-libs/libmp3splt-0.7.2
+++ b/metadata/md5-cache/media-libs/libmp3splt-0.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a library for mp3splt to split mp3 and ogg files without decoding.
 EAPI=2
 HOMEPAGE=http://mp3splt.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libmad media-libs/libvorbis media-libs/libogg media-libs/libid3tag pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3splt/libmp3splt-0.7.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0f681a7b519e982d403afa4a8c4553a7
diff --git a/metadata/md5-cache/media-libs/libmp3splt-0.7.3 b/metadata/md5-cache/media-libs/libmp3splt-0.7.3
index 885edfef8765..1d0b612ccf38 100644
--- a/metadata/md5-cache/media-libs/libmp3splt-0.7.3
+++ b/metadata/md5-cache/media-libs/libmp3splt-0.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a library for mp3splt to split mp3 and ogg files without decoding.
 EAPI=2
 HOMEPAGE=http://mp3splt.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libmad media-libs/libvorbis media-libs/libogg media-libs/libid3tag pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3splt/libmp3splt-0.7.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7cf9804111069549449e0439c4b92967
diff --git a/metadata/md5-cache/media-libs/libmp3splt-0.8.1a b/metadata/md5-cache/media-libs/libmp3splt-0.8.1a
index 8011ccce4918..99b5f3be61e0 100644
--- a/metadata/md5-cache/media-libs/libmp3splt-0.8.1a
+++ b/metadata/md5-cache/media-libs/libmp3splt-0.8.1a
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libmad media-libs/libvorbis media-libs/libogg media-libs/libid3tag pcre? ( dev-libs/libpcre ) doc? ( >=app-doc/doxygen-1.8.3.1 media-gfx/graphviz ) sys-apps/findutils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libmad media-libs/libvorbis media-libs/libogg media-libs/libid3tag pcre? ( dev-libs/libpcre ) doc? ( >=app-doc/doxygen-1.8.3.1 media-gfx/graphviz ) sys-apps/findutils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a library for mp3splt to split mp3 and ogg files without decoding.
 EAPI=2
 HOMEPAGE=http://mp3splt.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libmad media-libs/libvorbis media-libs/libogg media-libs/libid3tag pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3splt/libmp3splt-0.8.1a.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e15a55e7af9c60a3fbb026b9ba3a414b
diff --git a/metadata/md5-cache/media-libs/libmpeg2-0.5.1-r1 b/metadata/md5-cache/media-libs/libmpeg2-0.5.1-r1
index a028de6d5bc3..24e6df4d6691 100644
--- a/metadata/md5-cache/media-libs/libmpeg2-0.5.1-r1
+++ b/metadata/md5-cache/media-libs/libmpeg2-0.5.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=library for decoding mpeg-2 and mpeg-1 video
 EAPI=4
 HOMEPAGE=http://libmpeg2.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sdl? ( media-libs/libsdl ) X? ( x11-libs/libXv x11-libs/libICE x11-libs/libSM x11-libs/libXt )
 SLOT=0
 SRC_URI=http://libmpeg2.sourceforge.net/files/libmpeg2-0.5.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5ea27e48b1716841db05e8886dab5565
diff --git a/metadata/md5-cache/media-libs/libmpeg3-1.7 b/metadata/md5-cache/media-libs/libmpeg3-1.7
index 553785aafaab..820d8c1e1ce8 100644
--- a/metadata/md5-cache/media-libs/libmpeg3-1.7
+++ b/metadata/md5-cache/media-libs/libmpeg3-1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/zlib virtual/jpeg media-libs/a52dec mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib virtual/jpeg media-libs/a52dec mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An mpeg library for linux
 EAPI=2
 HOMEPAGE=http://heroinewarrior.com/libmpeg3.php
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib virtual/jpeg media-libs/a52dec
 SLOT=0
 SRC_URI=mirror://sourceforge/heroines/libmpeg3-1.7-src.tar.bz2 mirror://gentoo/libmpeg3-1.7-gentoo.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e2a0424ad5a50a0f2f27e641e6ac5b66
diff --git a/metadata/md5-cache/media-libs/libmpeg3-1.8 b/metadata/md5-cache/media-libs/libmpeg3-1.8
index 04c39c069497..01e2df5607a4 100644
--- a/metadata/md5-cache/media-libs/libmpeg3-1.8
+++ b/metadata/md5-cache/media-libs/libmpeg3-1.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/zlib virtual/jpeg media-libs/a52dec mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib virtual/jpeg media-libs/a52dec mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An mpeg library for linux
 EAPI=4
 HOMEPAGE=http://heroinewarrior.com/libmpeg3.php
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib virtual/jpeg media-libs/a52dec
 SLOT=0
 SRC_URI=mirror://sourceforge/heroines/libmpeg3-1.8-src.tar.bz2 mirror://gentoo/libmpeg3-1.7-gentoo.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6a3cf444413af4a95e6ae1ccf88a155d
diff --git a/metadata/md5-cache/media-libs/libmtp-1.1.4 b/metadata/md5-cache/media-libs/libmtp-1.1.4
index 0ef3d2adc509..efa86cf87a89 100644
--- a/metadata/md5-cache/media-libs/libmtp-1.1.4
+++ b/metadata/md5-cache/media-libs/libmtp-1.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=virtual/libusb:1 crypt? ( dev-libs/libgcrypt ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=virtual/libusb:1 crypt? ( dev-libs/libgcrypt ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=An implementation of Microsoft's Media Transfer Protocol (MTP).
 EAPI=4
 HOMEPAGE=http://libmtp.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:1 crypt? ( dev-libs/libgcrypt )
 SLOT=0
 SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dee14b2a33e49ce838c2f67e7e458910
diff --git a/metadata/md5-cache/media-libs/libmtp-1.1.5 b/metadata/md5-cache/media-libs/libmtp-1.1.5
index fa5d4460ae68..8547cb485374 100644
--- a/metadata/md5-cache/media-libs/libmtp-1.1.5
+++ b/metadata/md5-cache/media-libs/libmtp-1.1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=virtual/libusb:1 crypt? ( dev-libs/libgcrypt ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=virtual/libusb:1 crypt? ( dev-libs/libgcrypt ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=An implementation of Microsoft's Media Transfer Protocol (MTP).
 EAPI=4
 HOMEPAGE=http://libmtp.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:1 crypt? ( dev-libs/libgcrypt )
 SLOT=0
 SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=57e6e5603cc2a33ea79f27ccee4b2084
diff --git a/metadata/md5-cache/media-libs/libmtp-1.1.6 b/metadata/md5-cache/media-libs/libmtp-1.1.6
index c39cfa4f66dd..d8038211c85d 100644
--- a/metadata/md5-cache/media-libs/libmtp-1.1.6
+++ b/metadata/md5-cache/media-libs/libmtp-1.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=virtual/libusb:1 crypt? ( dev-libs/libgcrypt ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=virtual/libusb:1 crypt? ( dev-libs/libgcrypt ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=An implementation of Microsoft's Media Transfer Protocol (MTP).
 EAPI=4
 HOMEPAGE=http://libmtp.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:1 crypt? ( dev-libs/libgcrypt )
 SLOT=0
 SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=60f0a73fb2b61b38d2bb7655ff3570a7
diff --git a/metadata/md5-cache/media-libs/libmtp-9999 b/metadata/md5-cache/media-libs/libmtp-9999
index f94579762f1e..99f20a26cd9b 100644
--- a/metadata/md5-cache/media-libs/libmtp-9999
+++ b/metadata/md5-cache/media-libs/libmtp-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=virtual/libusb:1 crypt? ( dev-libs/libgcrypt ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig dev-vcs/git
+DEPEND=virtual/libusb:1 crypt? ( dev-libs/libgcrypt ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig dev-vcs/git
 DESCRIPTION=An implementation of Microsoft's Media Transfer Protocol (MTP).
 EAPI=4
 HOMEPAGE=http://libmtp.sourceforge.net/
@@ -7,5 +7,5 @@ IUSE=+crypt doc examples static-libs
 LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:1 crypt? ( dev-libs/libgcrypt )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=524e0dfdb1e98d08f68249dd1d9aeeda
diff --git a/metadata/md5-cache/media-libs/liboggz-1.1.1 b/metadata/md5-cache/media-libs/liboggz-1.1.1
index ed3faa1bec73..effd6d51d36e 100644
--- a/metadata/md5-cache/media-libs/liboggz-1.1.1
+++ b/metadata/md5-cache/media-libs/liboggz-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/libogg-1.2.0 virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( app-text/docbook-sgml-utils ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libogg-1.2.0 virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( app-text/docbook-sgml-utils ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oggz provides a simple programming interface for reading and writing Ogg files and streams
 EAPI=2
 HOMEPAGE=http://www.xiph.org/oggz/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=media-libs/libogg-1.2.0
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/liboggz/liboggz-1.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=87d245860b589c97e4adc6af0bb238fc
diff --git a/metadata/md5-cache/media-libs/libpgf-6.11.32 b/metadata/md5-cache/media-libs/libpgf-6.11.32
index e1af9851f864..22a7a04cee22 100644
--- a/metadata/md5-cache/media-libs/libpgf-6.11.32
+++ b/metadata/md5-cache/media-libs/libpgf-6.11.32
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library to load, handle and manipulate images in the PGF format
 EAPI=4
 HOMEPAGE=http://www.libpgf.org/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~dilfridge/distfiles/libpgf-6.11.32.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=f9dbd8d63bca1a62432ed8b3548b6e26
diff --git a/metadata/md5-cache/media-libs/libpgf-6.12.27 b/metadata/md5-cache/media-libs/libpgf-6.12.27
index 7f542abff858..cbd85a8fe462 100644
--- a/metadata/md5-cache/media-libs/libpgf-6.12.27
+++ b/metadata/md5-cache/media-libs/libpgf-6.12.27
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library to load, handle and manipulate images in the PGF format
 EAPI=4
 HOMEPAGE=http://www.libpgf.org/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~dilfridge/distfiles/libpgf-6.12.27.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=780a859f5521354f195ebfd5d44d9aca
diff --git a/metadata/md5-cache/media-libs/libptp2-1.1.10 b/metadata/md5-cache/media-libs/libptp2-1.1.10
index f509b1cc086a..398b2b10c59e 100644
--- a/metadata/md5-cache/media-libs/libptp2-1.1.10
+++ b/metadata/md5-cache/media-libs/libptp2-1.1.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare test
-DEPEND=virtual/libusb:0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/libusb:0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library and client for communicating with PTP enabled devices (e.g. digital photo cameras).
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/libptp/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0
 SLOT=0
 SRC_URI=mirror://sourceforge/libptp/libptp2-1.1.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=302392ebb60c88c8619a48339779573b
diff --git a/metadata/md5-cache/media-libs/libquvi-0.4.1 b/metadata/md5-cache/media-libs/libquvi-0.4.1
index d9d7011d75f0..1301b68fcbe2 100644
--- a/metadata/md5-cache/media-libs/libquvi-0.4.1
+++ b/metadata/md5-cache/media-libs/libquvi-0.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=net-misc/curl-7.18.2 !<media-libs/quvi-0.4.0 >=media-libs/libquvi-scripts-0.4.0 >=dev-lang/lua-5.1[deprecated]
 SLOT=0
 SRC_URI=mirror://sourceforge/quvi/0.4/libquvi-0.4.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c18e35136d5bb3c401a65a69ffc14726
diff --git a/metadata/md5-cache/media-libs/libraw-0.14.7 b/metadata/md5-cache/media-libs/libraw-0.14.7
index 2fc8efd74123..ae46264895d1 100644
--- a/metadata/md5-cache/media-libs/libraw-0.14.7
+++ b/metadata/md5-cache/media-libs/libraw-0.14.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=jpeg2k? ( media-libs/jasper ) lcms? ( media-libs/lcms:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=jpeg2k? ( media-libs/jasper ) lcms? ( media-libs/lcms:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LibRaw is a library for reading RAW files obtained from digital photo cameras
 EAPI=4
 HOMEPAGE=http://www.libraw.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 CDDL GPL-2 GPL-3
 RDEPEND=jpeg2k? ( media-libs/jasper ) lcms? ( media-libs/lcms:2 )
 SLOT=0
 SRC_URI=http://www.libraw.org/data/LibRaw-0.14.7.tar.gz demosaic? ( http://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-0.14.7.tar.gz http://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-0.14.7.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=af06aacbb6702e88b72d9a12e650b6a8
diff --git a/metadata/md5-cache/media-libs/libraw-0.15.0_beta3 b/metadata/md5-cache/media-libs/libraw-0.15.0_beta3
index 92b8137d3d08..ca5a2ac34424 100644
--- a/metadata/md5-cache/media-libs/libraw-0.15.0_beta3
+++ b/metadata/md5-cache/media-libs/libraw-0.15.0_beta3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare pretend
-DEPEND=jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) lcms? ( media-libs/lcms:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) lcms? ( media-libs/lcms:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LibRaw is a library for reading RAW files obtained from digital photo cameras
 EAPI=5
 HOMEPAGE=http://www.libraw.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 CDDL GPL-2 GPL-3
 RDEPEND=jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) lcms? ( media-libs/lcms:2 )
 SLOT=0
 SRC_URI=http://www.libraw.org/data/LibRaw-0.15.0-Beta3.tar.gz demosaic? ( http://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-0.15.0-Beta3.tar.gz http://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-0.15.0-Beta3.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ef60bd43f77cc92a2694edd147105df6
diff --git a/metadata/md5-cache/media-libs/libraw-0.15.0_beta4 b/metadata/md5-cache/media-libs/libraw-0.15.0_beta4
index afb76acf32d3..2cb8f02c8546 100644
--- a/metadata/md5-cache/media-libs/libraw-0.15.0_beta4
+++ b/metadata/md5-cache/media-libs/libraw-0.15.0_beta4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare pretend
-DEPEND=jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) lcms? ( media-libs/lcms:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) lcms? ( media-libs/lcms:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LibRaw is a library for reading RAW files obtained from digital photo cameras
 EAPI=5
 HOMEPAGE=http://www.libraw.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 CDDL GPL-2 GPL-3
 RDEPEND=jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) lcms? ( media-libs/lcms:2 )
 SLOT=0/8
 SRC_URI=http://www.libraw.org/data/LibRaw-0.15.0-Beta4.tar.gz demosaic? ( http://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-0.15.0-Beta4.tar.gz http://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-0.15.0-Beta4.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1ce7a6e720633586709c57e65c6846af
diff --git a/metadata/md5-cache/media-libs/libsamplerate-0.1.7 b/metadata/md5-cache/media-libs/libsamplerate-0.1.7
index 803b8355e6e7..ea44818fb607 100644
--- a/metadata/md5-cache/media-libs/libsamplerate-0.1.7
+++ b/metadata/md5-cache/media-libs/libsamplerate-0.1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sndfile? ( >=media-libs/libsndfile-1.0.2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sndfile? ( >=media-libs/libsndfile-1.0.2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio
 HOMEPAGE=http://www.mega-nerd.com/SRC/
 IUSE=sndfile
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sndfile? ( >=media-libs/libsndfile-1.0.2 )
 SLOT=0
 SRC_URI=http://www.mega-nerd.com/SRC/libsamplerate-0.1.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4319862443defef7cb04e08ce5e47a55
diff --git a/metadata/md5-cache/media-libs/libsamplerate-0.1.8 b/metadata/md5-cache/media-libs/libsamplerate-0.1.8
index d8ff62bb0467..f51702220896 100644
--- a/metadata/md5-cache/media-libs/libsamplerate-0.1.8
+++ b/metadata/md5-cache/media-libs/libsamplerate-0.1.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sndfile? ( >=media-libs/libsndfile-1.0.2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sndfile? ( >=media-libs/libsndfile-1.0.2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio
 EAPI=4
 HOMEPAGE=http://www.mega-nerd.com/SRC/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sndfile? ( >=media-libs/libsndfile-1.0.2 )
 SLOT=0
 SRC_URI=http://www.mega-nerd.com/SRC/libsamplerate-0.1.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e7432871c659329812a89b9f3afc18e3
diff --git a/metadata/md5-cache/media-libs/libsbsms-2.0.0 b/metadata/md5-cache/media-libs/libsbsms-2.0.0
index 257a73240f20..09ce6ddda6c8 100644
--- a/metadata/md5-cache/media-libs/libsbsms-2.0.0
+++ b/metadata/md5-cache/media-libs/libsbsms-2.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for high quality time and pitch scale modification
 EAPI=4
 HOMEPAGE=http://sbsms.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/sbsms/libsbsms-2.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9970dc9d57186cb51efa107552c88492
diff --git a/metadata/md5-cache/media-libs/libsbsms-2.0.1 b/metadata/md5-cache/media-libs/libsbsms-2.0.1
index aac643fac511..fc69a0206bb2 100644
--- a/metadata/md5-cache/media-libs/libsbsms-2.0.1
+++ b/metadata/md5-cache/media-libs/libsbsms-2.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for high quality time and pitch scale modification
 EAPI=4
 HOMEPAGE=http://sbsms.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/sbsms/libsbsms-2.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=06d30abc3c7171f31e55a3fafba92f4a
diff --git a/metadata/md5-cache/media-libs/libsmf-1.3 b/metadata/md5-cache/media-libs/libsmf-1.3
index f6df8ae41d38..513e957d5f2f 100644
--- a/metadata/md5-cache/media-libs/libsmf-1.3
+++ b/metadata/md5-cache/media-libs/libsmf-1.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/glib-2.2:2 readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=mirror://sourceforge/libsmf/libsmf-1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3a11ce1b7505d6ee7260744a3016dac9
diff --git a/metadata/md5-cache/media-libs/libsndfile-1.0.25 b/metadata/md5-cache/media-libs/libsndfile-1.0.25
index 7f9a6dc95b23..ea30c2bdb759 100644
--- a/metadata/md5-cache/media-libs/libsndfile-1.0.25
+++ b/metadata/md5-cache/media-libs/libsndfile-1.0.25
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=!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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A C library for reading and writing files containing sampled sound
 EAPI=5
 HOMEPAGE=http://www.mega-nerd.com/libsndfile
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=!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 )
 SLOT=0
 SRC_URI=http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.25.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=048b94bb3097c91b4773d7a86b4a25c5
diff --git a/metadata/md5-cache/media-libs/libsoundtouch-1.7.0 b/metadata/md5-cache/media-libs/libsoundtouch-1.7.0
index d30c92c48cca..9ad362338272 100644
--- a/metadata/md5-cache/media-libs/libsoundtouch-1.7.0
+++ b/metadata/md5-cache/media-libs/libsoundtouch-1.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Audio processing library for changing tempo, pitch and playback rates.
 EAPI=4
 HOMEPAGE=http://www.surina.net/soundtouch/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.surina.net/soundtouch/soundtouch-1.7.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d69d0b74e4183d279b88fb82bcb72884
diff --git a/metadata/md5-cache/media-libs/libsoundtouch-1.7.1 b/metadata/md5-cache/media-libs/libsoundtouch-1.7.1
index 09acf1c6396e..1ef12324c933 100644
--- a/metadata/md5-cache/media-libs/libsoundtouch-1.7.1
+++ b/metadata/md5-cache/media-libs/libsoundtouch-1.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Audio processing library for changing tempo, pitch and playback rates.
 EAPI=5
 HOMEPAGE=http://www.surina.net/soundtouch/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.surina.net/soundtouch/soundtouch-1.7.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db8afcba1a81bbd22958dd925558456e
diff --git a/metadata/md5-cache/media-libs/libsvg-0.1.4-r1 b/metadata/md5-cache/media-libs/libsvg-0.1.4-r1
index c10fcca3c7f1..8b2192ebc0e2 100644
--- a/metadata/md5-cache/media-libs/libsvg-0.1.4-r1
+++ b/metadata/md5-cache/media-libs/libsvg-0.1.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=dev-libs/libxml2 media-libs/libpng virtual/jpeg virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 media-libs/libpng virtual/jpeg virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A parser for SVG content in files or buffers
 HOMEPAGE=http://cairographics.org
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 media-libs/libpng virtual/jpeg
 SLOT=0
 SRC_URI=http://cairographics.org/snapshots/libsvg-0.1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=62f2e50ef945729c7424cd394cbe37d1
diff --git a/metadata/md5-cache/media-libs/libtheora-1.1.1 b/metadata/md5-cache/media-libs/libtheora-1.1.1
index 903f89b78fa7..f897f1fd7105 100644
--- a/metadata/md5-cache/media-libs/libtheora-1.1.1
+++ b/metadata/md5-cache/media-libs/libtheora-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libogg:= encode? ( media-libs/libvorbis:= ) examples? ( media-libs/libpng:0= >=media-libs/libsdl-0.11.0 media-libs/libvorbis:= ) doc? ( app-doc/doxygen ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libogg:= encode? ( media-libs/libvorbis:= ) examples? ( media-libs/libpng:0= >=media-libs/libsdl-0.11.0 media-libs/libvorbis:= ) doc? ( app-doc/doxygen ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Theora Video Compression Codec
 EAPI=5
 HOMEPAGE=http://www.theora.org
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libogg:= encode? ( media-libs/libvorbis:= ) examples? ( media
 REQUIRED_USE=examples? ( encode )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d1d3196662c2528b03cb4cd6beec3ad6
diff --git a/metadata/md5-cache/media-libs/libtimidity-0.1.0 b/metadata/md5-cache/media-libs/libtimidity-0.1.0
index 6b77e9ae9f35..8391960f65d9 100644
--- a/metadata/md5-cache/media-libs/libtimidity-0.1.0
+++ b/metadata/md5-cache/media-libs/libtimidity-0.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=ao? ( media-libs/libao ) virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ao? ( media-libs/libao ) virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MIDI to WAVE converter library
 HOMEPAGE=http://libtimidity.sourceforge.net
 IUSE=ao debug
@@ -9,5 +9,5 @@ RDEPEND=ao? ( media-libs/libao )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/libtimidity/libtimidity-0.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=13d7c65d84f5996af19e56305d5613fb
diff --git a/metadata/md5-cache/media-libs/libtimidity-0.1.0-r1 b/metadata/md5-cache/media-libs/libtimidity-0.1.0-r1
index fa234d40ceab..51cdf1bb8b79 100644
--- a/metadata/md5-cache/media-libs/libtimidity-0.1.0-r1
+++ b/metadata/md5-cache/media-libs/libtimidity-0.1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=ao? ( media-libs/libao ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ao? ( media-libs/libao ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MIDI to WAVE converter library
 EAPI=2
 HOMEPAGE=http://libtimidity.sourceforge.net
@@ -10,5 +10,5 @@ RDEPEND=ao? ( media-libs/libao )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/libtimidity/libtimidity-0.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2064a912d3d9b1d2a79cee7c400211d4
diff --git a/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1 b/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1
index 9e73ac54465f..f9802a9aa012 100644
--- a/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1
+++ b/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/mesa
 RESTRICT=bindist
 SLOT=0
 SRC_URI=http://people.freedesktop.org/~cbrill/libtxc_dxtn/libtxc_dxtn-1.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eb4e72ec3cdc6e351ed0d711bdb21324
diff --git a/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r1 b/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r1
index fbdf08d8c23b..0a4c43c9d37c 100644
--- a/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r1
+++ b/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/mesa
 RESTRICT=bindist
 SLOT=0
 SRC_URI=http://people.freedesktop.org/~cbrill/libtxc_dxtn/libtxc_dxtn-1.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8a6c5d6760835052318ad1e8cf3af0fc
diff --git a/metadata/md5-cache/media-libs/libvisio-9999 b/metadata/md5-cache/media-libs/libvisio-9999
index aa5f2cfba221..b8115c22ad8c 100644
--- a/metadata/md5-cache/media-libs/libvisio-9999
+++ b/metadata/md5-cache/media-libs/libvisio-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 dev-libs/icu dev-libs/libxml2 sys-libs/zlib >=dev-libs/boost-1.46 dev-util/gperf sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 dev-libs/icu dev-libs/libxml2 sys-libs/zlib >=dev-libs/boost-1.46 dev-util/gperf sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Library parsing the visio documents
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/libvisio
@@ -7,5 +7,5 @@ IUSE=doc static-libs
 LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
 RDEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 dev-libs/icu dev-libs/libxml2 sys-libs/zlib
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=72d0295d8fad7acf00aff877c98336c1
diff --git a/metadata/md5-cache/media-libs/libvorbis-1.3.3 b/metadata/md5-cache/media-libs/libvorbis-1.3.3
index 2771e895e659..efc50a31430c 100644
--- a/metadata/md5-cache/media-libs/libvorbis-1.3.3
+++ b/metadata/md5-cache/media-libs/libvorbis-1.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libogg app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libogg app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Ogg Vorbis sound file format library
 EAPI=4
 HOMEPAGE=http://xiph.org/vorbis
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=media-libs/libogg
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.3.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=5ba17cbdb083dea9eb7135b6be92b6cf
diff --git a/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r4 b/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r4
index 469b3e367761..80f01690c7ca 100644
--- a/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r4
+++ b/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) virtual/pkgconfig X? ( x11-libs/libXt x11-libs/libXpm ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig X? ( x11-libs/libXt x11-libs/libXpm ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=library for converting WMF files
 EAPI=4
 HOMEPAGE=http://wvware.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=app-text/ghostscript-gpl media-fonts/urw-fonts >=media-libs/freetype-2.0
 REQUIRED_USE=expat? ( xml )
 SLOT=0
 SRC_URI=mirror://sourceforge/wvware/libwmf-0.2.8.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a6939dd9d4982826afec0ce8a2f9c3e6
diff --git a/metadata/md5-cache/media-libs/libzen-0.4.28 b/metadata/md5-cache/media-libs/libzen-0.4.28
index a1a9b686106b..8ff5d7dcd4c2 100644
--- a/metadata/md5-cache/media-libs/libzen-0.4.28
+++ b/metadata/md5-cache/media-libs/libzen-0.4.28
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Shared library for libmediainfo and mediainfo
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/zenlib
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=mirror://sourceforge/zenlib/ZenLib%20-%20Sources/0.4.28/libzen_0.4.28.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dc2a8d53c6a1c5ce8ef9a27609728c44
diff --git a/metadata/md5-cache/media-libs/mediastreamer-2.7.3-r3 b/metadata/md5-cache/media-libs/mediastreamer-2.7.3-r3
index 0a14b126d742..5bf1a235aeec 100644
--- a/metadata/md5-cache/media-libs/mediastreamer-2.7.3-r3
+++ b/metadata/md5-cache/media-libs/mediastreamer-2.7.3-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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 ) ) virtual/pkgconfig x11-proto/videoproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) ) virtual/pkgconfig x11-proto/videoproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Mediastreaming library for telephony application
 EAPI=4
 HOMEPAGE=http://www.linphone.org/
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/ortp-0.16.2[ipv6?] alsa? ( media-libs/alsa-lib ) gsm? ( media
 REQUIRED_USE=|| ( oss alsa jack portaudio coreaudio pulseaudio ) video? ( || ( sdl X ) ) theora? ( video ) X? ( video ) v4l? ( video )
 SLOT=0
 SRC_URI=mirror://nongnu/linphone/mediastreamer/mediastreamer-2.7.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6de299c1a659d9c7b9e0db8a2e958ec2
diff --git a/metadata/md5-cache/media-libs/mediastreamer-2.8.2 b/metadata/md5-cache/media-libs/mediastreamer-2.8.2
index b47fd4fd1d7e..7187df96eb55 100644
--- a/metadata/md5-cache/media-libs/mediastreamer-2.8.2
+++ b/metadata/md5-cache/media-libs/mediastreamer-2.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=net-libs/ortp-0.17[ipv6?] alsa? ( media-libs/alsa-lib ) g726? ( >=media-libs/spandsp-0.0.6_pre1 ) gsm? ( media-sound/gsm ) 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 ) ) virtual/pkgconfig x11-proto/videoproto doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-libs/ortp-0.17[ipv6?] alsa? ( media-libs/alsa-lib ) g726? ( >=media-libs/spandsp-0.0.6_pre1 ) gsm? ( media-sound/gsm ) 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 ) ) virtual/pkgconfig x11-proto/videoproto doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Mediastreaming library for telephony application
 EAPI=4
 HOMEPAGE=http://www.linphone.org/
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/ortp-0.17[ipv6?] alsa? ( media-libs/alsa-lib ) g726? ( >=medi
 REQUIRED_USE=|| ( oss alsa portaudio coreaudio pulseaudio ) video? ( || ( sdl X ) ) theora? ( video ) X? ( video ) v4l? ( video )
 SLOT=0
 SRC_URI=mirror://nongnu/linphone/mediastreamer/mediastreamer-2.8.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=971c0cc07aa05cb9c3e742b8d75210ff
diff --git a/metadata/md5-cache/media-libs/memphis-0.2.3 b/metadata/md5-cache/media-libs/memphis-0.2.3
index 32b865fd1779..654bcf18f09d 100644
--- a/metadata/md5-cache/media-libs/memphis-0.2.3
+++ b/metadata/md5-cache/media-libs/memphis-0.2.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/expat dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection )
 SLOT=0.2
 SRC_URI=http://wenner.ch/files/public/mirror/memphis/memphis-0.2.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
 _md5_=303ae410ca5a9c96295921d25ae99b68
diff --git a/metadata/md5-cache/media-libs/mesa-7.10.3 b/metadata/md5-cache/media-libs/mesa-7.10.3
index 5935cb45ba6e..0affd3862846 100644
--- a/metadata/md5-cache/media-libs/mesa-7.10.3
+++ b/metadata/md5-cache/media-libs/mesa-7.10.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=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/motif !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_nouveau? ( <x11-libs/libdrm-2.4.34 ) 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* virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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/motif !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_nouveau? ( <x11-libs/libdrm-2.4.34 ) 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* virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=3
 HOMEPAGE=http://mesa3d.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-3 SGI-B-2.0
 RDEPEND=>=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/motif !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_nouveau? ( <x11-libs/libdrm-2.4.34 ) video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=53b92190652e62160b0fff56d2d06655
diff --git a/metadata/md5-cache/media-libs/mesa-7.11.2 b/metadata/md5-cache/media-libs/mesa-7.11.2
index f69d25de78c3..19d5ba311cdc 100644
--- a/metadata/md5-cache/media-libs/mesa-7.11.2
+++ b/metadata/md5-cache/media-libs/mesa-7.11.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=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? ( virtual/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/motif !x11-libs/libGLw ) gallium? ( llvm? ( >=sys-devel/llvm-2.8 ) ) >=x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 ) 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] virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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? ( virtual/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/motif !x11-libs/libGLw ) gallium? ( llvm? ( >=sys-devel/llvm-2.8 ) ) >=x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 ) 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] virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=3
 HOMEPAGE=http://mesa3d.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-3 SGI-B-2.0
 RDEPEND=>=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? ( virtual/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/motif !x11-libs/libGLw ) gallium? ( llvm? ( >=sys-devel/llvm-2.8 ) ) >=x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 ) video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=12e156d4b21038bd408ca104e930a634
diff --git a/metadata/md5-cache/media-libs/mesa-8.0.4-r1 b/metadata/md5-cache/media-libs/mesa-8.0.4-r1
index 6a498b9e4294..178f3c5dd417 100644
--- a/metadata/md5-cache/media-libs/mesa-8.0.4-r1
+++ b/metadata/md5-cache/media-libs/mesa-8.0.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15-r1 !<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.6 dev-libs/expat gbm? ( virtual/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8 vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( =dev-libs/wayland-0.95.0 ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.32[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 ) video_cards_i915? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 ) =dev-lang/python-2* dev-libs/libxml2[python] virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15-r1 !<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.6 dev-libs/expat gbm? ( virtual/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8 vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( =dev-libs/wayland-0.95.0 ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.32[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 ) video_cards_i915? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 ) =dev-lang/python-2* dev-libs/libxml2[python] virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=4
 HOMEPAGE=http://mesa3d.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=>=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15-r1 !<x11-base/xorg-
 REQUIRED_USE=g3dvl? ( gallium ) llvm? ( gallium ) openvg? ( egl gallium ) gbm? ( shared-glapi ) g3dvl? ( || ( vdpau xvmc ) ) vdpau? ( g3dvl ) xa? ( gallium ) xvmc? ( g3dvl ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_vmware? ( gallium )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/8.0.4/MesaLib-8.0.4.tar.bz2 mirror://gentoo/mesa-8.0.4-gentoo-patches-01.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4a374f8ca7efeb474a76b8b71d4e9c6f
diff --git a/metadata/md5-cache/media-libs/mesa-9.0.1 b/metadata/md5-cache/media-libs/mesa-9.0.1
index 7dfe39a03dff..aabd2e2ea6e5 100644
--- a/metadata/md5-cache/media-libs/mesa-9.0.1
+++ b/metadata/md5-cache/media-libs/mesa-9.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=!<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.6 dev-libs/expat gbm? ( virtual/udev x11-libs/libdrm[libkms] ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8.1 vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( >=dev-libs/wayland-1.0.3 ) xorg? ( <x11-base/xorg-server-1.13.49 x11-libs/libdrm[libkms] ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.39[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 r600-llvm-compiler? ( =sys-devel/llvm-3.1* ) video_cards_radeonsi? ( =sys-devel/llvm-3.1* ) ) =dev-lang/python-2* dev-libs/libxml2[python] sys-devel/bison sys-devel/flex virtual/pkgconfig x11-misc/makedepend >=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15-r1 >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!<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.6 dev-libs/expat gbm? ( virtual/udev x11-libs/libdrm[libkms] ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8.1 vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( >=dev-libs/wayland-1.0.3 ) xorg? ( <x11-base/xorg-server-1.13.49 x11-libs/libdrm[libkms] ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.39[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 r600-llvm-compiler? ( =sys-devel/llvm-3.1* ) video_cards_radeonsi? ( =sys-devel/llvm-3.1* ) ) =dev-lang/python-2* dev-libs/libxml2[python] sys-devel/bison sys-devel/flex virtual/pkgconfig x11-misc/makedepend >=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15-r1 >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=4
 HOMEPAGE=http://mesa3d.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( ap
 REQUIRED_USE=g3dvl? ( gallium ) llvm? ( gallium ) openvg? ( egl gallium ) gbm? ( shared-glapi ) g3dvl? ( || ( vdpau xvmc ) ) vdpau? ( g3dvl ) r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) ) xa? ( gallium ) xorg? ( gallium ) xvmc? ( g3dvl ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/9.0.1/MesaLib-9.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3ad3491a744a66a9effffe5fade96561
diff --git a/metadata/md5-cache/media-libs/mesa-9.0.2 b/metadata/md5-cache/media-libs/mesa-9.0.2
index e924bc700a75..1f145df1065e 100644
--- a/metadata/md5-cache/media-libs/mesa-9.0.2
+++ b/metadata/md5-cache/media-libs/mesa-9.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=!<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.6 dev-libs/expat gbm? ( virtual/udev x11-libs/libdrm[libkms] ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8.1 vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( >=dev-libs/wayland-1.0.3 ) xorg? ( <x11-base/xorg-server-1.13.49 x11-libs/libdrm[libkms] ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.39[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 r600-llvm-compiler? ( =sys-devel/llvm-3.1* ) video_cards_radeonsi? ( =sys-devel/llvm-3.1* ) ) =dev-lang/python-2* dev-libs/libxml2[python] sys-devel/bison sys-devel/flex virtual/pkgconfig x11-misc/makedepend >=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15-r1 >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!<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.6 dev-libs/expat gbm? ( virtual/udev x11-libs/libdrm[libkms] ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8.1 vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( >=dev-libs/wayland-1.0.3 ) xorg? ( <x11-base/xorg-server-1.13.49 x11-libs/libdrm[libkms] ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.39[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 r600-llvm-compiler? ( =sys-devel/llvm-3.1* ) video_cards_radeonsi? ( =sys-devel/llvm-3.1* ) ) =dev-lang/python-2* dev-libs/libxml2[python] sys-devel/bison sys-devel/flex virtual/pkgconfig x11-misc/makedepend >=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15-r1 >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=4
 HOMEPAGE=http://mesa3d.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( ap
 REQUIRED_USE=g3dvl? ( gallium ) llvm? ( gallium ) openvg? ( egl gallium ) gbm? ( shared-glapi ) g3dvl? ( || ( vdpau xvmc ) ) vdpau? ( g3dvl ) r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) ) xa? ( gallium ) xorg? ( gallium ) xvmc? ( g3dvl ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/9.0.2/MesaLib-9.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3967d6725ce811326f34ca53d18c9474
diff --git a/metadata/md5-cache/media-libs/mesa-9.0.3 b/metadata/md5-cache/media-libs/mesa-9.0.3
index 524e1c0921ec..8671890fc52c 100644
--- a/metadata/md5-cache/media-libs/mesa-9.0.3
+++ b/metadata/md5-cache/media-libs/mesa-9.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=!<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.6 dev-libs/expat gbm? ( virtual/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8.1 vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( >=dev-libs/wayland-1.0.3 ) xorg? ( <x11-base/xorg-server-1.13.49 x11-libs/libdrm[libkms] ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.39[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 r600-llvm-compiler? ( =sys-devel/llvm-3.1* ) video_cards_radeonsi? ( =sys-devel/llvm-3.1* ) ) =dev-lang/python-2* dev-libs/libxml2[python] sys-devel/bison sys-devel/flex virtual/pkgconfig x11-misc/makedepend >=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15-r1 >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!<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.6 dev-libs/expat gbm? ( virtual/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8.1 vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( >=dev-libs/wayland-1.0.3 ) xorg? ( <x11-base/xorg-server-1.13.49 x11-libs/libdrm[libkms] ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.39[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 r600-llvm-compiler? ( =sys-devel/llvm-3.1* ) video_cards_radeonsi? ( =sys-devel/llvm-3.1* ) ) =dev-lang/python-2* dev-libs/libxml2[python] sys-devel/bison sys-devel/flex virtual/pkgconfig x11-misc/makedepend >=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15-r1 >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=4
 HOMEPAGE=http://mesa3d.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( ap
 REQUIRED_USE=g3dvl? ( gallium ) llvm? ( gallium ) openvg? ( egl gallium ) gbm? ( shared-glapi ) g3dvl? ( || ( vdpau xvmc ) ) vdpau? ( g3dvl ) r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) ) xa? ( gallium ) xorg? ( gallium ) xvmc? ( g3dvl ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/9.0.3/MesaLib-9.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d9e5aff828edce5dad0638ccfba8771c
diff --git a/metadata/md5-cache/media-libs/mesa-9.1 b/metadata/md5-cache/media-libs/mesa-9.1
index 8bdc61bd0eb6..38ecdba9f0e9 100644
--- a/metadata/md5-cache/media-libs/mesa-9.1
+++ b/metadata/md5-cache/media-libs/mesa-9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=!<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.7 dev-libs/expat gbm? ( virtual/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8.1 vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( >=dev-libs/wayland-1.0.3 ) xorg? ( x11-base/xorg-server:= x11-libs/libdrm[libkms] ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.42[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-libs/libxml2[python,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-devel/bison sys-devel/flex virtual/pkgconfig >=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15-r1 >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!<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.7 dev-libs/expat gbm? ( virtual/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8.1 vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( >=dev-libs/wayland-1.0.3 ) xorg? ( x11-base/xorg-server:= x11-libs/libdrm[libkms] ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.42[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-libs/libxml2[python,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-devel/bison sys-devel/flex virtual/pkgconfig >=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15-r1 >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=5
 HOMEPAGE=http://mesa3d.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( ap
 REQUIRED_USE=llvm? ( gallium ) openvg? ( egl gallium ) gbm? ( shared-glapi ) gles1? ( egl ) gles2? ( egl ) r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) ) xa? ( gallium ) xorg? ( gallium ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/9.1/MesaLib-9.1.tar.bz2 mirror://gentoo/mesa-9.1-gentoo-patches-01.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e498fac42f302365c1356e9d6bcde3de
diff --git a/metadata/md5-cache/media-libs/mesa-9.1.1 b/metadata/md5-cache/media-libs/mesa-9.1.1
index 83d1e0f03297..669b3e1ad5dc 100644
--- a/metadata/md5-cache/media-libs/mesa-9.1.1
+++ b/metadata/md5-cache/media-libs/mesa-9.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=!<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.7 dev-libs/expat gbm? ( virtual/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8.1 vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( >=dev-libs/wayland-1.0.3 ) xorg? ( x11-base/xorg-server:= x11-libs/libdrm[libkms] ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.42[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-libs/libxml2[python,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-devel/bison sys-devel/flex virtual/pkgconfig >=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15-r1 >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!<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.7 dev-libs/expat gbm? ( virtual/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8.1 vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( >=dev-libs/wayland-1.0.3 ) xorg? ( x11-base/xorg-server:= x11-libs/libdrm[libkms] ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.42[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-libs/libxml2[python,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-devel/bison sys-devel/flex virtual/pkgconfig >=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15-r1 >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=5
 HOMEPAGE=http://mesa3d.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( ap
 REQUIRED_USE=llvm? ( gallium ) openvg? ( egl gallium ) gbm? ( shared-glapi ) gles1? ( egl ) gles2? ( egl ) r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) ) xa? ( gallium ) xorg? ( gallium ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/9.1.1/MesaLib-9.1.1.tar.bz2 mirror://gentoo/mesa-9.1-gentoo-patches-01.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b3b9ec238d9cb6edf990be6eb2acfcb4
diff --git a/metadata/md5-cache/media-libs/mesa-9.2_pre20130404 b/metadata/md5-cache/media-libs/mesa-9.2_pre20130404
index 221dd03f4e6a..cce700a296d4 100644
--- a/metadata/md5-cache/media-libs/mesa-9.2_pre20130404
+++ b/metadata/md5-cache/media-libs/mesa-9.2_pre20130404
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=!<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.7 dev-libs/expat gbm? ( virtual/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8.1 vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( >=dev-libs/wayland-1.0.3 ) xorg? ( x11-base/xorg-server:= x11-libs/libdrm[libkms] ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.42[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-libs/libxml2[python,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-devel/bison sys-devel/flex virtual/pkgconfig >=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15-r1 >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!<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.7 dev-libs/expat gbm? ( virtual/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8.1 vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( >=dev-libs/wayland-1.0.3 ) xorg? ( x11-base/xorg-server:= x11-libs/libdrm[libkms] ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.42[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-libs/libxml2[python,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-devel/bison sys-devel/flex virtual/pkgconfig >=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15-r1 >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=5
 HOMEPAGE=http://mesa3d.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( ap
 REQUIRED_USE=llvm? ( gallium ) openvg? ( egl gallium ) gbm? ( shared-glapi ) gles1? ( egl ) gles2? ( egl ) r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) ) xa? ( gallium ) xorg? ( gallium ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium )
 SLOT=0
 SRC_URI=mirror://gentoo/mesa-9.2_pre20130404.tar.xz mirror://gentoo/mesa-9.2_pre20130404-gentoo-patches-01.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7711997b5600986480c912ee4354f3da
diff --git a/metadata/md5-cache/media-libs/ming-0.4.4 b/metadata/md5-cache/media-libs/ming-0.4.4
index 93445d8f3c5a..a001bf5dee5d 100644
--- a/metadata/md5-cache/media-libs/ming-0.4.4
+++ b/metadata/md5-cache/media-libs/ming-0.4.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare prerm setup test unpack
-DEPEND=sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 ) >=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* )
+DEPEND=sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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* )
 DESCRIPTION=An Open Source library for Flash movie generation.
 EAPI=4
 HOMEPAGE=http://ming.sourceforge.net/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( php_targets_php5-3 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ming/ming-0.4.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e9317ec2968bab9fb07e01037509e283
diff --git a/metadata/md5-cache/media-libs/openexr-2.0.0 b/metadata/md5-cache/media-libs/openexr-2.0.0
index 2ff8ee3b3873..9efd345904d0 100644
--- a/metadata/md5-cache/media-libs/openexr-2.0.0
+++ b/metadata/md5-cache/media-libs/openexr-2.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/zlib:= >=media-libs/ilmbase-2.0.0:= virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib:= >=media-libs/ilmbase-2.0.0:= virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ILM's OpenEXR high dynamic-range image file format libraries
 EAPI=5
 HOMEPAGE=http://openexr.com/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/zlib:= >=media-libs/ilmbase-2.0.0:=
 SLOT=0/20
 SRC_URI=http://download.savannah.gnu.org/releases/openexr/openexr-2.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=abbfa1cd7b2c5f4dc8682de7316fbd14
diff --git a/metadata/md5-cache/media-libs/openexr_ctl-1.0.1-r1 b/metadata/md5-cache/media-libs/openexr_ctl-1.0.1-r1
index cd1081610fed..d5fba2d604aa 100644
--- a/metadata/md5-cache/media-libs/openexr_ctl-1.0.1-r1
+++ b/metadata/md5-cache/media-libs/openexr_ctl-1.0.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/ilmbase:= media-libs/openexr:= media-libs/ctl:= virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/ilmbase:= media-libs/openexr:= media-libs/ctl:= virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenEXR CTL libraries
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/ampasctl
@@ -9,5 +9,5 @@ LICENSE=AMPAS
 RDEPEND=media-libs/ilmbase:= media-libs/openexr:= media-libs/ctl:=
 SLOT=0
 SRC_URI=mirror://sourceforge/ampasctl/openexr_ctl-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=05011f5397d581f868923620587d4ef0
diff --git a/metadata/md5-cache/media-libs/opus-1.0.1 b/metadata/md5-cache/media-libs/opus-1.0.1
index 2fc5cfd1fde0..42dddaf9ed84 100644
--- a/metadata/md5-cache/media-libs/opus-1.0.1
+++ b/metadata/md5-cache/media-libs/opus-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open versatile codec designed for interactive speech and audio transmission over the internet
 EAPI=4
 HOMEPAGE=http://opus-codec.org/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/opus/opus-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=375885816ee04ed5f8826f2c51d8a4fe
diff --git a/metadata/md5-cache/media-libs/opus-1.0.2 b/metadata/md5-cache/media-libs/opus-1.0.2
index 2e0c0d9485b8..94b32dafa7bf 100644
--- a/metadata/md5-cache/media-libs/opus-1.0.2
+++ b/metadata/md5-cache/media-libs/opus-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open versatile codec designed for interactive speech and audio transmission over the internet
 EAPI=4
 HOMEPAGE=http://opus-codec.org/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/opus/opus-1.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=398b21f3d4d167c947921d1b03dfed36
diff --git a/metadata/md5-cache/media-libs/opus-1.0.2-r1 b/metadata/md5-cache/media-libs/opus-1.0.2-r1
index 4c2b0e0e64ae..a7ba4f765923 100644
--- a/metadata/md5-cache/media-libs/opus-1.0.2-r1
+++ b/metadata/md5-cache/media-libs/opus-1.0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open versatile codec designed for interactive speech and audio transmission over the internet
 EAPI=4
 HOMEPAGE=http://opus-codec.org/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/opus/opus-1.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=5122d9293ef096a027516c416b4a89d9
diff --git a/metadata/md5-cache/media-libs/plotutils-2.6 b/metadata/md5-cache/media-libs/plotutils-2.6
index a8ea2dbfc868..6323dc0a656c 100644
--- a/metadata/md5-cache/media-libs/plotutils-2.6
+++ b/metadata/md5-cache/media-libs/plotutils-2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=png? ( media-libs/libpng sys-libs/zlib ) X? ( x11-libs/libXaw x11-proto/xextproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=png? ( media-libs/libpng sys-libs/zlib ) X? ( x11-libs/libXaw x11-proto/xextproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a powerful C/C++ function library for exporting 2-D vector graphics
 EAPI=3
 HOMEPAGE=http://www.gnu.org/software/plotutils/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=png? ( media-libs/libpng sys-libs/zlib ) X? ( x11-libs/libXaw x11-proto/xextproto )
 SLOT=0
 SRC_URI=mirror://gnu/plotutils/plotutils-2.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9dfb20d812be1eb9ee60a47d136fe8a0
diff --git a/metadata/md5-cache/media-libs/pymemphis-0.2.1 b/metadata/md5-cache/media-libs/pymemphis-0.2.1
index ef5b0446a085..c212485bc56f 100644
--- a/metadata/md5-cache/media-libs/pymemphis-0.2.1
+++ b/metadata/md5-cache/media-libs/pymemphis-0.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pycairo dev-python/pygobject:2 media-libs/memphis || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=dev-python/pycairo dev-python/pygobject:2 media-libs/memphis || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=Python bindings for the libmemphis library
 EAPI=3
 HOMEPAGE=http://gitorious.net/pymemphis
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-python/pycairo dev-python/pygobject:2 media-libs/memphis =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://gentoo/pymemphis-0.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=7129554dd7b1c611ee14953f2ef578e9
diff --git a/metadata/md5-cache/media-libs/resid-0.16_p2 b/metadata/md5-cache/media-libs/resid-0.16_p2
index f667a95062c3..2c433977dc3a 100644
--- a/metadata/md5-cache/media-libs/resid-0.16_p2
+++ b/metadata/md5-cache/media-libs/resid-0.16_p2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C++ library to emulate the C64 SID chip
 EAPI=2
 HOMEPAGE=http://sidplay2.sourceforge.net
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/sidplay2/resid-0.16-p2.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1e7ce86ab9aac05cf47e2ac109f63e77
diff --git a/metadata/md5-cache/media-libs/rtaudio-4.0.11 b/metadata/md5-cache/media-libs/rtaudio-4.0.11
index 0f865277f3ca..45ed0a77ff83 100644
--- a/metadata/md5-cache/media-libs/rtaudio-4.0.11
+++ b/metadata/md5-cache/media-libs/rtaudio-4.0.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) pulseaudio? ( media-sound/pulseaudio ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) pulseaudio? ( media-sound/pulseaudio ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A set of cross-platform C++ classes for realtime audio I/O
 EAPI=5
 HOMEPAGE=http://www.music.mcgill.ca/~gary/rtaudio/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=http://www.music.mcgill.ca/~gary/rtaudio/release/rtaudio-4.0.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=be1a4f426a3f72b8cb1e38093050eb28
diff --git a/metadata/md5-cache/media-libs/schroedinger-1.0.10 b/metadata/md5-cache/media-libs/schroedinger-1.0.10
index 079325cb9d58..f931726b77a6 100644
--- a/metadata/md5-cache/media-libs/schroedinger-1.0.10
+++ b/metadata/md5-cache/media-libs/schroedinger-1.0.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-lang/orc-0.4.10 virtual/pkgconfig dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-lang/orc-0.4.10 virtual/pkgconfig dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C-based libraries for the Dirac video codec
 EAPI=3
 HOMEPAGE=http://www.diracvideo.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2 MIT MPL-1.1
 RDEPEND=>=dev-lang/orc-0.4.10
 SLOT=0
 SRC_URI=http://www.diracvideo.org/download/schroedinger/schroedinger-1.0.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=beeff86e617500287e70381c268a875a
diff --git a/metadata/md5-cache/media-libs/schroedinger-1.0.10-r1 b/metadata/md5-cache/media-libs/schroedinger-1.0.10-r1
index eed7606eda59..c7fb27c33249 100644
--- a/metadata/md5-cache/media-libs/schroedinger-1.0.10-r1
+++ b/metadata/md5-cache/media-libs/schroedinger-1.0.10-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-lang/orc-0.4.13 virtual/pkgconfig dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-lang/orc-0.4.13 virtual/pkgconfig dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C-based libraries for the Dirac video codec
 EAPI=3
 HOMEPAGE=http://www.diracvideo.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2 MIT MPL-1.1
 RDEPEND=>=dev-lang/orc-0.4.13
 SLOT=0
 SRC_URI=http://www.diracvideo.org/download/schroedinger/schroedinger-1.0.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dff28b52e2cb96873f27d597989768fb
diff --git a/metadata/md5-cache/media-libs/schroedinger-1.0.11 b/metadata/md5-cache/media-libs/schroedinger-1.0.11
index c09e6a668179..989737cfc616 100644
--- a/metadata/md5-cache/media-libs/schroedinger-1.0.11
+++ b/metadata/md5-cache/media-libs/schroedinger-1.0.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-lang/orc-0.4.16 virtual/pkgconfig dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-lang/orc-0.4.16 virtual/pkgconfig dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C-based libraries for the Dirac video codec
 EAPI=4
 HOMEPAGE=http://www.diracvideo.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2 MIT MPL-1.1
 RDEPEND=>=dev-lang/orc-0.4.16
 SLOT=0
 SRC_URI=http://www.diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1d2e0f626104f73d32aaa18c7c11c396
diff --git a/metadata/md5-cache/media-libs/schroedinger-1.0.9 b/metadata/md5-cache/media-libs/schroedinger-1.0.9
index b54ebd808533..3ac43ad86c76 100644
--- a/metadata/md5-cache/media-libs/schroedinger-1.0.9
+++ b/metadata/md5-cache/media-libs/schroedinger-1.0.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-lang/orc-0.4.3 <dev-lang/orc-0.4.10 virtual/pkgconfig dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-lang/orc-0.4.3 <dev-lang/orc-0.4.10 virtual/pkgconfig dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C-based libraries for the Dirac video codec
 EAPI=3
 HOMEPAGE=http://www.diracvideo.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2 MIT MPL-1.1
 RDEPEND=>=dev-lang/orc-0.4.3 <dev-lang/orc-0.4.10
 SLOT=0
 SRC_URI=http://www.diracvideo.org/download/schroedinger/schroedinger-1.0.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=93447c6fa56a3bd1f2e0ba9bb9f1552d
diff --git a/metadata/md5-cache/media-libs/sdl-gfx-2.0.24 b/metadata/md5-cache/media-libs/sdl-gfx-2.0.24
index 56162f0a145e..306e6594417c 100644
--- a/metadata/md5-cache/media-libs/sdl-gfx-2.0.24
+++ b/metadata/md5-cache/media-libs/sdl-gfx-2.0.24
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libsdl[video] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl[video] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Graphics drawing primitives library for SDL
 EAPI=2
 HOMEPAGE=http://www.ferzkopp.net/joomla/content/view/19/14/
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=media-libs/libsdl[video]
 SLOT=0
 SRC_URI=http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.24.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7904d76e4e4918977554558174a7eb86
diff --git a/metadata/md5-cache/media-libs/sdl-sound-1.0.3 b/metadata/md5-cache/media-libs/sdl-sound-1.0.3
index d5db753620cd..af2d49254e00 100644
--- a/metadata/md5-cache/media-libs/sdl-sound-1.0.3
+++ b/metadata/md5-cache/media-libs/sdl-sound-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/libsdl-1.2 flac? ( media-libs/flac ) mikmod? ( >=media-libs/libmikmod-3.1.9 ) modplug? ( media-libs/libmodplug ) vorbis? ( >=media-libs/libvorbis-1.0_beta4 ) speex? ( media-libs/speex media-libs/libogg ) physfs? ( dev-games/physfs ) mpeg? ( media-libs/smpeg ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libsdl-1.2 flac? ( media-libs/flac ) mikmod? ( >=media-libs/libmikmod-3.1.9 ) modplug? ( media-libs/libmodplug ) vorbis? ( >=media-libs/libvorbis-1.0_beta4 ) speex? ( media-libs/speex media-libs/libogg ) physfs? ( dev-games/physfs ) mpeg? ( media-libs/smpeg ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library that handles the decoding of sound file formats
 EAPI=2
 HOMEPAGE=http://icculus.org/SDL_sound/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/libsdl-1.2 flac? ( media-libs/flac ) mikmod? ( >=media-libs/libmikmod-3.1.9 ) modplug? ( media-libs/libmodplug ) vorbis? ( >=media-libs/libvorbis-1.0_beta4 ) speex? ( media-libs/speex media-libs/libogg ) physfs? ( dev-games/physfs ) mpeg? ( media-libs/smpeg )
 SLOT=0
 SRC_URI=http://icculus.org/SDL_sound/downloads/SDL_sound-1.0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d33ab7816e87983cf11954c861cacf52
diff --git a/metadata/md5-cache/media-libs/sdl-ttf-2.0.11 b/metadata/md5-cache/media-libs/sdl-ttf-2.0.11
index d05bd1ce74e6..e7cc44b765c5 100644
--- a/metadata/md5-cache/media-libs/sdl-ttf-2.0.11
+++ b/metadata/md5-cache/media-libs/sdl-ttf-2.0.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=X? ( x11-libs/libXt ) media-libs/libsdl >=media-libs/freetype-2.3 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=X? ( x11-libs/libXt ) media-libs/libsdl >=media-libs/freetype-2.3 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=library that allows you to use TrueType fonts in SDL applications
 EAPI=2
 HOMEPAGE=http://www.libsdl.org/projects/SDL_ttf/
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=X? ( x11-libs/libXt ) media-libs/libsdl >=media-libs/freetype-2.3
 SLOT=0
 SRC_URI=http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6946ad6aebe2ecb3407b009ff0d98955
diff --git a/metadata/md5-cache/media-libs/sg-1.4 b/metadata/md5-cache/media-libs/sg-1.4
index 6263cf9309d7..8672a13a94bd 100644
--- a/metadata/md5-cache/media-libs/sg-1.4
+++ b/metadata/md5-cache/media-libs/sg-1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/maloc x11-libs/libXaw x11-libs/motif 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/maloc x11-libs/libXaw x11-libs/motif 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Socket Graphics tool for displaying polygons
 EAPI=3
 HOMEPAGE=http://fetk.org/codes/sg/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/maloc x11-libs/libXaw x11-libs/motif opengl? ( || ( <media-libs/mesa-8[motif] ( media-libs/mesa x11-libs/libGLw ) media-libs/opengl-apple ) )
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/sg-1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=95a223f5a3b0f2c855cdb51320c5c02b
diff --git a/metadata/md5-cache/media-libs/sg-1.5 b/metadata/md5-cache/media-libs/sg-1.5
index 3369d136a0a7..54b52bf1b88e 100644
--- a/metadata/md5-cache/media-libs/sg-1.5
+++ b/metadata/md5-cache/media-libs/sg-1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/maloc x11-libs/libXaw x11-libs/motif || ( <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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/maloc x11-libs/libXaw x11-libs/motif || ( <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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Socket Graphics tool for displaying polygons
 EAPI=4
 HOMEPAGE=http://fetk.org/codes/sg/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/maloc x11-libs/libXaw x11-libs/motif || ( <media-libs/mesa-8[motif] ( media-libs/mesa x11-libs/libGLw ) media-libs/opengl-apple )
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/sg-1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3871700f596e95580009990009ed5daf
diff --git a/metadata/md5-cache/media-libs/shivavg-0.2.1 b/metadata/md5-cache/media-libs/shivavg-0.2.1
index b7fe1cdb40ff..32e745797c81 100644
--- a/metadata/md5-cache/media-libs/shivavg-0.2.1
+++ b/metadata/md5-cache/media-libs/shivavg-0.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=virtual/glu media-libs/freeglut virtual/opengl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/glu media-libs/freeglut virtual/opengl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=open-source implementation of the Khronos' OpenVG specification
 EAPI=3
 HOMEPAGE=http://shivavg.sourceforge.net
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/glu media-libs/freeglut virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/shivavg/ShivaVG-0.2.1.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=03825edc7426347613275a61f92ab1c0
diff --git a/metadata/md5-cache/media-libs/smpeg-0.4.4-r9 b/metadata/md5-cache/media-libs/smpeg-0.4.4-r9
index 1bb7e802b601..1e59f60034e9 100644
--- a/metadata/md5-cache/media-libs/smpeg-0.4.4-r9
+++ b/metadata/md5-cache/media-libs/smpeg-0.4.4-r9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/libsdl-1.2.0 opengl? ( virtual/glu virtual/opengl ) X? ( x11-libs/libXext x11-libs/libXi x11-libs/libX11 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libsdl-1.2.0 opengl? ( virtual/glu virtual/opengl ) X? ( x11-libs/libXext x11-libs/libXi x11-libs/libX11 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=SDL MPEG Player Library
 EAPI=4
 HOMEPAGE=http://icculus.org/smpeg/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=media-libs/libsdl-1.2.0 opengl? ( virtual/glu virtual/opengl ) X? ( x11-libs/libXext x11-libs/libXi x11-libs/libX11 )
 SLOT=0
 SRC_URI=ftp://ftp.lokigames.com/pub/open-source/smpeg/smpeg-0.4.4.tar.gz mirror://gentoo/smpeg-0.4.4-gtkm4.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=94087dccad5c74ff16027c49c0309cce
diff --git a/metadata/md5-cache/media-libs/speex-1.2_rc1 b/metadata/md5-cache/media-libs/speex-1.2_rc1
index 42e33707da60..bba856a20500 100644
--- a/metadata/md5-cache/media-libs/speex-1.2_rc1
+++ b/metadata/md5-cache/media-libs/speex-1.2_rc1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=ogg? ( media-libs/libogg ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ogg? ( media-libs/libogg ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Audio compression format designed for speech.
 EAPI=2
 HOMEPAGE=http://www.speex.org
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ogg? ( media-libs/libogg )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4f1bbdc975ce7ef8b050e0a7f74bb714
diff --git a/metadata/md5-cache/media-libs/speex-1.2_rc1-r1 b/metadata/md5-cache/media-libs/speex-1.2_rc1-r1
index ab1699bc22cb..68b8a42b00ad 100644
--- a/metadata/md5-cache/media-libs/speex-1.2_rc1-r1
+++ b/metadata/md5-cache/media-libs/speex-1.2_rc1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=ogg? ( media-libs/libogg ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ogg? ( media-libs/libogg ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Audio compression format designed for speech.
 EAPI=2
 HOMEPAGE=http://www.speex.org
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ogg? ( media-libs/libogg )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=04679abc7bf8e51b136b0a017bb73bc7
diff --git a/metadata/md5-cache/media-libs/stk-4.4.4-r1 b/metadata/md5-cache/media-libs/stk-4.4.4-r1
index fa72aa5d1b2a..2c4b7c5c523f 100644
--- a/metadata/md5-cache/media-libs/stk-4.4.4-r1
+++ b/metadata/md5-cache/media-libs/stk-4.4.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) virtual/pkgconfig dev-lang/perl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) virtual/pkgconfig dev-lang/perl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Synthesis ToolKit in C++
 EAPI=2
 HOMEPAGE=http://ccrma.stanford.edu/software/stk/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit )
 SLOT=0
 SRC_URI=http://ccrma.stanford.edu/software/stk/release/stk-4.4.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a1ed8e6590e82cab7dbe2018ee811174
diff --git a/metadata/md5-cache/media-libs/tremor-0_pre20120120 b/metadata/md5-cache/media-libs/tremor-0_pre20120120
index ede4763fe3c6..76292a4f5fae 100644
--- a/metadata/md5-cache/media-libs/tremor-0_pre20120120
+++ b/metadata/md5-cache/media-libs/tremor-0_pre20120120
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libogg virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libogg virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fixed-point version of the Ogg Vorbis decoder (also known as libvorbisidec)
 EAPI=4
 HOMEPAGE=http://wiki.xiph.org/Tremor
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=media-libs/libogg
 SLOT=0
 SRC_URI=mirror://gentoo/tremor-0_pre20120120.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=1f2a659e34cf70b09ce298a0622d9701
diff --git a/metadata/md5-cache/media-libs/tremor-0_pre20130223 b/metadata/md5-cache/media-libs/tremor-0_pre20130223
index 33f78c96f8fa..6a20e48b32d3 100644
--- a/metadata/md5-cache/media-libs/tremor-0_pre20130223
+++ b/metadata/md5-cache/media-libs/tremor-0_pre20130223
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libogg:= virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libogg:= virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fixed-point version of the Ogg Vorbis decoder (also known as libvorbisidec)
 EAPI=5
 HOMEPAGE=http://wiki.xiph.org/Tremor
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=media-libs/libogg:=
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ssuominen/tremor-0_pre20130223.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1a2f7e2afd84826dcfb13bc960e9e547
diff --git a/metadata/md5-cache/media-libs/tse3-0.3.1-r1 b/metadata/md5-cache/media-libs/tse3-0.3.1-r1
index db0167d54f41..96cab6f700f0 100644
--- a/metadata/md5-cache/media-libs/tse3-0.3.1-r1
+++ b/metadata/md5-cache/media-libs/tse3-0.3.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=alsa? ( media-libs/alsa-lib ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=alsa? ( media-libs/alsa-lib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=TSE3 Sequencer library
 EAPI=2
 HOMEPAGE=http://TSE3.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib )
 SLOT=0
 SRC_URI=mirror://sourceforge/tse3/tse3-0.3.1.tar.gz mirror://gentoo/tse3-0.3.1-awe_voice.h.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6d39d14db97f47f9e48a905b67cf8937
diff --git a/metadata/md5-cache/media-libs/vo-aacenc-0.1.0 b/metadata/md5-cache/media-libs/vo-aacenc-0.1.0
index 34b7d408c809..a3c65795709f 100644
--- a/metadata/md5-cache/media-libs/vo-aacenc-0.1.0
+++ b/metadata/md5-cache/media-libs/vo-aacenc-0.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=VisualOn AAC encoder library
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/opencore-amr/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~x86-fbsd ~x64-macos
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/opencore-amr/vo-aacenc-0.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e22f5757a58fb03127a0256583e93220
diff --git a/metadata/md5-cache/media-libs/vo-aacenc-0.1.1 b/metadata/md5-cache/media-libs/vo-aacenc-0.1.1
index 362a128bca59..71646a357e34 100644
--- a/metadata/md5-cache/media-libs/vo-aacenc-0.1.1
+++ b/metadata/md5-cache/media-libs/vo-aacenc-0.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=VisualOn AAC encoder library
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/opencore-amr/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-linux ~x64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/opencore-amr/vo-aacenc-0.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7418a22d6ada1f9f690375d33f4750c6
diff --git a/metadata/md5-cache/media-libs/vo-aacenc-0.1.2 b/metadata/md5-cache/media-libs/vo-aacenc-0.1.2
index a5b30386c99f..e93eef63d6a3 100644
--- a/metadata/md5-cache/media-libs/vo-aacenc-0.1.2
+++ b/metadata/md5-cache/media-libs/vo-aacenc-0.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=VisualOn AAC encoder library
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/opencore-amr/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~am
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/opencore-amr/vo-aacenc-0.1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6b7dd64cae5f6bd46d1772f2558d8f35
diff --git a/metadata/md5-cache/media-libs/vo-aacenc-9999 b/metadata/md5-cache/media-libs/vo-aacenc-9999
index 3780df0ad94e..8e12dcde97fc 100644
--- a/metadata/md5-cache/media-libs/vo-aacenc-9999
+++ b/metadata/md5-cache/media-libs/vo-aacenc-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=VisualOn AAC encoder library
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/opencore-amr/
 IUSE=examples static-libs neon
 LICENSE=Apache-2.0
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=05e6e0f685b0ceca436972267821db49
diff --git a/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.0 b/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.0
index 56da4b816d89..46213fb1d9ee 100644
--- a/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.0
+++ b/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=VisualOn AMR-WB encoder library
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/opencore-amr/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~x86-fbsd ~x64-macos ppc
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/opencore-amr/vo-amrwbenc-0.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a3fbda861fdb475b2e830f37b3b7608
diff --git a/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.1 b/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.1
index 81a2eb8035c0..1a4c0bf1ff13 100644
--- a/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.1
+++ b/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=VisualOn AMR-WB encoder library
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/opencore-amr/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/opencore-amr/vo-amrwbenc-0.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=30c6b4c97e25d1b5c04b2248e7176a09
diff --git a/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.2 b/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.2
index 2a3e5dcc5278..59eeb0989106 100644
--- a/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.2
+++ b/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=VisualOn AMR-WB encoder library
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/opencore-amr/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/opencore-amr/vo-amrwbenc-0.1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=88a898b90dd4fe6de355338101e69ab4
diff --git a/metadata/md5-cache/media-libs/vo-amrwbenc-9999 b/metadata/md5-cache/media-libs/vo-amrwbenc-9999
index 18f31ed22adf..2bed43e633e1 100644
--- a/metadata/md5-cache/media-libs/vo-amrwbenc-9999
+++ b/metadata/md5-cache/media-libs/vo-amrwbenc-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=VisualOn AMR-WB encoder library
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/opencore-amr/
 IUSE=examples static-libs
 LICENSE=Apache-2.0
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2767d5b60db4a82497e283b1ba4cee1e
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.9999 b/metadata/md5-cache/media-libs/xine-lib-1.2.9999
index 15f6ba42db0c..e5c2fbade3a2 100644
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.9999
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=virtual/libintl dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib || ( media-video/ffmpeg media-libs/libpostproc <media-video/libav-0.8.2-r1 ) virtual/ffmpeg virtual/libiconv 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 ) sys-devel/gettext app-arch/xz-utils virtual/pkgconfig >=sys-devel/libtool-2.2.6b 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/mercurial
+DEPEND=virtual/libintl dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib || ( media-video/ffmpeg media-libs/libpostproc <media-video/libav-0.8.2-r1 ) virtual/ffmpeg virtual/libiconv 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 ) sys-devel/gettext app-arch/xz-utils virtual/pkgconfig >=sys-devel/libtool-2.2.6b 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/mercurial
 DESCRIPTION=Core libraries for Xine movie player
 EAPI=4
 HOMEPAGE=http://xine.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libintl dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib || ( media-video/ffmpeg media-libs/libpostproc <media-video/libav-0.8.2-r1 ) virtual/ffmpeg virtual/libiconv 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 )
 REQUIRED_USE=vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
 SLOT=1
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mercurial	7e8c2c49cfd90701e20a78850f066802	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mercurial	7e8c2c49cfd90701e20a78850f066802	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3dfbd8bdc4c08e2537c37db435958eaa
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.24 b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.24
index 2029a02a44f1..8d19dcbd6ff8 100644
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.24
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.24
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ALSA extra plugins
 EAPI=4
 HOMEPAGE=http://www.alsa-project.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://alsaproject/plugins/alsa-plugins-1.0.24.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=55935513e68aa82958775227e074ff76
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.25 b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.25
index f44c122aaa2d..40b5eaf01d60 100644
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.25
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.25
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ALSA extra plugins
 EAPI=3
 HOMEPAGE=http://www.alsa-project.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://alsaproject/plugins/alsa-plugins-1.0.25.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=90c7d37f19295a95301680755ef8ca12
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.25-r1 b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.25-r1
index 51c1ac54356d..5ed371779972 100644
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.25-r1
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.25-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ALSA extra plugins
 EAPI=3
 HOMEPAGE=http://www.alsa-project.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://alsaproject/plugins/alsa-plugins-1.0.25.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=71a27c85fafc227bf68d3c33b5f62e29
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.25-r2 b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.25-r2
index c00db5af132a..0ff44c6ea121 100644
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.25-r2
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.25-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=>=media-libs/alsa-lib-1.0.25 ffmpeg? ( virtual/ffmpeg ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) libsamplerate? ( media-libs/libsamplerate ) pulseaudio? ( media-sound/pulseaudio ) speex? ( media-libs/speex ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/alsa-lib-1.0.25 ffmpeg? ( virtual/ffmpeg ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) libsamplerate? ( media-libs/libsamplerate ) pulseaudio? ( media-sound/pulseaudio ) speex? ( media-libs/speex ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ALSA extra plugins
 EAPI=4
 HOMEPAGE=http://www.alsa-project.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=media-libs/alsa-lib-1.0.25 ffmpeg? ( virtual/ffmpeg ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) libsamplerate? ( media-libs/libsamplerate ) pulseaudio? ( media-sound/pulseaudio ) speex? ( media-libs/speex )
 SLOT=0
 SRC_URI=mirror://alsaproject/plugins/alsa-plugins-1.0.25.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=67e83f139ee615e78347fb8b0cf6212f
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.26 b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.26
index 7d5e6971820e..41ef0ea3ee95 100644
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.26
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.26
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=>=media-libs/alsa-lib-1.0.26 ffmpeg? ( virtual/ffmpeg ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) libsamplerate? ( media-libs/libsamplerate ) pulseaudio? ( media-sound/pulseaudio ) speex? ( media-libs/speex ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/alsa-lib-1.0.26 ffmpeg? ( virtual/ffmpeg ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) libsamplerate? ( media-libs/libsamplerate ) pulseaudio? ( media-sound/pulseaudio ) speex? ( media-libs/speex ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ALSA extra plugins
 EAPI=4
 HOMEPAGE=http://www.alsa-project.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=media-libs/alsa-lib-1.0.26 ffmpeg? ( virtual/ffmpeg ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) libsamplerate? ( media-libs/libsamplerate ) pulseaudio? ( media-sound/pulseaudio ) speex? ( media-libs/speex )
 SLOT=0
 SRC_URI=mirror://alsaproject/plugins/alsa-plugins-1.0.26.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4aa0f0bb559b2055874c1a36f4fdd4b7
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=985619ba7cd4c5248006fb1ba9e61467
diff --git a/metadata/md5-cache/media-plugins/audacious-plugins-3.2.2-r1 b/metadata/md5-cache/media-plugins/audacious-plugins-3.2.2-r1
index d473b448fd78..ab5cdaba7c84 100644
--- a/metadata/md5-cache/media-plugins/audacious-plugins-3.2.2-r1
+++ b/metadata/md5-cache/media-plugins/audacious-plugins-3.2.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/libmodplug ~media-sound/audacious-3.2.2 >=net-libs/neon-0.26.4 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 >=dev-libs/libcdio-0.79-r1 ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) mtp? ( media-libs/libmtp ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl[audio] ) sid? ( >=media-libs/libsidplay-2.1.1-r2 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 ) nls? ( dev-util/intltool ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/libmodplug ~media-sound/audacious-3.2.2 >=net-libs/neon-0.26.4 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 >=dev-libs/libcdio-0.79-r1 ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) mtp? ( media-libs/libmtp ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl[audio] ) sid? ( >=media-libs/libsidplay-2.1.1-r2 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 ) nls? ( dev-util/intltool ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Audacious Player - Your music, your way, no exceptions
 EAPI=4
 HOMEPAGE=http://audacious-media-player.org/
@@ -10,5 +10,5 @@ RDEPEND=app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/l
 REQUIRED_USE=^^ ( gtk gtk3 )
 SLOT=0
 SRC_URI=http://distfiles.audacious-media-player.org/audacious-plugins-3.2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=337f19113da0afaf6d3db261db1201da
diff --git a/metadata/md5-cache/media-plugins/frei0r-plugins-1.1.22-r1 b/metadata/md5-cache/media-plugins/frei0r-plugins-1.1.22-r1
index 3c1297c86620..ab110db4f964 100644
--- a/metadata/md5-cache/media-plugins/frei0r-plugins-1.1.22-r1
+++ b/metadata/md5-cache/media-plugins/frei0r-plugins-1.1.22-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=facedetect? ( media-libs/opencv ) scale0tilt? ( media-libs/gavl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=facedetect? ( media-libs/opencv ) scale0tilt? ( media-libs/gavl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A minimalistic plugin API for video effects
 EAPI=2
 HOMEPAGE=http://www.piksel.org/frei0r/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=facedetect? ( media-libs/opencv ) scale0tilt? ( media-libs/gavl )
 SLOT=0
 SRC_URI=http://propirate.net/frei0r/frei0r-plugins-1.1.22.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e5b72053cac02456d86d851a01ea2caa
diff --git a/metadata/md5-cache/media-plugins/gimp-lqr-0.7.1 b/metadata/md5-cache/media-plugins/gimp-lqr-0.7.1
index 94440d0d4f78..c952589723f1 100644
--- a/metadata/md5-cache/media-plugins/gimp-lqr-0.7.1
+++ b/metadata/md5-cache/media-plugins/gimp-lqr-0.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=media-gfx/gimp media-libs/liblqr || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-gfx/gimp media-libs/liblqr || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Content-aware resizing for the GIMP
 EAPI=4
 HOMEPAGE=http://liquidrescale.wikidot.com/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-gfx/gimp media-libs/liblqr
 SLOT=0
 SRC_URI=http://liquidrescale.wikidot.com/local--files/en:download-page-sources/gimp-lqr-plugin-0.7.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=86bf76db3f3f1fc3f773067071cb2302
diff --git a/metadata/md5-cache/media-plugins/gmpc-awn-11.8.16 b/metadata/md5-cache/media-plugins/gmpc-awn-11.8.16
index 24b97b63761f..b8d180e2d781 100644
--- a/metadata/md5-cache/media-plugins/gmpc-awn-11.8.16
+++ b/metadata/md5-cache/media-plugins/gmpc-awn-11.8.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=media-sound/gmpc-11.8.16 dev-libs/dbus-glib virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-sound/gmpc-11.8.16 dev-libs/dbus-glib virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=This plugin integrates GMPC with the Avant Window Navigator
 EAPI=4
 HOMEPAGE=http://gmpc.wikia.com/wiki/GMPC_PLUGIN_AWN
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-sound/gmpc-11.8.16 dev-libs/dbus-glib
 SLOT=0
 SRC_URI=http://download.sarine.nl/Programs/gmpc/11.8/gmpc-awn-11.8.16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aeb59d3d45940e0e565f547893e562b7
diff --git a/metadata/md5-cache/media-plugins/grilo-plugins-0.1.18 b/metadata/md5-cache/media-plugins/grilo-plugins-0.1.18
index 1832ce4b34f2..7718a7a9c406 100644
--- a/metadata/md5-cache/media-plugins/grilo-plugins-0.1.18
+++ b/metadata/md5-cache/media-plugins/grilo-plugins-0.1.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.26:2 ~media-libs/grilo-0.1.18:0.1[network] dev-libs/gmime:2.6 dev-libs/libxml2:2 dev-db/sqlite:3 youtube? ( >=dev-libs/libgdata-0.7 >=media-libs/libquvi-0.2.15 ) upnp-av? ( >=net-libs/gupnp-0.13 >=net-libs/gupnp-av-0.5 ) vimeo? ( net-libs/libsoup:2.4 dev-libs/libgcrypt ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.26:2 ~media-libs/grilo-0.1.18:0.1[network] dev-libs/gmime:2.6 dev-libs/libxml2:2 dev-db/sqlite:3 youtube? ( >=dev-libs/libgdata-0.7 >=media-libs/libquvi-0.2.15 ) upnp-av? ( >=net-libs/gupnp-0.13 >=net-libs/gupnp-av-0.5 ) vimeo? ( net-libs/libsoup:2.4 dev-libs/libgcrypt ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A framework for easy media discovery and browsing
 EAPI=4
 HOMEPAGE=https://live.gnome.org/Grilo
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.26:2 ~media-libs/grilo-0.1.18:0.1[network] dev-libs/gm
 RESTRICT=test
 SLOT=0.1
 SRC_URI=mirror://gnome/sources/grilo-plugins/0.1/grilo-plugins-0.1.18.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b74a289b907976361e53cf7b3d74855d
diff --git a/metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r2 b/metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r2
index d14c3d04332e..808bd8e13240 100644
--- a/metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r2
+++ b/metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/fontconfig ~media-libs/libvisual-0.4.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:2 ) jack? ( >=media-sound/jack-audio-connection-kit-0.109 ) opengl? ( virtual/glu virtual/opengl ) virtual/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/fontconfig ~media-libs/libvisual-0.4.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:2 ) jack? ( >=media-sound/jack-audio-connection-kit-0.109 ) opengl? ( virtual/glu virtual/opengl ) virtual/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=collection of visualization plugins for use with the libvisual framework
 EAPI=4
 HOMEPAGE=http://libvisual.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig ~media-libs/libvisual-0.4.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:2 ) jack? ( >=media-sound/jack-audio-connection-kit-0.109 ) opengl? ( virtual/glu virtual/opengl )
 SLOT=0.4
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fa033681cfce6f310d510b2cf8a94275
diff --git a/metadata/md5-cache/media-plugins/mediastreamer-silk-0.0.1 b/metadata/md5-cache/media-plugins/mediastreamer-silk-0.0.1
index 6921c5f37821..56caf25310f2 100644
--- a/metadata/md5-cache/media-plugins/mediastreamer-silk-0.0.1
+++ b/metadata/md5-cache/media-plugins/mediastreamer-silk-0.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare setup
-DEPEND=>=media-libs/mediastreamer-2.8.2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/mediastreamer-2.8.2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=SILK (skype codec) implementation for Linphone
 EAPI=4
 HOMEPAGE=http://www.linphone.org
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/mediastreamer-2.8.2
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://nongnu/linphone/plugins/sources/mssilk-0.0.1.tar.gz http://developer.skype.com/silk/SILK_SDK_SRC_v1.0.8.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d3780316ed3b4002b697b7a86c751e78
diff --git a/metadata/md5-cache/media-plugins/npapi-vlc-2.0.0 b/metadata/md5-cache/media-plugins/npapi-vlc-2.0.0
index 1c956cd36fc0..6cc7cc11f714 100644
--- a/metadata/md5-cache/media-plugins/npapi-vlc-2.0.0
+++ b/metadata/md5-cache/media-plugins/npapi-vlc-2.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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 virtual/pkgconfig >=net-misc/npapi-sdk-0.27 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig >=net-misc/npapi-sdk-0.27 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Mozilla plugin based on VLC
 EAPI=3
 HOMEPAGE=http://www.videolan.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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]
 SLOT=0
 SRC_URI=http://download.videolan.org/pub/videolan/vlc/2.0.0/npapi-vlc-2.0.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=51971246dc2b65099ef16ad50fd43888
diff --git a/metadata/md5-cache/media-plugins/npapi-vlc-9999 b/metadata/md5-cache/media-plugins/npapi-vlc-9999
index 5cf14cd76e8c..b7a3d3c2118f 100644
--- a/metadata/md5-cache/media-plugins/npapi-vlc-9999
+++ b/metadata/md5-cache/media-plugins/npapi-vlc-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=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] virtual/pkgconfig >=net-misc/npapi-sdk-0.27 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=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] virtual/pkgconfig >=net-misc/npapi-sdk-0.27 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Mozilla plugin based on VLC
 EAPI=3
 HOMEPAGE=http://www.videolan.org/
@@ -7,5 +7,5 @@ IUSE=gtk
 LICENSE=LGPL-2.1
 RDEPEND=>=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]
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=affc01237afa384070fc5c246f5174e7
diff --git a/metadata/md5-cache/media-plugins/swh-plugins-0.4.15 b/metadata/md5-cache/media-plugins/swh-plugins-0.4.15
index b06c4e246294..d7df7753e7e8 100644
--- a/metadata/md5-cache/media-plugins/swh-plugins-0.4.15
+++ b/metadata/md5-cache/media-plugins/swh-plugins-0.4.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=media-libs/ladspa-sdk >=sci-libs/fftw-3 sys-devel/gettext dev-vcs/cvs virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/ladspa-sdk >=sci-libs/fftw-3 sys-devel/gettext dev-vcs/cvs virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Large collection of LADSPA audio plugins/effects
 HOMEPAGE=http://plugin.org.uk
 IUSE=3dnow nls sse
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/ladspa-sdk >=sci-libs/fftw-3
 SLOT=0
 SRC_URI=http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d27f790837282a36feb1d7501305d164
diff --git a/metadata/md5-cache/media-plugins/swh-plugins-0.4.15-r1 b/metadata/md5-cache/media-plugins/swh-plugins-0.4.15-r1
index bdf85e908c29..ac65644da007 100644
--- a/metadata/md5-cache/media-plugins/swh-plugins-0.4.15-r1
+++ b/metadata/md5-cache/media-plugins/swh-plugins-0.4.15-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=media-libs/ladspa-sdk media-sound/gsm >=sci-libs/fftw-3 sys-devel/gettext dev-vcs/cvs virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/ladspa-sdk media-sound/gsm >=sci-libs/fftw-3 sys-devel/gettext dev-vcs/cvs virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Large collection of LADSPA audio plugins/effects
 HOMEPAGE=http://plugin.org.uk
 IUSE=3dnow nls sse
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/ladspa-sdk media-sound/gsm >=sci-libs/fftw-3
 SLOT=0
 SRC_URI=http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c1cfea0c88673715cac2cb96a5eff560
diff --git a/metadata/md5-cache/media-plugins/xbmc-addon-xvdr-9999 b/metadata/md5-cache/media-plugins/xbmc-addon-xvdr-9999
index c10e1e33f65c..c52af62e58f0 100644
--- a/metadata/md5-cache/media-plugins/xbmc-addon-xvdr-9999
+++ b/metadata/md5-cache/media-plugins/xbmc-addon-xvdr-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=configure info install prepare unpack
-DEPEND=dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=XBMC addon: add VDR (http://www.cadsoft.de/vdr) as a TV/PVR Backend
 EAPI=4
 HOMEPAGE=https://github.com/pipelka/xbmc-addon-xvdr
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=a6c111877213c51102d80ee70c82e254
diff --git a/metadata/md5-cache/media-radio/ax25-apps-0.0.6-r1 b/metadata/md5-cache/media-radio/ax25-apps-0.0.6-r1
index 3390078a2e8d..d8705c2aba52 100644
--- a/metadata/md5-cache/media-radio/ax25-apps-0.0.6-r1
+++ b/metadata/md5-cache/media-radio/ax25-apps-0.0.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=dev-libs/libax25-0.0.7 !media-sound/listen || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libax25-0.0.7 !media-sound/listen || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Basic AX.25 (Amateur Radio) user tools, additional daemons
 EAPI=4
 HOMEPAGE=http://ax25.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libax25-0.0.7
 SLOT=0
 SRC_URI=mirror://sourceforge/ax25/ax25-apps-0.0.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=983ea604ebf9e5bb2e7e600fcda52e13
diff --git a/metadata/md5-cache/media-radio/ax25-tools-0.0.10_rc2-r1 b/metadata/md5-cache/media-radio/ax25-tools-0.0.10_rc2-r1
index 2d6d3ff0827c..f5dc99be94c1 100644
--- a/metadata/md5-cache/media-radio/ax25-tools-0.0.10_rc2-r1
+++ b/metadata/md5-cache/media-radio/ax25-tools-0.0.10_rc2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libax25 X? ( x11-libs/libX11 media-libs/mesa ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libax25 X? ( x11-libs/libX11 media-libs/mesa ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Basic AX.25 (Amateur Radio) administrative tools and daemons
 EAPI=2
 HOMEPAGE=http://www.linux-ax25.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libax25 X? ( x11-libs/libX11 media-libs/mesa )
 SLOT=0
 SRC_URI=http://www.linux-ax25.org/pub/ax25-tools/ax25-tools-0.0.10-rc2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db8b1c77e4842965b2d7dd53ff927243
diff --git a/metadata/md5-cache/media-radio/gpredict-1.3 b/metadata/md5-cache/media-radio/gpredict-1.3
index 91b42735f8fc..0d43231f7a09 100644
--- a/metadata/md5-cache/media-radio/gpredict-1.3
+++ b/metadata/md5-cache/media-radio/gpredict-1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=dev-libs/glib-2.22.0:2 >=x11-libs/gtk+-2.18.0:2 >=x11-libs/goocanvas-0.14:0 net-misc/curl virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.22.0:2 >=x11-libs/gtk+-2.18.0:2 >=x11-libs/goocanvas-0.14:0 net-misc/curl virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Real-time satellite tracking and orbit prediction application
 EAPI=2
 HOMEPAGE=http://gpredict.oz9aec.net
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.22.0:2 >=x11-libs/gtk+-2.18.0:2 >=x11-libs/goocanvas-0.14:0 net-misc/curl
 SLOT=0
 SRC_URI=mirror://sourceforge/gpredict/gpredict-1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=125160b954f9afd458c9b8fdc1311855
diff --git a/metadata/md5-cache/media-radio/tucnak2-2.44 b/metadata/md5-cache/media-radio/tucnak2-2.44
index 5825633afb5d..301bf564f2a8 100644
--- a/metadata/md5-cache/media-radio/tucnak2-2.44
+++ b/metadata/md5-cache/media-radio/tucnak2-2.44
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Amateur Radio VHF Contest Logbook
 EAPI=2
 HOMEPAGE=http://tucnak.nagano.cz
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=http://tucnak.nagano.cz/tucnak2-2.44.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a313e72e6e88ebba2ea768bc8aeea40f
diff --git a/metadata/md5-cache/media-radio/tucnak2-2.46 b/metadata/md5-cache/media-radio/tucnak2-2.46
index 26aded8ff7ee..dec06063719b 100644
--- a/metadata/md5-cache/media-radio/tucnak2-2.46
+++ b/metadata/md5-cache/media-radio/tucnak2-2.46
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Amateur Radio VHF Contest Logbook
 EAPI=2
 HOMEPAGE=http://tucnak.nagano.cz
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=http://tucnak.nagano.cz/tucnak2-2.46.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ca6076d75a1caf0e2339ea0c2dbfe33e
diff --git a/metadata/md5-cache/media-radio/tucnak2-2.48 b/metadata/md5-cache/media-radio/tucnak2-2.48
index 95ad6adffa18..894b1d78e77e 100644
--- a/metadata/md5-cache/media-radio/tucnak2-2.48
+++ b/metadata/md5-cache/media-radio/tucnak2-2.48
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Amateur Radio VHF Contest Logbook
 EAPI=4
 HOMEPAGE=http://tucnak.nagano.cz
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=http://tucnak.nagano.cz/tucnak2-2.48.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=71491cfba807b853d2daa8870f26d81c
diff --git a/metadata/md5-cache/media-radio/unixcw-2.3-r6 b/metadata/md5-cache/media-radio/unixcw-2.3-r6
index d6a4072c4ff3..57eb3b8ccf3c 100644
--- a/metadata/md5-cache/media-radio/unixcw-2.3-r6
+++ b/metadata/md5-cache/media-radio/unixcw-2.3-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=ncurses? ( sys-libs/ncurses ) qt4? ( dev-qt/qtgui:4[qt3support] ) virtual/pkgconfig !<=app-misc/cw-1.0.16-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ncurses? ( sys-libs/ncurses ) qt4? ( dev-qt/qtgui:4[qt3support] ) virtual/pkgconfig !<=app-misc/cw-1.0.16-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A package of programs that fit together to form a morse code tutor program.
 EAPI=2
 HOMEPAGE=http://radio.linux.org.au/?sectpat=morse
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( sys-libs/ncurses ) qt4? ( dev-qt/qtgui:4[qt3support] )
 SLOT=0
 SRC_URI=ftp://metalab.unc.edu/pub/Linux/apps/ham/morse/unixcw-2.3.tgz qt4? ( mirror://gentoo/unixcw-2.3-qt3to4.patch.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0f43ed881cd07a365e7cc2c2a8cf5961
diff --git a/metadata/md5-cache/media-radio/unixcw-3.0.2 b/metadata/md5-cache/media-radio/unixcw-3.0.2
index f256ec301b8e..00462b4f092b 100644
--- a/metadata/md5-cache/media-radio/unixcw-3.0.2
+++ b/metadata/md5-cache/media-radio/unixcw-3.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=ncurses? ( sys-libs/ncurses ) qt4? ( dev-qt/qtgui:4[qt3support] ) virtual/pkgconfig !<=app-misc/cw-1.0.16-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ncurses? ( sys-libs/ncurses ) qt4? ( dev-qt/qtgui:4[qt3support] ) virtual/pkgconfig !<=app-misc/cw-1.0.16-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A package of programs that fit together to form a morse code tutor program.
 EAPI=4
 HOMEPAGE=http://unixcw.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( sys-libs/ncurses ) qt4? ( dev-qt/qtgui:4[qt3support] )
 SLOT=0
 SRC_URI=mirror://sourceforge/unixcw/unixcw-3.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=61daff496cae4691e8585bd281965720
diff --git a/metadata/md5-cache/media-radio/unixcw-3.1.1 b/metadata/md5-cache/media-radio/unixcw-3.1.1
index 9881c324a3de..c39e61c54987 100644
--- a/metadata/md5-cache/media-radio/unixcw-3.1.1
+++ b/metadata/md5-cache/media-radio/unixcw-3.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=ncurses? ( sys-libs/ncurses ) qt4? ( dev-qt/qtgui:4[qt3support] ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/pkgconfig sys-devel/libtool !<=app-misc/cw-1.0.16-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ncurses? ( sys-libs/ncurses ) qt4? ( dev-qt/qtgui:4[qt3support] ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/pkgconfig sys-devel/libtool !<=app-misc/cw-1.0.16-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A package of programs that fit together to form a morse code tutor program.
 EAPI=4
 HOMEPAGE=http://unixcw.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( sys-libs/ncurses ) qt4? ( dev-qt/qtgui:4[qt3support] ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/unixcw/unixcw-3.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1671ff7f3f440719ea5500b9e63e464c
diff --git a/metadata/md5-cache/media-radio/unixcw-3.2.0 b/metadata/md5-cache/media-radio/unixcw-3.2.0
index 80be0c42a6cd..bfa25eb3406f 100644
--- a/metadata/md5-cache/media-radio/unixcw-3.2.0
+++ b/metadata/md5-cache/media-radio/unixcw-3.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=ncurses? ( sys-libs/ncurses ) qt4? ( dev-qt/qtgui:4[qt3support] ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/pkgconfig sys-devel/libtool !<=app-misc/cw-1.0.16-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ncurses? ( sys-libs/ncurses ) qt4? ( dev-qt/qtgui:4[qt3support] ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/pkgconfig sys-devel/libtool !<=app-misc/cw-1.0.16-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A package of programs that fit together to form a morse code tutor program.
 EAPI=4
 HOMEPAGE=http://unixcw.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( sys-libs/ncurses ) qt4? ( dev-qt/qtgui:4[qt3support] ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/unixcw/unixcw-3.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=222b8811b3e514e857819fdad17a05ce
diff --git a/metadata/md5-cache/media-radio/wspr-2.00 b/metadata/md5-cache/media-radio/wspr-2.00
index 889f796b8f74..7e6219a9a964 100644
--- a/metadata/md5-cache/media-radio/wspr-2.00
+++ b/metadata/md5-cache/media-radio/wspr-2.00
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=dev-python/imaging[tk] dev-python/numpy dev-python/pmw:0 sci-libs/fftw:3.0 media-libs/hamlib media-libs/portaudio media-libs/libsamplerate || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran =dev-lang/python-2* =dev-lang/python-2*[tk]
+DEPEND=dev-python/imaging[tk] dev-python/numpy dev-python/pmw:0 sci-libs/fftw:3.0 media-libs/hamlib media-libs/portaudio media-libs/libsamplerate || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran =dev-lang/python-2* =dev-lang/python-2*[tk]
 DESCRIPTION=Weak Signal Propagation Reporter
 EAPI=3
 HOMEPAGE=http://www.physics.princeton.edu/pulsar/K1JT/wspr.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-python/imaging[tk] dev-python/numpy dev-python/pmw:0 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]
 SLOT=0
 SRC_URI=http://www.physics.princeton.edu/pulsar/K1JT/wspr-2.00.r1714.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d5d35f7b6becb16bc45dbc5d8a47cfee
diff --git a/metadata/md5-cache/media-radio/wspr-2.00-r1 b/metadata/md5-cache/media-radio/wspr-2.00-r1
index 0631a9040654..6a3e1fddc3a1 100644
--- a/metadata/md5-cache/media-radio/wspr-2.00-r1
+++ b/metadata/md5-cache/media-radio/wspr-2.00-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/imaging[tk,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] virtual/pmw[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] sci-libs/fftw:3.0 media-libs/hamlib media-libs/portaudio media-libs/libsamplerate || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran python_targets_python2_6? ( dev-lang/python:2.6[tk] ) python_targets_python2_7? ( dev-lang/python:2.7[tk] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DEPEND=dev-python/imaging[tk,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] virtual/pmw[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] sci-libs/fftw:3.0 media-libs/hamlib media-libs/portaudio media-libs/libsamplerate || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran python_targets_python2_6? ( dev-lang/python:2.6[tk] ) python_targets_python2_7? ( dev-lang/python:2.7[tk] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 DESCRIPTION=Weak Signal Propagation Reporter
 EAPI=5
 HOMEPAGE=http://www.physics.princeton.edu/pulsar/K1JT/wspr.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-python/imaging[tk,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] virtual/pmw[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] sci-libs/fftw:3.0 media-libs/hamlib media-libs/portaudio media-libs/libsamplerate virtual/fortran python_targets_python2_6? ( dev-lang/python:2.6[tk] ) python_targets_python2_7? ( dev-lang/python:2.7[tk] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 SLOT=0
 SRC_URI=http://www.physics.princeton.edu/pulsar/K1JT/wspr-2.00.r1714.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=475a0a662cea19a6ec0b1756934501b0
diff --git a/metadata/md5-cache/media-radio/xastir-2.0.0-r1 b/metadata/md5-cache/media-radio/xastir-2.0.0-r1
index 864e5aa727f0..0c4e70720f73 100644
--- a/metadata/md5-cache/media-radio/xastir-2.0.0-r1
+++ b/metadata/md5-cache/media-radio/xastir-2.0.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=x11-libs/motif-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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/motif-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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=X Amateur Station Tracking and Information Reporting
 EAPI=2
 HOMEPAGE=http://xastir.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/motif-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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/xastir/xastir-2.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a32822e35cefad980b2d8ed001691142
diff --git a/metadata/md5-cache/media-radio/xastir-2.0.0-r2 b/metadata/md5-cache/media-radio/xastir-2.0.0-r2
index a190a535ae01..ab05783baa93 100644
--- a/metadata/md5-cache/media-radio/xastir-2.0.0-r2
+++ b/metadata/md5-cache/media-radio/xastir-2.0.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=X Amateur Station Tracking and Information Reporting
 EAPI=2
 HOMEPAGE=http://xastir.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/xastir/xastir-2.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9c1144acfe22c6360bffe32d755023a6
diff --git a/metadata/md5-cache/media-radio/xastir-2.0.4 b/metadata/md5-cache/media-radio/xastir-2.0.4
index 3fa53b8315bc..d85d2097f68b 100644
--- a/metadata/md5-cache/media-radio/xastir-2.0.4
+++ b/metadata/md5-cache/media-radio/xastir-2.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=X Amateur Station Tracking and Information Reporting
 EAPI=4
 HOMEPAGE=http://xastir.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/xastir/xastir-2.0.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=362520af8899a669ef06315653efe462
diff --git a/metadata/md5-cache/media-radio/xlog-2.0.5 b/metadata/md5-cache/media-radio/xlog-2.0.5
index 22805a0155c7..86100b9d974f 100644
--- a/metadata/md5-cache/media-radio/xlog-2.0.5
+++ b/metadata/md5-cache/media-radio/xlog-2.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An amateur radio logging program
 EAPI=2
 HOMEPAGE=http://www.nongnu.org/xlog
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/xlog/xlog-2.0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0ee9739c74f32e501c6efe32c652b0fc
diff --git a/metadata/md5-cache/media-radio/xlog-2.0.6 b/metadata/md5-cache/media-radio/xlog-2.0.6
index 2cd275372f10..3420bc945715 100644
--- a/metadata/md5-cache/media-radio/xlog-2.0.6
+++ b/metadata/md5-cache/media-radio/xlog-2.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An amateur radio logging program
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/xlog
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/xlog/xlog-2.0.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3bfcc48f1e102c2870b2e09f3ed7452c
diff --git a/metadata/md5-cache/media-radio/xlog-2.0.7 b/metadata/md5-cache/media-radio/xlog-2.0.7
index 72bd50d5b44b..a83a9f754476 100644
--- a/metadata/md5-cache/media-radio/xlog-2.0.7
+++ b/metadata/md5-cache/media-radio/xlog-2.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An amateur radio logging program
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/xlog
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/xlog/xlog-2.0.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a664da05469891bfcb3588cb6ab8f7cc
diff --git a/metadata/md5-cache/media-radio/xwxapt-2.1 b/metadata/md5-cache/media-radio/xwxapt-2.1
index 0d78d7709672..b53ee8fd2466 100644
--- a/metadata/md5-cache/media-radio/xwxapt-2.1
+++ b/metadata/md5-cache/media-radio/xwxapt-2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=media-libs/alsa-lib dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/alsa-lib dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK+ linux weather satellite APT image decoder software
 EAPI=4
 HOMEPAGE=http://5b4az.chronos.org.uk/pages/apt.html
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/alsa-lib dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://5b4az.chronos.org.uk/pkg/apt/xwxapt/xwxapt-2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=ed7021cb2694c81f44c704869afbdb9e
diff --git a/metadata/md5-cache/media-sound/aacgain-1.9 b/metadata/md5-cache/media-sound/aacgain-1.9
index baee215138dd..f5d0aa7f3431 100644
--- a/metadata/md5-cache/media-sound/aacgain-1.9
+++ b/metadata/md5-cache/media-sound/aacgain-1.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure postinst prepare unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=AACGain normalizes the volume of digital music files using the Replay Gain algorithm.
 EAPI=4
 HOMEPAGE=http://altosdesign.com/aacgain/
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9dbe378f0e4023e1e810fa4ba98592ea
diff --git a/metadata/md5-cache/media-sound/abcmidi-2012.12.12 b/metadata/md5-cache/media-sound/abcmidi-2012.12.12
index 4bf1c09f16d7..0ca112bff80c 100644
--- a/metadata/md5-cache/media-sound/abcmidi-2012.12.12
+++ b/metadata/md5-cache/media-sound/abcmidi-2012.12.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Programs for processing ABC music notation files
 EAPI=5
 HOMEPAGE=http://abc.sourceforge.net/abcMIDI/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2012-12-12.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4f185016052796a948e4848e37ed753e
diff --git a/metadata/md5-cache/media-sound/abcmidi-2012.12.25 b/metadata/md5-cache/media-sound/abcmidi-2012.12.25
index d07fec860e27..4d2468bfc555 100644
--- a/metadata/md5-cache/media-sound/abcmidi-2012.12.25
+++ b/metadata/md5-cache/media-sound/abcmidi-2012.12.25
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Programs for processing ABC music notation files
 EAPI=5
 HOMEPAGE=http://abc.sourceforge.net/abcMIDI/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2012-12-25.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b27168385bc2472dea328e98962a23db
diff --git a/metadata/md5-cache/media-sound/abcmidi-2013.02.26 b/metadata/md5-cache/media-sound/abcmidi-2013.02.26
index 3641c3e8058f..bfb381a7adc7 100644
--- a/metadata/md5-cache/media-sound/abcmidi-2013.02.26
+++ b/metadata/md5-cache/media-sound/abcmidi-2013.02.26
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Programs for processing ABC music notation files
 EAPI=5
 HOMEPAGE=http://abc.sourceforge.net/abcMIDI/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2013-02-26.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=65952e75e0f3ddd4f2af77da87a923f9
diff --git a/metadata/md5-cache/media-sound/abcmidi-2013.03.21 b/metadata/md5-cache/media-sound/abcmidi-2013.03.21
index 6b0613f65981..7d24fb90fcff 100644
--- a/metadata/md5-cache/media-sound/abcmidi-2013.03.21
+++ b/metadata/md5-cache/media-sound/abcmidi-2013.03.21
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Programs for processing ABC music notation files
 EAPI=5
 HOMEPAGE=http://abc.sourceforge.net/abcMIDI/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2013-03-21.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3ddbd046dff9f362074832753643025f
diff --git a/metadata/md5-cache/media-sound/abcmidi-2013.03.26 b/metadata/md5-cache/media-sound/abcmidi-2013.03.26
index 3c6bfad67e16..6815ac9106e3 100644
--- a/metadata/md5-cache/media-sound/abcmidi-2013.03.26
+++ b/metadata/md5-cache/media-sound/abcmidi-2013.03.26
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Programs for processing ABC music notation files
 EAPI=5
 HOMEPAGE=http://abc.sourceforge.net/abcMIDI/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2013-03-26.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9cfe3a9c04335e857238e742c8f426e1
diff --git a/metadata/md5-cache/media-sound/abcmidi-2013.04.15 b/metadata/md5-cache/media-sound/abcmidi-2013.04.15
index 574d29422417..d4048494ed46 100644
--- a/metadata/md5-cache/media-sound/abcmidi-2013.04.15
+++ b/metadata/md5-cache/media-sound/abcmidi-2013.04.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Programs for processing ABC music notation files
 EAPI=5
 HOMEPAGE=http://abc.sourceforge.net/abcMIDI/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2013-04-15.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fdea2e720a49715a94de8cfe5cb9a042
diff --git a/metadata/md5-cache/media-sound/alsa-tools-1.0.23 b/metadata/md5-cache/media-sound/alsa-tools-1.0.23
index 3d0fba120875..a5c155c854d2 100644
--- a/metadata/md5-cache/media-sound/alsa-tools-1.0.23
+++ b/metadata/md5-cache/media-sound/alsa-tools-1.0.23
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Advanced Linux Sound Architecture tools
 EAPI=1
 HOMEPAGE=http://www.alsa-project.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.0.22 >=dev-python/pyalsa-1.0.22 fltk? ( x11-libs/fltk:1 ) gtk? ( x11-libs/gtk+:2 )
 SLOT=0.9
 SRC_URI=mirror://alsaproject/tools/alsa-tools-1.0.23.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=52fa371d074ebffde04107bbecd5ec97
diff --git a/metadata/md5-cache/media-sound/alsa-tools-1.0.24.1 b/metadata/md5-cache/media-sound/alsa-tools-1.0.24.1
index 4d028b75f1db..b545521c91d7 100644
--- a/metadata/md5-cache/media-sound/alsa-tools-1.0.24.1
+++ b/metadata/md5-cache/media-sound/alsa-tools-1.0.24.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Advanced Linux Sound Architecture tools
 EAPI=3
 HOMEPAGE=http://www.alsa-project.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0.9
 SRC_URI=mirror://alsaproject/tools/alsa-tools-1.0.24.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0dae8828545715eebe3eff216c2230c7
diff --git a/metadata/md5-cache/media-sound/alsa-tools-1.0.25 b/metadata/md5-cache/media-sound/alsa-tools-1.0.25
index ba84e02a34ab..8033ad09a4c6 100644
--- a/metadata/md5-cache/media-sound/alsa-tools-1.0.25
+++ b/metadata/md5-cache/media-sound/alsa-tools-1.0.25
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Advanced Linux Sound Architecture tools
 EAPI=4
 HOMEPAGE=http://www.alsa-project.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0.9
 SRC_URI=mirror://alsaproject/tools/alsa-tools-1.0.25.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9502babbeddbd8f523d66f36ed438227
diff --git a/metadata/md5-cache/media-sound/alsa-tools-1.0.26 b/metadata/md5-cache/media-sound/alsa-tools-1.0.26
index 3a56d69e4302..623e4f51a15d 100644
--- a/metadata/md5-cache/media-sound/alsa-tools-1.0.26
+++ b/metadata/md5-cache/media-sound/alsa-tools-1.0.26
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=>=media-libs/alsa-lib-1.0.26 >=dev-python/pyalsa-1.0.26 fltk? ( >=x11-libs/fltk-1.1.10-r2:1 ) gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/alsa-lib-1.0.26 >=dev-python/pyalsa-1.0.26 fltk? ( >=x11-libs/fltk-1.1.10-r2:1 ) gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Advanced Linux Sound Architecture tools
 EAPI=4
 HOMEPAGE=http://www.alsa-project.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.0.26 >=dev-python/pyalsa-1.0.26 fltk? ( >=x11-libs/fltk-1.1.10-r2:1 ) gtk? ( x11-libs/gtk+:2 )
 SLOT=0.9
 SRC_URI=mirror://alsaproject/tools/alsa-tools-1.0.26.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=94e5422ba7622f383ac5b39e1d4c97fe
diff --git a/metadata/md5-cache/media-sound/alsamixergui-0.9.0.1.2-r4 b/metadata/md5-cache/media-sound/alsamixergui-0.9.0.1.2-r4
index bf88b7ab12c6..40a251590b35 100644
--- a/metadata/md5-cache/media-sound/alsamixergui-0.9.0.1.2-r4
+++ b/metadata/md5-cache/media-sound/alsamixergui-0.9.0.1.2-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/alsa-lib media-sound/alsa-utils x11-libs/fltk:1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/alsa-lib media-sound/alsa-utils x11-libs/fltk:1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=FLTK based amixer Frontend
 EAPI=4
 HOMEPAGE=http://www.gentoo.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib media-sound/alsa-utils x11-libs/fltk:1
 SLOT=0
 SRC_URI=mirror://gentoo/alsamixergui-0.9.0rc1-2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=998286d40cf155a16821080a15ff1e62
diff --git a/metadata/md5-cache/media-sound/alsaplayer-0.99.81 b/metadata/md5-cache/media-sound/alsaplayer-0.99.81
index 2411c02346e9..e52d7f04b084 100644
--- a/metadata/md5-cache/media-sound/alsaplayer-0.99.81
+++ b/metadata/md5-cache/media-sound/alsaplayer-0.99.81
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) virtual/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) oss? ( virtual/os-headers ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) oss? ( virtual/os-headers ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A heavily multi-threaded pluggable audio player.
 EAPI=4
 HOMEPAGE=http://www.alsaplayer.org/
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsndfile sys-libs/zlib alsa? ( media-libs/alsa-lib ) audiof
 REQUIRED_USE=|| ( alsa jack nas oss )
 SLOT=0
 SRC_URI=http://www.alsaplayer.org/alsaplayer-0.99.81.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e2629f9d374236bb1a8d19df0425b3bf
diff --git a/metadata/md5-cache/media-sound/ams-2.0.1 b/metadata/md5-cache/media-sound/ams-2.0.1
index 3e0e9020a25e..6fca2acd74fd 100644
--- a/metadata/md5-cache/media-sound/ams-2.0.1
+++ b/metadata/md5-cache/media-sound/ams-2.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=media-libs/alsa-lib media-sound/jack-audio-connection-kit dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/ladspa-sdk media-libs/libclalsadrv !dev-ruby/amrita virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/alsa-lib media-sound/jack-audio-connection-kit dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/ladspa-sdk media-libs/libclalsadrv !dev-ruby/amrita virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Alsa Modular Software Synthesizer
 EAPI=4
 HOMEPAGE=http://alsamodular.sourceforge.net
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib media-sound/jack-audio-connection-kit dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/ladspa-sdk media-libs/libclalsadrv !dev-ruby/amrita
 SLOT=0
 SRC_URI=mirror://sourceforge/alsamodular/ams-2.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fba3c4e808bdded3b4032f9d3b0192b6
diff --git a/metadata/md5-cache/media-sound/amsynth-1.2.3-r1 b/metadata/md5-cache/media-sound/amsynth-1.2.3-r1
index 419502b25273..b8ebcd1cd4e5 100644
--- a/metadata/md5-cache/media-sound/amsynth-1.2.3-r1
+++ b/metadata/md5-cache/media-sound/amsynth-1.2.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Virtual analogue synthesizer.
 EAPI=4
 HOMEPAGE=http://amsynthe.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/amsynthe/amSynth-1.2.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e1f43fae484dcb58c921ea40d3709e43
diff --git a/metadata/md5-cache/media-sound/amsynth-1.3.2 b/metadata/md5-cache/media-sound/amsynth-1.3.2
index 66ece0116f63..ea413b2ed4b4 100644
--- a/metadata/md5-cache/media-sound/amsynth-1.3.2
+++ b/metadata/md5-cache/media-sound/amsynth-1.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-cpp/gtkmm:2.4 sndfile? ( >=media-libs/libsndfile-1:= ) alsa? ( media-libs/alsa-lib:= media-sound/alsa-utils ) dssi? ( media-libs/dssi:= media-libs/liblo:= >=x11-libs/gtk+-2.20:2 ) jack? ( media-sound/jack-audio-connection-kit ) lash? ( media-sound/lash ) virtual/pkgconfig oss? ( virtual/os-headers ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-cpp/gtkmm:2.4 sndfile? ( >=media-libs/libsndfile-1:= ) alsa? ( media-libs/alsa-lib:= media-sound/alsa-utils ) dssi? ( media-libs/dssi:= media-libs/liblo:= >=x11-libs/gtk+-2.20:2 ) jack? ( media-sound/jack-audio-connection-kit ) lash? ( media-sound/lash ) virtual/pkgconfig oss? ( virtual/os-headers ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Virtual analogue synthesizer.
 EAPI=5
 HOMEPAGE=http://code.google.com/p/amsynth/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/gtkmm:2.4 sndfile? ( >=media-libs/libsndfile-1:= ) alsa? ( media-libs/alsa-lib:= media-sound/alsa-utils ) dssi? ( media-libs/dssi:= media-libs/liblo:= >=x11-libs/gtk+-2.20:2 ) jack? ( media-sound/jack-audio-connection-kit ) lash? ( media-sound/lash )
 SLOT=0
 SRC_URI=http://amsynth.googlecode.com/files/amSynth-1.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=e5906736e8322f55b7412a1954d0acf6
diff --git a/metadata/md5-cache/media-sound/aqualung-0.9_beta11-r1 b/metadata/md5-cache/media-sound/aqualung-0.9_beta11-r1
index a06b6ee62ac0..e5b70523ba0f 100644
--- a/metadata/md5-cache/media-sound/aqualung-0.9_beta11-r1
+++ b/metadata/md5-cache/media-sound/aqualung-0.9_beta11-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=alsa? ( media-libs/alsa-lib ) cdda? ( <dev-libs/libcdio-0.90[-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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=alsa? ( media-libs/alsa-lib ) cdda? ( <dev-libs/libcdio-0.90[-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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A music player for a wide range of formats designed for gapless playback
 EAPI=4
 HOMEPAGE=http://aqualung.factorial.hu/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib ) cdda? ( <dev-libs/libcdio-0.90[-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
 SLOT=0
 SRC_URI=mirror://sourceforge/aqualung/aqualung-0.9beta11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=847cefb7cc1747e10d377217bebc41a1
diff --git a/metadata/md5-cache/media-sound/aqualung-0.9_beta11-r2 b/metadata/md5-cache/media-sound/aqualung-0.9_beta11-r2
index b6cd5657b13a..a275669100b7 100644
--- a/metadata/md5-cache/media-sound/aqualung-0.9_beta11-r2
+++ b/metadata/md5-cache/media-sound/aqualung-0.9_beta11-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/zlib app-arch/bzip2 dev-libs/libxml2 x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) pulseaudio? ( media-sound/pulseaudio ) flac? ( media-libs/flac ) lame? ( media-sound/lame ) ffmpeg? ( >=virtual/ffmpeg-0.6.90 ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) musepack? ( >=media-sound/musepack-tools-444 ) mp3? ( media-libs/libmad ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) ladspa? ( media-libs/liblrdf ) libsamplerate? ( media-libs/libsamplerate ) ifp? ( media-libs/libifp ) cddb? ( media-libs/libcddb ) lua? ( dev-lang/lua ) sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib app-arch/bzip2 dev-libs/libxml2 x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) pulseaudio? ( media-sound/pulseaudio ) flac? ( media-libs/flac ) lame? ( media-sound/lame ) ffmpeg? ( >=virtual/ffmpeg-0.6.90 ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) musepack? ( >=media-sound/musepack-tools-444 ) mp3? ( media-libs/libmad ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) ladspa? ( media-libs/liblrdf ) libsamplerate? ( media-libs/libsamplerate ) ifp? ( media-libs/libifp ) cddb? ( media-libs/libcddb ) lua? ( dev-lang/lua ) sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A music player for a wide range of formats designed for gapless playback
 EAPI=5
 HOMEPAGE=http://aqualung.factorial.hu/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib app-arch/bzip2 dev-libs/libxml2 x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) pulseaudio? ( media-sound/pulseaudio ) flac? ( media-libs/flac ) lame? ( media-sound/lame ) ffmpeg? ( >=virtual/ffmpeg-0.6.90 ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) musepack? ( >=media-sound/musepack-tools-444 ) mp3? ( media-libs/libmad ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) ladspa? ( media-libs/liblrdf ) libsamplerate? ( media-libs/libsamplerate ) ifp? ( media-libs/libifp ) cddb? ( media-libs/libcddb ) lua? ( dev-lang/lua )
 SLOT=0
 SRC_URI=mirror://sourceforge/aqualung/aqualung-0.9beta11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=48633b71050d9df968b078cf664187e8
diff --git a/metadata/md5-cache/media-sound/audacious-3.2.2-r1 b/metadata/md5-cache/media-sound/audacious-3.2.2-r1
index aa1ad160d7f2..99a74e0fffa1 100644
--- a/metadata/md5-cache/media-sound/audacious-3.2.2-r1
+++ b/metadata/md5-cache/media-sound/audacious-3.2.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.16 dev-libs/libxml2 >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) session? ( x11-libs/libSM ) virtual/pkgconfig chardet? ( >=app-i18n/libguess-1.1 ) nls? ( dev-util/intltool ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.16 dev-libs/libxml2 >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) session? ( x11-libs/libSM ) virtual/pkgconfig chardet? ( >=app-i18n/libguess-1.1 ) nls? ( dev-util/intltool ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Audacious Player - Your music, your way, no exceptions
 EAPI=4
 HOMEPAGE=http://audacious-media-player.org/
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.16 dev-libs/libxml2 >=x11-li
 REQUIRED_USE=^^ ( gtk gtk3 )
 SLOT=0
 SRC_URI=http://distfiles.audacious-media-player.org/audacious-3.2.2.tar.bz2 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b1ba8cac6e7d695306c0326f001adeda
diff --git a/metadata/md5-cache/media-sound/audacity-2.0.0 b/metadata/md5-cache/media-sound/audacity-2.0.0
index db8c4f262cf1..b98dfcc1befb 100644
--- a/metadata/md5-cache/media-sound/audacity-2.0.0
+++ b/metadata/md5-cache/media-sound/audacity-2.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free crossplatform audio editor
 EAPI=4
 HOMEPAGE=http://audacity.sourceforge.net/
@@ -11,5 +11,5 @@ REQUIRED_USE=soundtouch? ( midi )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://audacity.googlecode.com/files/audacity-minsrc-2.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=644d70673b607e8c26602bf1ca3ca2d4
diff --git a/metadata/md5-cache/media-sound/audacity-2.0.1 b/metadata/md5-cache/media-sound/audacity-2.0.1
index d5510c6635db..61b367fd597a 100644
--- a/metadata/md5-cache/media-sound/audacity-2.0.1
+++ b/metadata/md5-cache/media-sound/audacity-2.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) sbsms? ( media-libs/libsbsms ) 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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) sbsms? ( media-libs/libsbsms ) 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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free crossplatform audio editor
 EAPI=4
 HOMEPAGE=http://audacity.sourceforge.net/
@@ -11,5 +11,5 @@ REQUIRED_USE=soundtouch? ( midi )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://audacity.googlecode.com/files/audacity-minsrc-2.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=db7fcd6ff16abfacce9f4adb4a7212dc
diff --git a/metadata/md5-cache/media-sound/audacity-2.0.2 b/metadata/md5-cache/media-sound/audacity-2.0.2
index e453a8ec103f..5e424798c108 100644
--- a/metadata/md5-cache/media-sound/audacity-2.0.2
+++ b/metadata/md5-cache/media-sound/audacity-2.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) sbsms? ( media-libs/libsbsms ) 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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) sbsms? ( media-libs/libsbsms ) 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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free crossplatform audio editor
 EAPI=4
 HOMEPAGE=http://audacity.sourceforge.net/
@@ -11,5 +11,5 @@ REQUIRED_USE=soundtouch? ( midi )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://audacity.googlecode.com/files/audacity-minsrc-2.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=1ff348fa1df4ccaa1eb42900ab4c4fb7
diff --git a/metadata/md5-cache/media-sound/audacity-2.0.3 b/metadata/md5-cache/media-sound/audacity-2.0.3
index c6d0ac49c036..6bcdacbb5182 100644
--- a/metadata/md5-cache/media-sound/audacity-2.0.3
+++ b/metadata/md5-cache/media-sound/audacity-2.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) libsoxr? ( media-libs/soxr ) 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 ) sbsms? ( media-libs/libsbsms ) 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 ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) libsoxr? ( media-libs/soxr ) 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 ) sbsms? ( media-libs/libsbsms ) 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 ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free crossplatform audio editor
 EAPI=4
 HOMEPAGE=http://audacity.sourceforge.net/
@@ -11,5 +11,5 @@ REQUIRED_USE=soundtouch? ( midi )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://audacity.googlecode.com/files/audacity-minsrc-2.0.3.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=8c0560c43c8c279aae4764b360fcc00e
diff --git a/metadata/md5-cache/media-sound/banshee-2.6.0 b/metadata/md5-cache/media-sound/banshee-2.6.0
index ee7bdb7edd89..b9e4cb976415 100644
--- a/metadata/md5-cache/media-sound/banshee-2.6.0
+++ b/metadata/md5-cache/media-sound/banshee-2.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-lang/mono-2.4.3 gnome-base/gnome-settings-daemon sys-apps/dbus >=dev-dotnet/gtk-sharp-2.12: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 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 >=dev-dotnet/gconf-sharp-2.24.0:2 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:3 dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib >=dev-dotnet/mono-addins-0.6.2[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 ) ipod? ( >=media-libs/libgpod-0.8.2[mono] ) mtp? ( >=media-libs/libmtp-0.3.0 ) web? ( >=net-libs/webkit-gtk-1.2.2:2 || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.26:2.4 ) ) youtube? ( >=dev-dotnet/google-gdata-sharp-1.4 ) udev? ( app-misc/media-player-info dev-dotnet/gudev-sharp dev-dotnet/gkeyfile-sharp dev-dotnet/gtk-sharp-beans dev-dotnet/gio-sharp ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 app-arch/xz-utils
+DEPEND=>=dev-lang/mono-2.4.3 gnome-base/gnome-settings-daemon sys-apps/dbus >=dev-dotnet/gtk-sharp-2.12: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 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 >=dev-dotnet/gconf-sharp-2.24.0:2 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:3 dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib >=dev-dotnet/mono-addins-0.6.2[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 ) ipod? ( >=media-libs/libgpod-0.8.2[mono] ) mtp? ( >=media-libs/libmtp-0.3.0 ) web? ( >=net-libs/webkit-gtk-1.2.2:2 || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.26:2.4 ) ) youtube? ( >=dev-dotnet/google-gdata-sharp-1.4 ) udev? ( app-misc/media-player-info dev-dotnet/gudev-sharp dev-dotnet/gkeyfile-sharp dev-dotnet/gtk-sharp-beans dev-dotnet/gio-sharp ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 app-arch/xz-utils
 DESCRIPTION=Import, organize, play, and share your music using a simple and powerful interface.
 EAPI=4
 HOMEPAGE=http://banshee.fm/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/mono-2.4.3 gnome-base/gnome-settings-daemon sys-apps/dbus >=dev-dotnet/gtk-sharp-2.12: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 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 >=dev-dotnet/gconf-sharp-2.24.0:2 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:3 dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib >=dev-dotnet/mono-addins-0.6.2[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 ) ipod? ( >=media-libs/libgpod-0.8.2[mono] ) mtp? ( >=media-libs/libmtp-0.3.0 ) web? ( >=net-libs/webkit-gtk-1.2.2:2 || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.26:2.4 ) ) youtube? ( >=dev-dotnet/google-gdata-sharp-1.4 ) udev? ( app-misc/media-player-info dev-dotnet/gudev-sharp dev-dotnet/gkeyfile-sharp dev-dotnet/gtk-sharp-beans dev-dotnet/gio-sharp )
 SLOT=0
 SRC_URI=mirror://gnome/sources/banshee/2.6/banshee-2.6.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=becdba63b1124a38e11b0d0a8520e57b
diff --git a/metadata/md5-cache/media-sound/banshee-2.6.1 b/metadata/md5-cache/media-sound/banshee-2.6.1
index 87b0599e7e3d..37a9167bba50 100644
--- a/metadata/md5-cache/media-sound/banshee-2.6.1
+++ b/metadata/md5-cache/media-sound/banshee-2.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-lang/mono-2.4.3 gnome-base/gnome-settings-daemon sys-apps/dbus >=dev-dotnet/gtk-sharp-2.12: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 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 >=dev-dotnet/gconf-sharp-2.24.0:2 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:3 dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib >=dev-dotnet/mono-addins-0.6.2[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 ) ipod? ( >=media-libs/libgpod-0.8.2[mono] ) mtp? ( >=media-libs/libmtp-0.3.0 ) web? ( >=net-libs/webkit-gtk-1.2.2:2 || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.26:2.4 ) ) youtube? ( >=dev-dotnet/google-gdata-sharp-1.4 ) udev? ( app-misc/media-player-info dev-dotnet/gudev-sharp dev-dotnet/gkeyfile-sharp dev-dotnet/gtk-sharp-beans dev-dotnet/gio-sharp ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 app-arch/xz-utils
+DEPEND=>=dev-lang/mono-2.4.3 gnome-base/gnome-settings-daemon sys-apps/dbus >=dev-dotnet/gtk-sharp-2.12: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 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 >=dev-dotnet/gconf-sharp-2.24.0:2 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:3 dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib >=dev-dotnet/mono-addins-0.6.2[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 ) ipod? ( >=media-libs/libgpod-0.8.2[mono] ) mtp? ( >=media-libs/libmtp-0.3.0 ) web? ( >=net-libs/webkit-gtk-1.2.2:2 || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.26:2.4 ) ) youtube? ( >=dev-dotnet/google-gdata-sharp-1.4 ) udev? ( app-misc/media-player-info dev-dotnet/gudev-sharp dev-dotnet/gkeyfile-sharp dev-dotnet/gtk-sharp-beans dev-dotnet/gio-sharp ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 app-arch/xz-utils
 DESCRIPTION=Import, organize, play, and share your music using a simple and powerful interface.
 EAPI=5
 HOMEPAGE=http://banshee.fm/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/mono-2.4.3 gnome-base/gnome-settings-daemon sys-apps/dbus >=dev-dotnet/gtk-sharp-2.12: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 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 >=dev-dotnet/gconf-sharp-2.24.0:2 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:3 dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib >=dev-dotnet/mono-addins-0.6.2[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 ) ipod? ( >=media-libs/libgpod-0.8.2[mono] ) mtp? ( >=media-libs/libmtp-0.3.0 ) web? ( >=net-libs/webkit-gtk-1.2.2:2 || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.26:2.4 ) ) youtube? ( >=dev-dotnet/google-gdata-sharp-1.4 ) udev? ( app-misc/media-player-info dev-dotnet/gudev-sharp dev-dotnet/gkeyfile-sharp dev-dotnet/gtk-sharp-beans dev-dotnet/gio-sharp )
 SLOT=0
 SRC_URI=mirror://gnome/sources/banshee/2.6/banshee-2.6.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=101e87816e3f7e0d006b6c7d56c65b46
diff --git a/metadata/md5-cache/media-sound/bristol-0.60.11 b/metadata/md5-cache/media-sound/bristol-0.60.11
index 734ab2c8308a..fef1707341b0 100644
--- a/metadata/md5-cache/media-sound/bristol-0.60.11
+++ b/metadata/md5-cache/media-sound/bristol-0.60.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=media-sound/jack-audio-connection-kit-0.109.2 alsa? ( >=media-libs/alsa-lib-1.0.0 ) x11-libs/libX11 x11-proto/xproto virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-sound/jack-audio-connection-kit-0.109.2 alsa? ( >=media-libs/alsa-lib-1.0.0 ) x11-libs/libX11 x11-proto/xproto virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Synthesizer keyboard emulation package: Moog, Hammond and others
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/bristol
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-sound/jack-audio-connection-kit-0.109.2 alsa? ( >=media-libs/alsa-lib-1.0.0 ) x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://sourceforge/bristol/bristol-0.60.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=640426f53bee773a4d7bc1c6594dd775
diff --git a/metadata/md5-cache/media-sound/bristol-0.60.9 b/metadata/md5-cache/media-sound/bristol-0.60.9
index 86d191367ab9..0421050459ea 100644
--- a/metadata/md5-cache/media-sound/bristol-0.60.9
+++ b/metadata/md5-cache/media-sound/bristol-0.60.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-sound/jack-audio-connection-kit-0.109.2 alsa? ( >=media-libs/alsa-lib-1.0.0 ) x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://sourceforge/bristol/bristol-0.60.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9aa4edb31733908d96fc5b7e8e2a7cf1
diff --git a/metadata/md5-cache/media-sound/cdcd-0.6.6-r2 b/metadata/md5-cache/media-sound/cdcd-0.6.6-r2
index 68e0670fdc3d..5a672612583a 100644
--- a/metadata/md5-cache/media-sound/cdcd-0.6.6-r2
+++ b/metadata/md5-cache/media-sound/cdcd-0.6.6-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses >=sys-libs/readline-4.2 >=media-libs/libcdaudio-0.99.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses >=sys-libs/readline-4.2 >=media-libs/libcdaudio-0.99.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a simple yet powerful command line cd player
 EAPI=2
 HOMEPAGE=http://libcdaudio.sourceforge.net
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses >=sys-libs/readline-4.2 >=media-libs/libcdaudio-0.99.4
 SLOT=0
 SRC_URI=mirror://sourceforge/libcdaudio/cdcd-0.6.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c0f9b5b8fc83074778090c8ce5a37d33
diff --git a/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r4 b/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r4
index 3663cd86adfb..f5cb3d1993ee 100644
--- a/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r4
+++ b/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=an advanced CDDA reader with error correction
 EAPI=4
 HOMEPAGE=http://www.xiph.org/paranoia
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz http://dev.gentoo.org/~ssuominen/cdparanoia-III-10.2-patches-2.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ee2a926e73eaca00474aa79d5f620421
diff --git a/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r5 b/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r5
index 6877c7b62bec..f246130485d7 100644
--- a/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r5
+++ b/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=app-admin/eselect-cdparanoia || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-admin/eselect-cdparanoia || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=an advanced CDDA reader with error correction
 EAPI=5
 HOMEPAGE=http://www.xiph.org/paranoia
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-admin/eselect-cdparanoia
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz http://dev.gentoo.org/~ssuominen/cdparanoia-III-10.2-patches-2.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8ea2af37418e311192a9d312e41a5b3c
diff --git a/metadata/md5-cache/media-sound/chordii-4.3 b/metadata/md5-cache/media-sound/chordii-4.3
index 2a768428463a..fb0ead6601c2 100644
--- a/metadata/md5-cache/media-sound/chordii-4.3
+++ b/metadata/md5-cache/media-sound/chordii-4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=sys-devel/autoconf-2.67 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-devel/autoconf-2.67 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A guitar music typesetter
 EAPI=4
 HOMEPAGE=http://chordii.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/chordii/chordii-4.3.tar.gz doc? ( mirror://sourceforge/chordii/chordii-4.3-user_guide.pdf )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=4a48e6f586f4937a6de014973e8e83e2
diff --git a/metadata/md5-cache/media-sound/christine-0.7.0 b/metadata/md5-cache/media-sound/christine-0.7.0
index 1861342167a0..37a153d6bccc 100644
--- a/metadata/md5-cache/media-sound/christine-0.7.0
+++ b/metadata/md5-cache/media-sound/christine-0.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst postrm prepare setup
-DEPEND==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 ) virtual/pkgconfig nls? ( dev-util/intltool ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2.7* =dev-lang/python-2.7*[sqlite]
+DEPEND==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 ) virtual/pkgconfig nls? ( dev-util/intltool ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2.7* =dev-lang/python-2.7*[sqlite]
 DESCRIPTION=A simple gstreamer based media player
 EAPI=4
 HOMEPAGE=http://christine-project.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==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]
 SLOT=0
 SRC_URI=mirror://sourceforge/christine/christine-0.7.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=68b08f404d4ee721b7354316c59831c5
diff --git a/metadata/md5-cache/media-sound/cowbell-0.2.7.1 b/metadata/md5-cache/media-sound/cowbell-0.2.7.1
index 768a3e0b0b55..53e0bf8026ab 100644
--- a/metadata/md5-cache/media-sound/cowbell-0.2.7.1
+++ b/metadata/md5-cache/media-sound/cowbell-0.2.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-lang/mono >=dev-dotnet/gtk-sharp-2.6 >=dev-dotnet/glade-sharp-2.6 >=media-libs/taglib-1.4 virtual/pkgconfig >=dev-util/intltool-0.34.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-lang/mono >=dev-dotnet/gtk-sharp-2.6 >=dev-dotnet/glade-sharp-2.6 >=media-libs/taglib-1.4 virtual/pkgconfig >=dev-util/intltool-0.34.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Elegantly tag and rename mp3/ogg/flac files
 EAPI=2
 HOMEPAGE=http://more-cowbell.org
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/mono >=dev-dotnet/gtk-sharp-2.6 >=dev-dotnet/glade-sharp-2.6 >=media-libs/taglib-1.4
 SLOT=0
 SRC_URI=http://more-cowbell.org/releases/cowbell-0.2.7.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1021d2f63b7b59cef292817e4173ca90
diff --git a/metadata/md5-cache/media-sound/din-5.2.1 b/metadata/md5-cache/media-sound/din-5.2.1
index 098d75a6f598..c595da930779 100644
--- a/metadata/md5-cache/media-sound/din-5.2.1
+++ b/metadata/md5-cache/media-sound/din-5.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=dev-lang/tcl:= media-libs/liblo media-sound/jack-audio-connection-kit net-libs/libircclient sci-libs/fftw:3.0 virtual/opengl x11-libs/libX11 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/tcl:= media-libs/liblo media-sound/jack-audio-connection-kit net-libs/libircclient sci-libs/fftw:3.0 virtual/opengl x11-libs/libX11 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a software musical instrument and audio synthesizer
 EAPI=5
 HOMEPAGE=http://dinisnoise.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/tcl:= media-libs/liblo media-sound/jack-audio-connection-kit net-libs/libircclient sci-libs/fftw:3.0 virtual/opengl x11-libs/libX11
 SLOT=0
 SRC_URI=http://din.googlecode.com/files/din-5.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9fed99b073095f333fcbcfa440c288e1
diff --git a/metadata/md5-cache/media-sound/easytag-2.1.8 b/metadata/md5-cache/media-sound/easytag-2.1.8
index 3c17d1123ebe..7e331b40947b 100644
--- a/metadata/md5-cache/media-sound/easytag-2.1.8
+++ b/metadata/md5-cache/media-sound/easytag-2.1.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=>=x11-libs/gtk+-2.24:2 mp3? ( >=media-libs/id3lib-3.8.3-r7 media-libs/libid3tag ) flac? ( media-libs/flac media-libs/libvorbis ) mp4? ( media-libs/taglib[mp4] ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) speex? ( media-libs/speex media-libs/libvorbis ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
+DEPEND=>=x11-libs/gtk+-2.24:2 mp3? ( >=media-libs/id3lib-3.8.3-r7 media-libs/libid3tag ) flac? ( media-libs/flac media-libs/libvorbis ) mp4? ( media-libs/taglib[mp4] ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) speex? ( media-libs/speex media-libs/libvorbis ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
 DESCRIPTION=GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags
 EAPI=5
 HOMEPAGE=http://projects.gnome.org/easytag/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.24:2 mp3? ( >=media-libs/id3lib-3.8.3-r7 media-libs/libid3tag ) flac? ( media-libs/flac media-libs/libvorbis ) mp4? ( media-libs/taglib[mp4] ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) speex? ( media-libs/speex media-libs/libvorbis )
 SLOT=0
 SRC_URI=mirror://gnome/sources/easytag/2.1/easytag-2.1.8.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3d316113b80ddb249c1f5b4e00582772
diff --git a/metadata/md5-cache/media-sound/ecasound-2.8.1 b/metadata/md5-cache/media-sound/ecasound-2.8.1
index 863f478c1a72..33c9e3821490 100644
--- a/metadata/md5-cache/media-sound/ecasound-2.8.1
+++ b/metadata/md5-cache/media-sound/ecasound-2.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=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 ) virtual/pkgconfig python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a package for multitrack audio processing
 EAPI=3
 HOMEPAGE=http://ecasound.seul.org/ecasound
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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* )
 SLOT=1
 SRC_URI=http://ecasound.seul.org/download/ecasound-2.8.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1c49585d0ea020a9df034ee897dd4271
diff --git a/metadata/md5-cache/media-sound/ecasound-2.9.0 b/metadata/md5-cache/media-sound/ecasound-2.9.0
index b5ce6ad3902f..47c2d5a44368 100644
--- a/metadata/md5-cache/media-sound/ecasound-2.9.0
+++ b/metadata/md5-cache/media-sound/ecasound-2.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=sys-libs/readline alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) lv2? ( >=media-libs/lilv-0.5.0 ) 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 ) virtual/pkgconfig python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/readline alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) lv2? ( >=media-libs/lilv-0.5.0 ) 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 ) virtual/pkgconfig python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a package for multitrack audio processing
 EAPI=4
 HOMEPAGE=http://ecasound.seul.org/ecasound
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/readline alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/
 REQUIRED_USE=test? ( lv2 )
 SLOT=1
 SRC_URI=http://ecasound.seul.org/download/ecasound-2.9.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=69e3b897129cd7e8b0c5f5a312304740
diff --git a/metadata/md5-cache/media-sound/flac123-0.0.12 b/metadata/md5-cache/media-sound/flac123-0.0.12
index 76a56504d6bb..3032a2bd2066 100644
--- a/metadata/md5-cache/media-sound/flac123-0.0.12
+++ b/metadata/md5-cache/media-sound/flac123-0.0.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=dev-libs/popt media-libs/flac media-libs/libao media-libs/libogg || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/popt media-libs/flac media-libs/libao media-libs/libogg || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=console app for playing FLAC audio files
 EAPI=4
 HOMEPAGE=http://flac-tools.sourceforge.net
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/popt media-libs/flac media-libs/libao media-libs/libogg
 SLOT=0
 SRC_URI=mirror://sourceforge/flac-tools/flac123-0.0.12-release.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=2e6f8d1f9e81be0f535fa5187ced79a8
diff --git a/metadata/md5-cache/media-sound/freewheeling-0.6 b/metadata/md5-cache/media-sound/freewheeling-0.6
index 63af917a3b44..3bb340590b5f 100644
--- a/metadata/md5-cache/media-sound/freewheeling-0.6
+++ b/metadata/md5-cache/media-sound/freewheeling-0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A live looping instrument using SDL and jack.
 EAPI=2
 HOMEPAGE=http://freewheeling.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/freewheeling/fweelin-0.6-src.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=24f84e0554fecf7ed0ae17624499e4ee
diff --git a/metadata/md5-cache/media-sound/giada-0.6.1 b/metadata/md5-cache/media-sound/giada-0.6.1
index 51d2aef43387..17e49d42cd99 100644
--- a/metadata/md5-cache/media-sound/giada-0.6.1
+++ b/metadata/md5-cache/media-sound/giada-0.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=media-libs/libsndfile >=media-libs/libsamplerate-0.1.8 media-libs/rtaudio[alsa?,jack?,pulseaudio?] x11-libs/fltk:1 x11-libs/libXpm || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsndfile >=media-libs/libsamplerate-0.1.8 media-libs/rtaudio[alsa?,jack?,pulseaudio?] x11-libs/fltk:1 x11-libs/libXpm || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free, minimal, hardcore audio tool for DJs and live performers
 EAPI=5
 HOMEPAGE=http://www.giadamusic.com/
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsndfile >=media-libs/libsamplerate-0.1.8 media-libs/rtaudi
 REQUIRED_USE=|| ( alsa jack pulseaudio )
 SLOT=0
 SRC_URI=http://www.giadamusic.com/download-action.php?os=source&version=0.6.1 -> giada-0.6.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e33c7a17657fcbe73162d749d2f3122
diff --git a/metadata/md5-cache/media-sound/giada-0.6.2 b/metadata/md5-cache/media-sound/giada-0.6.2
index 754fd0865b56..436df1a600d2 100644
--- a/metadata/md5-cache/media-sound/giada-0.6.2
+++ b/metadata/md5-cache/media-sound/giada-0.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=media-libs/libsndfile >=media-libs/libsamplerate-0.1.8 media-libs/rtaudio[alsa?,jack?,pulseaudio?] x11-libs/fltk:1 x11-libs/libXpm || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsndfile >=media-libs/libsamplerate-0.1.8 media-libs/rtaudio[alsa?,jack?,pulseaudio?] x11-libs/fltk:1 x11-libs/libXpm || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free, minimal, hardcore audio tool for DJs and live performers
 EAPI=5
 HOMEPAGE=http://www.giadamusic.com/
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsndfile >=media-libs/libsamplerate-0.1.8 media-libs/rtaudi
 REQUIRED_USE=|| ( alsa jack pulseaudio )
 SLOT=0
 SRC_URI=http://www.giadamusic.com/download-action.php?os=source&version=0.6.2 -> giada-0.6.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fc5f00bd6d2d5389d394eace32681e6b
diff --git a/metadata/md5-cache/media-sound/gmorgan-0.25-r1 b/metadata/md5-cache/media-sound/gmorgan-0.25-r1
index 800a33c9f6c8..dd42db14f7e4 100644
--- a/metadata/md5-cache/media-sound/gmorgan-0.25-r1
+++ b/metadata/md5-cache/media-sound/gmorgan-0.25-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=media-libs/alsa-lib x11-libs/fltk:1 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/alsa-lib x11-libs/fltk:1 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Opensource software rhythm station
 EAPI=2
 HOMEPAGE=http://gmorgan.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib x11-libs/fltk:1
 SLOT=0
 SRC_URI=mirror://sourceforge/gmorgan/gmorgan-0.25.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=809de589797b24c375bb542b16b04523
diff --git a/metadata/md5-cache/media-sound/gmorgan-0.39 b/metadata/md5-cache/media-sound/gmorgan-0.39
index 2e9d16222c94..f414845b8b13 100644
--- a/metadata/md5-cache/media-sound/gmorgan-0.39
+++ b/metadata/md5-cache/media-sound/gmorgan-0.39
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=media-libs/alsa-lib x11-libs/fltk:1 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/alsa-lib x11-libs/fltk:1 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Opensource software rhythm station
 EAPI=2
 HOMEPAGE=http://gmorgan.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib x11-libs/fltk:1
 SLOT=0
 SRC_URI=mirror://sourceforge/gmorgan/gmorgan_0.39.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6d1229f85c736ff682a0920a73f50f75
diff --git a/metadata/md5-cache/media-sound/gmpc-11.8.16 b/metadata/md5-cache/media-sound/gmpc-11.8.16
index 30c805c5b4a8..51ef658b60a5 100644
--- a/metadata/md5-cache/media-sound/gmpc-11.8.16
+++ b/metadata/md5-cache/media-sound/gmpc-11.8.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 x11-themes/hicolor-icon-theme unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 ) || ( dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 ) >=dev-util/gob-2.0.17 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 x11-themes/hicolor-icon-theme unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 ) || ( dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 ) >=dev-util/gob-2.0.17 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A GTK+2 client for the Music Player Daemon
 EAPI=4
 HOMEPAGE=http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 x11-themes/hicolor-icon-theme unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 )
 SLOT=0
 SRC_URI=http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
 _md5_=5652cb79f77e98bfccacc5b580d2d898
diff --git a/metadata/md5-cache/media-sound/gnac-0.2.4.1 b/metadata/md5-cache/media-sound/gnac-0.2.4.1
index 703e439fd36a..e750d3557a25 100644
--- a/metadata/md5-cache/media-sound/gnac-0.2.4.1
+++ b/metadata/md5-cache/media-sound/gnac-0.2.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=x11-libs/gtk+:3 dev-libs/libunique:3 dev-libs/libxml2:2 libnotify? ( x11-libs/libnotify ) >=media-libs/gstreamer-0.10.31:0.10 >=media-libs/gst-plugins-base-0.10.31:0.10 media-plugins/gst-plugins-gio:0.10 media-plugins/gst-plugins-meta:0.10[flac?,mp3?,wavpack?] aac? ( media-plugins/gst-plugins-faac:0.10 ) nls? ( virtual/libintl ) >=app-text/gnome-doc-utils-0.17.2 virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=x11-libs/gtk+:3 dev-libs/libunique:3 dev-libs/libxml2:2 libnotify? ( x11-libs/libnotify ) >=media-libs/gstreamer-0.10.31:0.10 >=media-libs/gst-plugins-base-0.10.31:0.10 media-plugins/gst-plugins-gio:0.10 media-plugins/gst-plugins-meta:0.10[flac?,mp3?,wavpack?] aac? ( media-plugins/gst-plugins-faac:0.10 ) nls? ( virtual/libintl ) >=app-text/gnome-doc-utils-0.17.2 virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Audio converter for GNOME
 EAPI=4
 HOMEPAGE=http://gnac.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:3 dev-libs/libunique:3 dev-libs/libxml2:2 libnotify? ( x11-libs/libnotify ) >=media-libs/gstreamer-0.10.31:0.10 >=media-libs/gst-plugins-base-0.10.31:0.10 media-plugins/gst-plugins-gio:0.10 media-plugins/gst-plugins-meta:0.10[flac?,mp3?,wavpack?] aac? ( media-plugins/gst-plugins-faac:0.10 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnac/gnac-0.2.4.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9038344982fff6cae9d85d1f533a8277
diff --git a/metadata/md5-cache/media-sound/gnaural-1.0.20110606 b/metadata/md5-cache/media-sound/gnaural-1.0.20110606
index 51263a5cd834..739c2df48dba 100644
--- a/metadata/md5-cache/media-sound/gnaural-1.0.20110606
+++ b/metadata/md5-cache/media-sound/gnaural-1.0.20110606
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-libs/gtk+-2 >=gnome-base/libglade-2 >=dev-libs/glib-2 >=media-libs/libsndfile-1.0.2 >=media-libs/portaudio-19_pre20071207 nls? ( dev-util/intltool ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=x11-libs/gtk+-2 >=gnome-base/libglade-2 >=dev-libs/glib-2 >=media-libs/libsndfile-1.0.2 >=media-libs/portaudio-19_pre20071207 nls? ( dev-util/intltool ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=An opensource binaural-beat generator
 EAPI=2
 HOMEPAGE=http://gnaural.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2 >=gnome-base/libglade-2 >=dev-libs/glib-2 >=media-libs/libsndfile-1.0.2 >=media-libs/portaudio-19_pre20071207
 SLOT=0
 SRC_URI=mirror://sourceforge/gnaural/Gnaural/gnaural-1.0.20110606.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c3be5197de192d8b90ec2102a6a94889
diff --git a/metadata/md5-cache/media-sound/gnomoradio-0.15.1 b/metadata/md5-cache/media-sound/gnomoradio-0.15.1
index 2894d8b1cf68..a9ee50b4c134 100644
--- a/metadata/md5-cache/media-sound/gnomoradio-0.15.1
+++ b/metadata/md5-cache/media-sound/gnomoradio-0.15.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Finds, fetches, shares, and plays freely licensed music.
 EAPI=4
 HOMEPAGE=http://gnomoradio.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/gnomoradio/gnomoradio-0.15.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f2acf0b8b5b804f7098af9a16eebde30
diff --git a/metadata/md5-cache/media-sound/jack-rack-1.4.7-r1 b/metadata/md5-cache/media-sound/jack-rack-1.4.7-r1
index 89916561831b..1608e00c48a7 100644
--- a/metadata/md5-cache/media-sound/jack-rack-1.4.7-r1
+++ b/metadata/md5-cache/media-sound/jack-rack-1.4.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=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 ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=JACK Rack is an effects rack for the JACK low latency audio API.
 EAPI=4
 HOMEPAGE=http://jack-rack.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/jack-rack/jack-rack-1.4.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=161218c3d5b5d7047c245901333e22cc
diff --git a/metadata/md5-cache/media-sound/jack-rack-1.4.8_rc1 b/metadata/md5-cache/media-sound/jack-rack-1.4.8_rc1
index 8ba75e1e1eb7..ed0d981c2947 100644
--- a/metadata/md5-cache/media-sound/jack-rack-1.4.8_rc1
+++ b/metadata/md5-cache/media-sound/jack-rack-1.4.8_rc1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare unpack
-DEPEND=>=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 ) virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=JACK Rack is an effects rack for the JACK low latency audio API.
 EAPI=4
 HOMEPAGE=http://jack-rack.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a926cae3aafaf768ea26af938cab909e
diff --git a/metadata/md5-cache/media-sound/jackbeat-0.7.6 b/metadata/md5-cache/media-sound/jackbeat-0.7.6
index c239e437925b..6fd1a24ea138 100644
--- a/metadata/md5-cache/media-sound/jackbeat-0.7.6
+++ b/metadata/md5-cache/media-sound/jackbeat-0.7.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An audio sequencer for Linux
 EAPI=4
 HOMEPAGE=http://www.samalyse.com/jackbeat/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=http://www.samalyse.com/jackbeat/files/jackbeat-0.7.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d7d0e2c9a8e68597fbeb21f509df9387
diff --git a/metadata/md5-cache/media-sound/lame-3.99.3 b/metadata/md5-cache/media-sound/lame-3.99.3
index 3b528892e93e..a65a58825a2d 100644
--- a/metadata/md5-cache/media-sound/lame-3.99.3
+++ b/metadata/md5-cache/media-sound/lame-3.99.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.2 sndfile? ( >=media-libs/libsndfile-1.0.2 ) virtual/pkgconfig mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.2 sndfile? ( >=media-libs/libsndfile-1.0.2 ) virtual/pkgconfig mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LAME Ain't an MP3 Encoder
 EAPI=4
 HOMEPAGE=http://lame.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-libs/ncurses-5.2 sndfile? ( >=media-libs/libsndfile-1.0.2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/lame/lame-3.99.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7918629b32c876bcae93f0ade0a71614
diff --git a/metadata/md5-cache/media-sound/lame-3.99.5 b/metadata/md5-cache/media-sound/lame-3.99.5
index 41c0f54d11f2..36fdcc907b2c 100644
--- a/metadata/md5-cache/media-sound/lame-3.99.5
+++ b/metadata/md5-cache/media-sound/lame-3.99.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.7-r7 sndfile? ( >=media-libs/libsndfile-1.0.2 ) virtual/pkgconfig mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.7-r7 sndfile? ( >=media-libs/libsndfile-1.0.2 ) virtual/pkgconfig mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LAME Ain't an MP3 Encoder
 EAPI=4
 HOMEPAGE=http://lame.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-libs/ncurses-5.7-r7 sndfile? ( >=media-libs/libsndfile-1.0.2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/lame/lame-3.99.5.tar.gz mirror://gentoo/lame-3.99.5-automake-2.12.patch.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c22b656fc69059838248c04b871a7682
diff --git a/metadata/md5-cache/media-sound/lash-0.5.4-r1 b/metadata/md5-cache/media-sound/lash-0.5.4-r1
index 67f31ae7bb90..fba42c15bd58 100644
--- a/metadata/md5-cache/media-sound/lash-0.5.4-r1
+++ b/metadata/md5-cache/media-sound/lash-0.5.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=dev-libs/libxml2 media-sound/jack-audio-connection-kit alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:2 ) || ( sys-libs/readline dev-libs/libedit ) virtual/pkgconfig python? ( >=dev-lang/swig-1.3.40 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+DEPEND=dev-libs/libxml2 media-sound/jack-audio-connection-kit alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:2 ) || ( sys-libs/readline dev-libs/libedit ) virtual/pkgconfig python? ( >=dev-lang/swig-1.3.40 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 DESCRIPTION=LASH Audio Session Handler
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/lash/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 media-sound/jack-audio-connection-kit alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:2 ) || ( sys-libs/readline dev-libs/libedit ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=mirror://nongnu/lash/lash-0.5.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=919d435100da4219b83fab1e7a0437df
diff --git a/metadata/md5-cache/media-sound/lilypond-2.14.2 b/metadata/md5-cache/media-sound/lilypond-2.14.2
index 3e1c61f9063a..f021d4ffa0f5 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.14.2
+++ b/metadata/md5-cache/media-sound/lilypond-2.14.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=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 virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU Music Typesetter
 EAPI=4
 HOMEPAGE=http://lilypond.org/
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2[deprecated,rege
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.14/lilypond-2.14.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=fdd3e655b3102a2c9d5310f6217c1984
diff --git a/metadata/md5-cache/media-sound/lilypond-2.16.2 b/metadata/md5-cache/media-sound/lilypond-2.16.2
index e34d01ae93f7..3c93b1ebea90 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.16.2
+++ b/metadata/md5-cache/media-sound/lilypond-2.16.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=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 ) python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] app-text/t1utils dev-lang/perl dev-texlive/texlive-metapost virtual/pkgconfig media-gfx/fontforge >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] app-text/t1utils dev-lang/perl dev-texlive/texlive-metapost virtual/pkgconfig media-gfx/fontforge >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU Music Typesetter
 EAPI=5
 HOMEPAGE=http://lilypond.org/
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2[deprecated,rege
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.16/lilypond-2.16.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=69de5153b72b85298581b5f5f97cca97
diff --git a/metadata/md5-cache/media-sound/lilypond-2.17.13 b/metadata/md5-cache/media-sound/lilypond-2.17.13
index d827f0113b4f..bde4d831fd65 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.17.13
+++ b/metadata/md5-cache/media-sound/lilypond-2.17.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=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 ) python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] app-text/t1utils dev-lang/perl dev-texlive/texlive-metapost virtual/pkgconfig media-gfx/fontforge >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] app-text/t1utils dev-lang/perl dev-texlive/texlive-metapost virtual/pkgconfig media-gfx/fontforge >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU Music Typesetter
 EAPI=5
 HOMEPAGE=http://lilypond.org/
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2[deprecated,rege
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.17/lilypond-2.17.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ceb520b2c7f8eea2fce8e0835aa192d9
diff --git a/metadata/md5-cache/media-sound/lilypond-2.17.14 b/metadata/md5-cache/media-sound/lilypond-2.17.14
index 94f37289622c..d39f2dd535dd 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.17.14
+++ b/metadata/md5-cache/media-sound/lilypond-2.17.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=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 ) python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] app-text/t1utils dev-lang/perl dev-texlive/texlive-metapost virtual/pkgconfig media-gfx/fontforge >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] app-text/t1utils dev-lang/perl dev-texlive/texlive-metapost virtual/pkgconfig media-gfx/fontforge >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU Music Typesetter
 EAPI=5
 HOMEPAGE=http://lilypond.org/
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2[deprecated,rege
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.17/lilypond-2.17.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e0e0af8169e7d137d591974c0598bf3f
diff --git a/metadata/md5-cache/media-sound/lilypond-2.17.15 b/metadata/md5-cache/media-sound/lilypond-2.17.15
index 7459fb307caf..7449e556d6e0 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.17.15
+++ b/metadata/md5-cache/media-sound/lilypond-2.17.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=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 ) python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] app-text/t1utils dev-lang/perl dev-texlive/texlive-metapost virtual/pkgconfig media-gfx/fontforge >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] app-text/t1utils dev-lang/perl dev-texlive/texlive-metapost virtual/pkgconfig media-gfx/fontforge >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU Music Typesetter
 EAPI=5
 HOMEPAGE=http://lilypond.org/
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2[deprecated,rege
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.17/lilypond-2.17.15.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2b3ebfaae3fb9d1b2ead9fb546004136
diff --git a/metadata/md5-cache/media-sound/lilypond-2.17.16 b/metadata/md5-cache/media-sound/lilypond-2.17.16
index 9d2815f249b2..ca470349fec5 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.17.16
+++ b/metadata/md5-cache/media-sound/lilypond-2.17.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=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 ) python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] app-text/t1utils dev-lang/perl dev-texlive/texlive-metapost virtual/pkgconfig media-gfx/fontforge >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] app-text/t1utils dev-lang/perl dev-texlive/texlive-metapost virtual/pkgconfig media-gfx/fontforge >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU Music Typesetter
 EAPI=5
 HOMEPAGE=http://lilypond.org/
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2[deprecated,rege
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.17/lilypond-2.17.16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6cae1cd9629d2f543af90311c46f7b0f
diff --git a/metadata/md5-cache/media-sound/lilypond-9999 b/metadata/md5-cache/media-sound/lilypond-9999
index ba4516cbd247..9c20543d6ee6 100644
--- a/metadata/md5-cache/media-sound/lilypond-9999
+++ b/metadata/md5-cache/media-sound/lilypond-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=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 ) python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] app-text/t1utils dev-lang/perl dev-texlive/texlive-metapost virtual/pkgconfig media-gfx/fontforge >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=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 ) python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] app-text/t1utils dev-lang/perl dev-texlive/texlive-metapost virtual/pkgconfig media-gfx/fontforge >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=GNU Music Typesetter
 EAPI=5
 HOMEPAGE=http://lilypond.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-3 FDL-1.3
 RDEPEND=>=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 ) python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?]
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fcf6771b0207aa5f3e0877c5fc6b37b6
diff --git a/metadata/md5-cache/media-sound/lingot-0.9.0 b/metadata/md5-cache/media-sound/lingot-0.9.0
index f3e239ebf757..a3d463cdebc0 100644
--- a/metadata/md5-cache/media-sound/lingot-0.9.0
+++ b/metadata/md5-cache/media-sound/lingot-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) virtual/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LINGOT Is Not a Guitar-Only Tuner
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/lingot
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/lingot/lingot-0.9.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2454bbf3f00b0e0f425c43e6e50919a4
diff --git a/metadata/md5-cache/media-sound/lingot-0.9.1 b/metadata/md5-cache/media-sound/lingot-0.9.1
index 7bb7d1bc9626..35e341179e20 100644
--- a/metadata/md5-cache/media-sound/lingot-0.9.1
+++ b/metadata/md5-cache/media-sound/lingot-0.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) virtual/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LINGOT Is Not a Guitar-Only Tuner
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/lingot
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/lingot/lingot-0.9.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=46fceca2d7822a290c83af95a7ed9a3e
diff --git a/metadata/md5-cache/media-sound/linuxsampler-0.5.1 b/metadata/md5-cache/media-sound/linuxsampler-0.5.1
index 627dc978b382..7e15e1c40313 100644
--- a/metadata/md5-cache/media-sound/linuxsampler-0.5.1
+++ b/metadata/md5-cache/media-sound/linuxsampler-0.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sqlite? ( >=dev-db/sqlite-3.3 ) >=media-libs/libgig-3.2.1 media-libs/alsa-lib jack? ( media-sound/jack-audio-connection-kit ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sqlite? ( >=dev-db/sqlite-3.3 ) >=media-libs/libgig-3.2.1 media-libs/alsa-lib jack? ( media-sound/jack-audio-connection-kit ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LinuxSampler is a software audio sampler engine with professional grade features.
 HOMEPAGE=http://www.linuxsampler.org/
 IUSE=doc jack sqlite
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sqlite? ( >=dev-db/sqlite-3.3 ) >=media-libs/libgig-3.2.1 media-libs/alsa-lib jack? ( media-sound/jack-audio-connection-kit )
 SLOT=0
 SRC_URI=http://download.linuxsampler.org/packages/linuxsampler-0.5.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1e9cdf59d200e08ae68195282bad3477
diff --git a/metadata/md5-cache/media-sound/madplay-0.15.2b-r1 b/metadata/md5-cache/media-sound/madplay-0.15.2b-r1
index f935f94cf779..28d8041a2303 100644
--- a/metadata/md5-cache/media-sound/madplay-0.15.2b-r1
+++ b/metadata/md5-cache/media-sound/madplay-0.15.2b-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The MAD audio player
 EAPI=4
 HOMEPAGE=http://www.underbit.com/products/mad/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libid3tag-0.15.1b >=media-libs/libmad-0.15.1b alsa? ( media-libs/alsa-lib )
 SLOT=0
 SRC_URI=mirror://sourceforge/mad/madplay-0.15.2b.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0eccdb52d2a4e0b0ac5dd690973f6b5b
diff --git a/metadata/md5-cache/media-sound/meterbridge-0.9.2 b/metadata/md5-cache/media-sound/meterbridge-0.9.2
index 171686d5e18d..bb9ae870f1fd 100644
--- a/metadata/md5-cache/media-sound/meterbridge-0.9.2
+++ b/metadata/md5-cache/media-sound/meterbridge-0.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=media-sound/jack-audio-connection-kit media-libs/sdl-image virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-sound/jack-audio-connection-kit media-libs/sdl-image virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Software meterbridge for the UNIX based JACK audio system.
 HOMEPAGE=http://plugin.org.uk/meterbridge/
 KEYWORDS=amd64 ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=media-sound/jack-audio-connection-kit media-libs/sdl-image
 SLOT=0
 SRC_URI=http://plugin.org.uk/meterbridge/meterbridge-0.9.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=30b8dc4d2ebcd824bf9fa44465cdbd81
diff --git a/metadata/md5-cache/media-sound/meterbridge-0.9.3 b/metadata/md5-cache/media-sound/meterbridge-0.9.3
index d7d3125ef0cf..f93b0e67de8c 100644
--- a/metadata/md5-cache/media-sound/meterbridge-0.9.3
+++ b/metadata/md5-cache/media-sound/meterbridge-0.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=media-sound/jack-audio-connection-kit >=media-libs/libsdl-1.2 >=media-libs/sdl-image-1.2.10[png] virtual/opengl virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-sound/jack-audio-connection-kit >=media-libs/libsdl-1.2 >=media-libs/sdl-image-1.2.10[png] virtual/opengl virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Software meterbridge for the UNIX based JACK audio system.
 EAPI=2
 HOMEPAGE=http://plugin.org.uk/meterbridge/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-sound/jack-audio-connection-kit >=media-libs/libsdl-1.2 >=media-libs/sdl-image-1.2.10[png] virtual/opengl
 SLOT=0
 SRC_URI=http://plugin.org.uk/meterbridge/meterbridge-0.9.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=38081d3ed627f406afabe553ef0f2af8
diff --git a/metadata/md5-cache/media-sound/milkytracker-0.90.80 b/metadata/md5-cache/media-sound/milkytracker-0.90.80
index a830a3429ac4..5ac32214cc98 100644
--- a/metadata/md5-cache/media-sound/milkytracker-0.90.80
+++ b/metadata/md5-cache/media-sound/milkytracker-0.90.80
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=FastTracker 2 inspired music tracker
 EAPI=2
 HOMEPAGE=http://milkytracker.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit )
 SLOT=0
 SRC_URI=mirror://gentoo/milkytracker-0.90.80.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=25dd1c12935e19c12ad90f1b8b1a9354
diff --git a/metadata/md5-cache/media-sound/milkytracker-0.90.85 b/metadata/md5-cache/media-sound/milkytracker-0.90.85
index fd9098220034..ff2962ad43bc 100644
--- a/metadata/md5-cache/media-sound/milkytracker-0.90.85
+++ b/metadata/md5-cache/media-sound/milkytracker-0.90.85
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/libsdl-1.2 sys-libs/zlib alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libsdl-1.2 sys-libs/zlib alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=FastTracker 2 inspired music tracker
 EAPI=2
 HOMEPAGE=http://milkytracker.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=media-libs/libsdl-1.2 sys-libs/zlib alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit )
 SLOT=0
 SRC_URI=http://milkytracker.org/files/milkytracker-0.90.85.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e3699ee5a563f705151c5c27ad082e23
diff --git a/metadata/md5-cache/media-sound/moc-2.5.0_alpha4_p20111211 b/metadata/md5-cache/media-sound/moc-2.5.0_alpha4_p20111211
index c68a5f2e5ec1..994f9a64cff1 100644
--- a/metadata/md5-cache/media-sound/moc-2.5.0_alpha4_p20111211
+++ b/metadata/md5-cache/media-sound/moc-2.5.0_alpha4_p20111211
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Music On Console - ncurses interface for playing audio files
 EAPI=4
 HOMEPAGE=http://moc.daper.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ssuominen/moc-2.5.0_alpha4_p20111211.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=7c3e6e1e05288a9d4be97d3269147d8b
diff --git a/metadata/md5-cache/media-sound/moc-2.5.0_beta1-r1 b/metadata/md5-cache/media-sound/moc-2.5.0_beta1-r1
index 28e17f28e698..cf63d8a302cd 100644
--- a/metadata/md5-cache/media-sound/moc-2.5.0_beta1-r1
+++ b/metadata/md5-cache/media-sound/moc-2.5.0_beta1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-devel/libtool-2.2.6b sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cache? ( >=sys-libs/db-4 ) 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 ) magic? ( sys-apps/file ) 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/libogg tremor? ( media-libs/tremor ) !tremor? ( media-libs/libvorbis ) ) wavpack? ( media-sound/wavpack ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-devel/libtool-2.2.6b sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cache? ( >=sys-libs/db-4 ) 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 ) magic? ( sys-apps/file ) 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/libogg tremor? ( media-libs/tremor ) !tremor? ( media-libs/libvorbis ) ) wavpack? ( media-sound/wavpack ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Music On Console - ncurses interface for playing audio files
 EAPI=4
 HOMEPAGE=http://moc.daper.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-devel/libtool-2.2.6b sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cache? ( >=sys-libs/db-4 ) 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 ) magic? ( sys-apps/file ) 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/libogg tremor? ( media-libs/tremor ) !tremor? ( media-libs/libvorbis ) ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=ftp://ftp.daper.net/pub/soft/moc/unstable/moc-2.5.0-beta1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d7b2edb790e940bedc2ec9b541c6471e
diff --git a/metadata/md5-cache/media-sound/mp3splt-gtk-0.5.9 b/metadata/md5-cache/media-sound/mp3splt-gtk-0.5.9
index aac7e562a501..f9916b68b9f6 100644
--- a/metadata/md5-cache/media-sound/mp3splt-gtk-0.5.9
+++ b/metadata/md5-cache/media-sound/mp3splt-gtk-0.5.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/gtk+-2.6:2 <media-libs/libmp3splt-0.7.3 audacious? ( media-sound/audacious ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.6:2 <media-libs/libmp3splt-0.7.3 audacious? ( media-sound/audacious ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a GTK+ based utility to split mp3 and ogg files without decoding.
 EAPI=2
 HOMEPAGE=http://mp3splt.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.6:2 <media-libs/libmp3splt-0.7.3 audacious? ( media-sound/audacious ) gstreamer? ( media-libs/gst-plugins-base:0.10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3splt/mp3splt-gtk-0.5.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=70cd9ae62c970f6fe73a9592b527d16d
diff --git a/metadata/md5-cache/media-sound/mp3splt-gtk-0.7 b/metadata/md5-cache/media-sound/mp3splt-gtk-0.7
index 1cbcb73e4f5d..df23a4c87421 100644
--- a/metadata/md5-cache/media-sound/mp3splt-gtk-0.7
+++ b/metadata/md5-cache/media-sound/mp3splt-gtk-0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a GTK+ based utility to split mp3 and ogg files without decoding.
 EAPI=2
 HOMEPAGE=http://mp3splt.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3splt/mp3splt-gtk-0.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=886b438a9f5fa8fdebb5a4fad4e3cb25
diff --git a/metadata/md5-cache/media-sound/mp3splt-gtk-0.7.0.920 b/metadata/md5-cache/media-sound/mp3splt-gtk-0.7.0.920
index ee8bc78e1344..71fdbb662ef5 100644
--- a/metadata/md5-cache/media-sound/mp3splt-gtk-0.7.0.920
+++ b/metadata/md5-cache/media-sound/mp3splt-gtk-0.7.0.920
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a GTK+ based utility to split mp3 and ogg files without decoding.
 EAPI=2
 HOMEPAGE=http://mp3splt.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://ioalex.net/testing_downloads/snapshots/920/mp3splt-gtk-0.7.0.920.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=83a4ac94eca041371524e00324daae39
diff --git a/metadata/md5-cache/media-sound/mp3splt-gtk-0.7.0.930 b/metadata/md5-cache/media-sound/mp3splt-gtk-0.7.0.930
index cffa15806a5f..e1661b560d94 100644
--- a/metadata/md5-cache/media-sound/mp3splt-gtk-0.7.0.930
+++ b/metadata/md5-cache/media-sound/mp3splt-gtk-0.7.0.930
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a GTK+ based utility to split mp3 and ogg files without decoding.
 EAPI=2
 HOMEPAGE=http://mp3splt.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://ioalex.net/testing_downloads/snapshots/930/mp3splt-gtk-0.7.0.930.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2df385cf8d0e0878a00dc9a82be247f5
diff --git a/metadata/md5-cache/media-sound/mp3splt-gtk-0.7.1 b/metadata/md5-cache/media-sound/mp3splt-gtk-0.7.1
index b8d9853b6f04..1c7a32d5a5b1 100644
--- a/metadata/md5-cache/media-sound/mp3splt-gtk-0.7.1
+++ b/metadata/md5-cache/media-sound/mp3splt-gtk-0.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a GTK+ based utility to split mp3 and ogg files without decoding.
 EAPI=2
 HOMEPAGE=http://mp3splt.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3splt/mp3splt-gtk-0.7.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bbab9ce27fae1af3a9011837490c3ab4
diff --git a/metadata/md5-cache/media-sound/mp3splt-gtk-0.7.2 b/metadata/md5-cache/media-sound/mp3splt-gtk-0.7.2
index 014a01f513c2..8c541df88292 100644
--- a/metadata/md5-cache/media-sound/mp3splt-gtk-0.7.2
+++ b/metadata/md5-cache/media-sound/mp3splt-gtk-0.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/libmp3splt-0.7.2 gtk3? ( x11-libs/gtk+:3 audacious? ( >=media-sound/audacious-3.0 ) ) !gtk3? ( >=x11-libs/gtk+-2.18: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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libmp3splt-0.7.2 gtk3? ( x11-libs/gtk+:3 audacious? ( >=media-sound/audacious-3.0 ) ) !gtk3? ( >=x11-libs/gtk+-2.18: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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a GTK+ based utility to split mp3 and ogg files without decoding.
 EAPI=2
 HOMEPAGE=http://mp3splt.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libmp3splt-0.7.2 gtk3? ( x11-libs/gtk+:3 audacious? ( >=media-sound/audacious-3.0 ) ) !gtk3? ( >=x11-libs/gtk+-2.18:2 audacious? ( <media-sound/audacious-3.0 ) ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) gnome? ( gnome-base/libgnomeui )
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3splt/mp3splt-gtk-0.7.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1618e0f953e445262e72b22b50c27d67
diff --git a/metadata/md5-cache/media-sound/mp3splt-gtk-0.7.3 b/metadata/md5-cache/media-sound/mp3splt-gtk-0.7.3
index 3e396b9d175d..11f4cfa421cb 100644
--- a/metadata/md5-cache/media-sound/mp3splt-gtk-0.7.3
+++ b/metadata/md5-cache/media-sound/mp3splt-gtk-0.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/libmp3splt-0.7.3 gtk3? ( x11-libs/gtk+:3 audacious? ( >=media-sound/audacious-3.0 ) ) !gtk3? ( >=x11-libs/gtk+-2.18:2 audacious? ( <media-sound/audacious-3.0 ) ) !audacious? ( dev-libs/dbus-glib ) 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libmp3splt-0.7.3 gtk3? ( x11-libs/gtk+:3 audacious? ( >=media-sound/audacious-3.0 ) ) !gtk3? ( >=x11-libs/gtk+-2.18:2 audacious? ( <media-sound/audacious-3.0 ) ) !audacious? ( dev-libs/dbus-glib ) 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a GTK+ based utility to split mp3 and ogg files without decoding.
 EAPI=2
 HOMEPAGE=http://mp3splt.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libmp3splt-0.7.3 gtk3? ( x11-libs/gtk+:3 audacious? ( >=media-sound/audacious-3.0 ) ) !gtk3? ( >=x11-libs/gtk+-2.18:2 audacious? ( <media-sound/audacious-3.0 ) ) !audacious? ( dev-libs/dbus-glib ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) gnome? ( gnome-base/libgnomeui )
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3splt/mp3splt-gtk-0.7.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9347cc13aeb13cac1ddcd182353f6db7
diff --git a/metadata/md5-cache/media-sound/mp3splt-gtk-0.8.1 b/metadata/md5-cache/media-sound/mp3splt-gtk-0.8.1
index c8fb4370d5e1..b6623ce9d8aa 100644
--- a/metadata/md5-cache/media-sound/mp3splt-gtk-0.8.1
+++ b/metadata/md5-cache/media-sound/mp3splt-gtk-0.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/libmp3splt-0.8.1 gtk3? ( x11-libs/gtk+:3 audacious? ( >=media-sound/audacious-3.0 ) ) !gtk3? ( >=x11-libs/gtk+-2.18:2 audacious? ( <media-sound/audacious-3.0 ) ) !audacious? ( dev-libs/dbus-glib ) 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libmp3splt-0.8.1 gtk3? ( x11-libs/gtk+:3 audacious? ( >=media-sound/audacious-3.0 ) ) !gtk3? ( >=x11-libs/gtk+-2.18:2 audacious? ( <media-sound/audacious-3.0 ) ) !audacious? ( dev-libs/dbus-glib ) 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a GTK+ based utility to split mp3 and ogg files without decoding.
 EAPI=2
 HOMEPAGE=http://mp3splt.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libmp3splt-0.8.1 gtk3? ( x11-libs/gtk+:3 audacious? ( >=media-sound/audacious-3.0 ) ) !gtk3? ( >=x11-libs/gtk+-2.18:2 audacious? ( <media-sound/audacious-3.0 ) ) !audacious? ( dev-libs/dbus-glib ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) gnome? ( gnome-base/libgnomeui )
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3splt/mp3splt-gtk-0.8.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f0b68a36a2a52a6c22df06eaa2abb62f
diff --git a/metadata/md5-cache/media-sound/mpfc-1.3.7-r1 b/metadata/md5-cache/media-sound/mpfc-1.3.7-r1
index b87371c32bfa..cbbb28fcb064 100644
--- a/metadata/md5-cache/media-sound/mpfc-1.3.7-r1
+++ b/metadata/md5-cache/media-sound/mpfc-1.3.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Music Player For Console
 EAPI=2
 HOMEPAGE=http://mpfc.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-0.9.0 ) gpm? ( >=sys-libs/gpm-1.19.3 ) mad? ( media-libs/libmad ) vorbis? ( media-libs/libvorbis )
 SLOT=0
 SRC_URI=mirror://sourceforge/mpfc/mpfc-1.3.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b0e1b8128c7fe4a4050366d796325b1e
diff --git a/metadata/md5-cache/media-sound/mpg321-0.3.1 b/metadata/md5-cache/media-sound/mpg321-0.3.1
index 0b04609d15ef..a779678100b9 100644
--- a/metadata/md5-cache/media-sound/mpg321-0.3.1
+++ b/metadata/md5-cache/media-sound/mpg321-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=media-libs/libao-1 media-libs/libid3tag media-libs/libmad sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libao-1 media-libs/libid3tag media-libs/libmad sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
 EAPI=4
 HOMEPAGE=http://mpg321.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libao-1 media-libs/libid3tag media-libs/libmad sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/mpg321/mpg321-0.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1013021020e20afb744291cfd21294d2
diff --git a/metadata/md5-cache/media-sound/mpg321-0.3.1-r1 b/metadata/md5-cache/media-sound/mpg321-0.3.1-r1
index e24753983f2b..13b0b28892bb 100644
--- a/metadata/md5-cache/media-sound/mpg321-0.3.1-r1
+++ b/metadata/md5-cache/media-sound/mpg321-0.3.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=app-admin/eselect-mpg123 >=media-libs/libao-1 media-libs/libid3tag media-libs/libmad sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-admin/eselect-mpg123 >=media-libs/libao-1 media-libs/libid3tag media-libs/libmad sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
 EAPI=5
 HOMEPAGE=http://mpg321.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect-mpg123 >=media-libs/libao-1 media-libs/libid3tag media-libs/libmad sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/mpg321/mpg321-0.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e5c0992f6e3503f1e672201f8caf28f0
diff --git a/metadata/md5-cache/media-sound/mt-daapd-0.2.4.2 b/metadata/md5-cache/media-sound/mt-daapd-0.2.4.2
index 377480b78baa..a5315cdf3e99 100644
--- a/metadata/md5-cache/media-sound/mt-daapd-0.2.4.2
+++ b/metadata/md5-cache/media-sound/mt-daapd-0.2.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=media-libs/libid3tag sys-libs/gdbm net-dns/avahi[dbus] vorbis? ( media-libs/libvorbis ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libid3tag sys-libs/gdbm net-dns/avahi[dbus] vorbis? ( media-libs/libvorbis ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A multi-threaded implementation of Apple's DAAP server
 EAPI=2
 HOMEPAGE=http://www.mt-daapd.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libid3tag sys-libs/gdbm net-dns/avahi[dbus] vorbis? ( media-libs/libvorbis )
 SLOT=0
 SRC_URI=mirror://sourceforge/mt-daapd/mt-daapd-0.2.4.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=291a925e0535a0fd36a95d5787921bf4
diff --git a/metadata/md5-cache/media-sound/normalize-0.7.7-r1 b/metadata/md5-cache/media-sound/normalize-0.7.7-r1
index 4f919ccac6ad..4b2a3cddd9b4 100644
--- a/metadata/md5-cache/media-sound/normalize-0.7.7-r1
+++ b/metadata/md5-cache/media-sound/normalize-0.7.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=mad? ( media-libs/libmad ) audiofile? ( >=media-libs/audiofile-0.3.1 ) virtual/pkgconfig nls? ( dev-util/intltool ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mad? ( media-libs/libmad ) audiofile? ( >=media-libs/audiofile-0.3.1 ) virtual/pkgconfig nls? ( dev-util/intltool ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Audio file volume normalizer
 EAPI=4
 HOMEPAGE=http://normalize.nongnu.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mad? ( media-libs/libmad ) audiofile? ( >=media-libs/audiofile-0.3.1 )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d6e48d79ed8810429ca5dcd82081becf
diff --git a/metadata/md5-cache/media-sound/nted-1.10.18-r2 b/metadata/md5-cache/media-sound/nted-1.10.18-r2
index ad7e0018eb52..dd7a60a6b58e 100644
--- a/metadata/md5-cache/media-sound/nted-1.10.18-r2
+++ b/metadata/md5-cache/media-sound/nted-1.10.18-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure prepare
-DEPEND=>=dev-libs/glib-2 media-libs/alsa-lib >=media-libs/freetype-2 x11-libs/cairo >=x11-libs/gdk-pixbuf-2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango virtual/pkgconfig doc? ( app-text/xmlto ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2 media-libs/alsa-lib >=media-libs/freetype-2 x11-libs/cairo >=x11-libs/gdk-pixbuf-2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango virtual/pkgconfig doc? ( app-text/xmlto ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=WYSIWYG score editor for GTK+
 EAPI=5
 HOMEPAGE=http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2 NTED_FONT
 RDEPEND=>=dev-libs/glib-2 media-libs/alsa-lib >=media-libs/freetype-2 x11-libs/cairo >=x11-libs/gdk-pixbuf-2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango
 SLOT=0
 SRC_URI=http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/sources/nted-1.10.18.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a6b3f98c0def6c956483b76f7701b67a
diff --git a/metadata/md5-cache/media-sound/nted-1.10.18-r3 b/metadata/md5-cache/media-sound/nted-1.10.18-r3
index dd07ca43017d..66308e213aa4 100644
--- a/metadata/md5-cache/media-sound/nted-1.10.18-r3
+++ b/metadata/md5-cache/media-sound/nted-1.10.18-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2 media-libs/alsa-lib >=media-libs/freetype-2 x11-libs/cairo >=x11-libs/gdk-pixbuf-2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango virtual/pkgconfig doc? ( app-text/xmlto ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2 media-libs/alsa-lib >=media-libs/freetype-2 x11-libs/cairo >=x11-libs/gdk-pixbuf-2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango virtual/pkgconfig doc? ( app-text/xmlto ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=WYSIWYG score editor for GTK+
 EAPI=5
 HOMEPAGE=http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2 NTED_FONT
 RDEPEND=>=dev-libs/glib-2 media-libs/alsa-lib >=media-libs/freetype-2 x11-libs/cairo >=x11-libs/gdk-pixbuf-2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango
 SLOT=0
 SRC_URI=http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/sources/nted-1.10.18.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eec8a3b9cbf96a521dad86a8330a7745
diff --git a/metadata/md5-cache/media-sound/oggtst-0.0 b/metadata/md5-cache/media-sound/oggtst-0.0
index 64d8e59be40a..725e55be6472 100644
--- a/metadata/md5-cache/media-sound/oggtst-0.0
+++ b/metadata/md5-cache/media-sound/oggtst-0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A tool for calculating ogg-vorbis playing time
 HOMEPAGE=http://gnometoaster.rulez.org/
 KEYWORDS=~alpha amd64 hppa ppc ppc64 sparc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libao-0.8.0 >=media-libs/libvorbis-1.0_rc2
 SLOT=0
 SRC_URI=http://gnometoaster.rulez.org/archive/oggtst.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=25ea0587095a9d1a8997d76d1eee1429
diff --git a/metadata/md5-cache/media-sound/opus-tools-0.1.2 b/metadata/md5-cache/media-sound/opus-tools-0.1.2
index 1a3aafcb2915..f6fcf04a722a 100644
--- a/metadata/md5-cache/media-sound/opus-tools-0.1.2
+++ b/metadata/md5-cache/media-sound/opus-tools-0.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Opus codec is designed for interactive speech and audio transmission over the Internet.
 EAPI=4
 HOMEPAGE=http://opus-codec.org/
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=>=media-libs/libogg-1.3.0 >=media-libs/opus-0.9.10
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/opus/opus-tools-0.1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=54f46c94c574319d089ca2f9e37f0174
diff --git a/metadata/md5-cache/media-sound/opus-tools-0.1.5 b/metadata/md5-cache/media-sound/opus-tools-0.1.5
index f4e76755b526..450f1e6e850e 100644
--- a/metadata/md5-cache/media-sound/opus-tools-0.1.5
+++ b/metadata/md5-cache/media-sound/opus-tools-0.1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Opus codec is designed for interactive speech and audio transmission over the Internet.
 EAPI=4
 HOMEPAGE=http://opus-codec.org/
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=>=media-libs/libogg-1.3.0 >=media-libs/opus-0.9.10
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/opus/opus-tools-0.1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=4fa625b18751b96d68e70d8946859a8d
diff --git a/metadata/md5-cache/media-sound/opus-tools-0.1.6 b/metadata/md5-cache/media-sound/opus-tools-0.1.6
index 7452e5b87cbe..8c456b7e45cd 100644
--- a/metadata/md5-cache/media-sound/opus-tools-0.1.6
+++ b/metadata/md5-cache/media-sound/opus-tools-0.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Opus codec is designed for interactive speech and audio transmission over the Internet.
 EAPI=4
 HOMEPAGE=http://opus-codec.org/
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=>=media-libs/libogg-1.3.0 >=media-libs/opus-0.9.10
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/opus/opus-tools-0.1.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=63a49272ea35b5bc9d399f8cb9e46250
diff --git a/metadata/md5-cache/media-sound/orpheus-1.6-r1 b/metadata/md5-cache/media-sound/orpheus-1.6-r1
index fe9e9951019f..96e59f0fe951 100644
--- a/metadata/md5-cache/media-sound/orpheus-1.6-r1
+++ b/metadata/md5-cache/media-sound/orpheus-1.6-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses media-libs/libvorbis media-sound/mpg123 media-sound/vorbis-tools[ogg123]
 SLOT=0
 SRC_URI=http://konst.org.ua/download/orpheus-1.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f31e58813a1634d70bd48560a12564ed
diff --git a/metadata/md5-cache/media-sound/orpheus-1.6-r2 b/metadata/md5-cache/media-sound/orpheus-1.6-r2
index 86709f09d59b..135edeae15cf 100644
--- a/metadata/md5-cache/media-sound/orpheus-1.6-r2
+++ b/metadata/md5-cache/media-sound/orpheus-1.6-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile prepare
-DEPEND=sys-libs/ncurses media-libs/libvorbis media-sound/mpg123 media-sound/vorbis-tools[ogg123] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses media-libs/libvorbis media-sound/mpg123 media-sound/vorbis-tools[ogg123] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Command line MP3 player.
 EAPI=4
 HOMEPAGE=http://konst.org.ua/en/orpheus
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses media-libs/libvorbis media-sound/mpg123 media-sound/vorbis-tools[ogg123]
 SLOT=0
 SRC_URI=http://konst.org.ua/download/orpheus-1.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a89678768340faea2b650a0d2ce84de4
diff --git a/metadata/md5-cache/media-sound/pms-0.42 b/metadata/md5-cache/media-sound/pms-0.42
index 2dd883b284f3..f3d0581f2f3f 100644
--- a/metadata/md5-cache/media-sound/pms-0.42
+++ b/metadata/md5-cache/media-sound/pms-0.42
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=virtual/pkgconfig sys-libs/ncurses dev-libs/glib:2 regex? ( >=dev-libs/boost-1.36 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig sys-libs/ncurses dev-libs/glib:2 regex? ( >=dev-libs/boost-1.36 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Practical Music Search: an open source ncurses client for mpd, written in C++
 EAPI=2
 HOMEPAGE=http://pms.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses dev-libs/glib:2 regex? ( >=dev-libs/boost-1.36 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pms/pms-0.42.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=747482ac4d3b557998e89b7e51ec7c8e
diff --git a/metadata/md5-cache/media-sound/pms-9999 b/metadata/md5-cache/media-sound/pms-9999
index 9629304038a6..37b760d61c8e 100644
--- a/metadata/md5-cache/media-sound/pms-9999
+++ b/metadata/md5-cache/media-sound/pms-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=virtual/pkgconfig sys-libs/ncurses dev-libs/glib:2 regex? ( >=dev-libs/boost-1.36 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=virtual/pkgconfig sys-libs/ncurses dev-libs/glib:2 regex? ( >=dev-libs/boost-1.36 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Practical Music Search: an open source ncurses client for mpd, written in C++
 EAPI=2
 HOMEPAGE=http://pms.sourceforge.net/
@@ -7,5 +7,5 @@ IUSE=regex
 LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses dev-libs/glib:2 regex? ( >=dev-libs/boost-1.36 )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=6da9fef5a02affed57d49ed520b996ac
diff --git a/metadata/md5-cache/media-sound/pnmixer-0.6_pre20111213 b/metadata/md5-cache/media-sound/pnmixer-0.6_pre20111213
index 0fd43644d3e0..220e84214457 100644
--- a/metadata/md5-cache/media-sound/pnmixer-0.6_pre20111213
+++ b/metadata/md5-cache/media-sound/pnmixer-0.6_pre20111213
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Alsa volume mixer for the system tray
 EAPI=5
 HOMEPAGE=https://github.com/nicklan/pnmixer
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/alsa-lib x11-libs/gtk+:2 x11-libs/libX11 libnotify? ( x11-libs/libnotify )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/pnmixer-0.6_pre20111213.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f9307fba34de85f82e01ddf082b3709d
diff --git a/metadata/md5-cache/media-sound/pragha-1.1.1 b/metadata/md5-cache/media-sound/pragha-1.1.1
index ef2555f76d27..7f42adf76dc4 100644
--- a/metadata/md5-cache/media-sound/pragha-1.1.1
+++ b/metadata/md5-cache/media-sound/pragha-1.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.28 >=dev-libs/keybinder-0.2.2:0 || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90 ) media-libs/gst-plugins-base:0.10 >=media-libs/libcddb-1.3.2 >=media-libs/taglib-1.7.1 >=x11-libs/gtk+-2.24:2 x11-libs/libX11 >=x11-libs/libnotify-0.7 >=xfce-base/libxfce4ui-4.8 playlist? ( >=dev-libs/totem-pl-parser-2.26 ) glyr? ( >=media-libs/glyr-0.9.9 ) lastfm? ( >=media-libs/libclastfm-0.5 ) media-plugins/gst-plugins-meta:0.10
 SLOT=0
 SRC_URI=mirror://github/matiasdelellis/pragha/pragha-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=a9db15100ea2deb081c29c40c55ec0f6
diff --git a/metadata/md5-cache/media-sound/pragha-1.1.2 b/metadata/md5-cache/media-sound/pragha-1.1.2
index 4b3d8f771e81..5d5fc3d6f5fe 100644
--- a/metadata/md5-cache/media-sound/pragha-1.1.2
+++ b/metadata/md5-cache/media-sound/pragha-1.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.28 >=dev-libs/keybinder-0.2.2:0 dev-libs/libcdio-paranoia media-libs/gst-plugins-base:0.10 >=media-libs/libcddb-1.3.2 >=media-libs/taglib-1.7.1 >=x11-libs/gtk+-2.24:2 x11-libs/libX11 >=x11-libs/libnotify-0.7 >=xfce-base/libxfce4ui-4.10 playlist? ( >=dev-libs/totem-pl-parser-2.26 ) glyr? ( >=media-libs/glyr-1.0.0 ) lastfm? ( >=media-libs/libclastfm-0.5 ) media-plugins/gst-plugins-meta:0.10
 SLOT=0
 SRC_URI=http://dissonance.googlecode.com/files/pragha-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=20c290772de76a4eba5b067f813e944e
diff --git a/metadata/md5-cache/media-sound/pulseaudio-1.1-r1 b/metadata/md5-cache/media-sound/pulseaudio-1.1-r1
index e608a21959eb..7f05d3a6c94a 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-1.1-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-1.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=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? ( >=virtual/udev-143[hwdb] ) 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 virtual/pkgconfig system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) dev-util/intltool || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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? ( >=virtual/udev-143[hwdb] ) 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 virtual/pkgconfig system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) dev-util/intltool || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A networked sound server with an advanced plugin system
 EAPI=5
 HOMEPAGE=http://www.pulseaudio.org/
@@ -10,5 +10,5 @@ RDEPEND=app-admin/eselect-esd X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/libxcb-1.6
 REQUIRED_USE=bluetooth? ( dbus )
 SLOT=0
 SRC_URI=http://freedesktop.org/software/pulseaudio/releases/pulseaudio-1.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=027c1146730d9e173b61d0da8bfc4d4e
diff --git a/metadata/md5-cache/media-sound/pulseaudio-9999 b/metadata/md5-cache/media-sound/pulseaudio-9999
index d939ff113b45..97fae40bb1b8 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-9999
+++ b/metadata/md5-cache/media-sound/pulseaudio-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst setup test unpack
-DEPEND=>=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 ) gtk? ( x11-libs/gtk+:3 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4.99 >=sys-apps/dbus-1.0.0 media-libs/sbc ) asyncns? ( net-libs/libasyncns ) udev? ( >=virtual/udev-143[hwdb] ) 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 ) webrtc-aec? ( media-libs/webrtc-audio-processing ) xen? ( app-emulation/xen ) systemd? ( >=sys-apps/systemd-39 ) dev-libs/json-c >=sys-devel/libtool-2.2.4 sys-devel/m4 doc? ( app-doc/doxygen ) test? ( dev-libs/check ) X? ( x11-proto/xproto >=x11-libs/libXtst-1.0.99.2 ) dev-libs/libatomic_ops virtual/pkgconfig system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) dev-util/intltool || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git virtual/pkgconfig
+DEPEND=>=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 ) gtk? ( x11-libs/gtk+:3 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4.99 >=sys-apps/dbus-1.0.0 media-libs/sbc ) asyncns? ( net-libs/libasyncns ) udev? ( >=virtual/udev-143[hwdb] ) 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 ) webrtc-aec? ( media-libs/webrtc-audio-processing ) xen? ( app-emulation/xen ) systemd? ( >=sys-apps/systemd-39 ) dev-libs/json-c >=sys-devel/libtool-2.2.4 sys-devel/m4 doc? ( app-doc/doxygen ) test? ( dev-libs/check ) X? ( x11-proto/xproto >=x11-libs/libXtst-1.0.99.2 ) dev-libs/libatomic_ops virtual/pkgconfig system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) dev-util/intltool || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git virtual/pkgconfig
 DESCRIPTION=A networked sound server with an advanced plugin system
 EAPI=5
 HOMEPAGE=http://www.pulseaudio.org/
@@ -9,5 +9,5 @@ PDEPEND=alsa? ( media-plugins/alsa-plugins[pulseaudio] )
 RDEPEND=>=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 ) gtk? ( x11-libs/gtk+:3 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4.99 >=sys-apps/dbus-1.0.0 media-libs/sbc ) asyncns? ( net-libs/libasyncns ) udev? ( >=virtual/udev-143[hwdb] ) 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 ) webrtc-aec? ( media-libs/webrtc-audio-processing ) xen? ( app-emulation/xen ) systemd? ( >=sys-apps/systemd-39 ) dev-libs/json-c >=sys-devel/libtool-2.2.4 equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) ) X? ( gnome-extra/gnome-audio ) system-wide? ( sys-apps/openrc alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-4 ) )
 REQUIRED_USE=bluetooth? ( dbus )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0c40644c744b025344aea576f10e3f5b
diff --git a/metadata/md5-cache/media-sound/qmidiarp-0.3.9 b/metadata/md5-cache/media-sound/qmidiarp-0.3.9
index 3a4262d470c6..d127e20f2935 100644
--- a/metadata/md5-cache/media-sound/qmidiarp-0.3.9
+++ b/metadata/md5-cache/media-sound/qmidiarp-0.3.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=media-libs/alsa-lib media-sound/jack-audio-connection-kit dev-qt/qtgui:4 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/alsa-lib media-sound/jack-audio-connection-kit dev-qt/qtgui:4 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An arpeggiator, sequencer and MIDI LFO for ALSA
 EAPI=4
 HOMEPAGE=http://qmidiarp.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib media-sound/jack-audio-connection-kit dev-qt/qtgui:4
 SLOT=0
 SRC_URI=mirror://sourceforge/qmidiarp/qmidiarp-0.3.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b9763e9dc93b03d0a5ca5cb82268a92b
diff --git a/metadata/md5-cache/media-sound/quark-3.24 b/metadata/md5-cache/media-sound/quark-3.24
index 5c7cb658a9b0..4e6622d6424f 100644
--- a/metadata/md5-cache/media-sound/quark-3.24
+++ b/metadata/md5-cache/media-sound/quark-3.24
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2 gnome-base/gnome-vfs:2 media-libs/xine-lib x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 gnome? ( gnome-base/gconf:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-libs/glib:2 gnome-base/gnome-vfs:2 media-libs/xine-lib x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 gnome? ( gnome-base/gconf:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Quark is the Anti-GUI Music Player with a cool Docklet!
 EAPI=4
 HOMEPAGE=http://hsgg.github.com/quark/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gnome-base/gnome-vfs:2 media-libs/xine-lib x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 gnome? ( gnome-base/gconf:2 )
 SLOT=0
 SRC_URI=http://hsgg.github.com/quark/quark-3.24.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b88fb55e3fd69224e3fa1808ffddd548
diff --git a/metadata/md5-cache/media-sound/rezound-0.12.3_beta-r2 b/metadata/md5-cache/media-sound/rezound-0.12.3_beta-r2
index 601bdb869e6a..aa778599c706 100644
--- a/metadata/md5-cache/media-sound/rezound-0.12.3_beta-r2
+++ b/metadata/md5-cache/media-sound/rezound-0.12.3_beta-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND==sci-libs/fftw-2* >=x11-libs/fox-1.6.19:1.6 >=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 virtual/pkgconfig sys-devel/flex dev-util/reswrap || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==sci-libs/fftw-2* >=x11-libs/fox-1.6.19:1.6 >=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 virtual/pkgconfig sys-devel/flex dev-util/reswrap || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Sound editor and recorder
 EAPI=4
 HOMEPAGE=http://rezound.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==sci-libs/fftw-2* >=x11-libs/fox-1.6.19:1.6 >=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/rezound/rezound-0.12.3beta.tar.gz mirror://gentoo/rezound-0.12.3_beta-patches-6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2a992298fd872c91830b9fd07147fd83
diff --git a/metadata/md5-cache/media-sound/rosegarden-12.04 b/metadata/md5-cache/media-sound/rosegarden-12.04
index c19d5170c503..5be38a2c5f99 100644
--- a/metadata/md5-cache/media-sound/rosegarden-12.04
+++ b/metadata/md5-cache/media-sound/rosegarden-12.04
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=dev-qt/qtgui: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 ) virtual/pkgconfig x11-misc/makedepend || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-qt/qtgui: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 ) virtual/pkgconfig x11-misc/makedepend || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=MIDI and audio sequencer and notation editor
 EAPI=4
 HOMEPAGE=http://www.rosegardenmusic.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui: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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/rosegarden/rosegarden/12.04-LINUX/rosegarden-12.04.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=cb91c308fce6ea3e5dd28a6cab054d9d
diff --git a/metadata/md5-cache/media-sound/rosegarden-12.12.25 b/metadata/md5-cache/media-sound/rosegarden-12.12.25
index 3ffa1ec967a6..d428dc714c86 100644
--- a/metadata/md5-cache/media-sound/rosegarden-12.12.25
+++ b/metadata/md5-cache/media-sound/rosegarden-12.12.25
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=dev-qt/qtgui: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 ) virtual/pkgconfig x11-misc/makedepend || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-qt/qtgui: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 ) virtual/pkgconfig x11-misc/makedepend || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=MIDI and audio sequencer and notation editor
 EAPI=5
 HOMEPAGE=http://www.rosegardenmusic.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui: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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/rosegarden/rosegarden-12.12.25.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7ee0c9054580f4dd7aa9c6a05bd14fb4
diff --git a/metadata/md5-cache/media-sound/rosegarden-13.02 b/metadata/md5-cache/media-sound/rosegarden-13.02
index 8148451b781e..1dde14a2df6a 100644
--- a/metadata/md5-cache/media-sound/rosegarden-13.02
+++ b/metadata/md5-cache/media-sound/rosegarden-13.02
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=dev-qt/qtgui: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 ) virtual/pkgconfig x11-misc/makedepend || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-qt/qtgui: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 ) virtual/pkgconfig x11-misc/makedepend || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=MIDI and audio sequencer and notation editor
 EAPI=5
 HOMEPAGE=http://www.rosegardenmusic.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui: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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/rosegarden/rosegarden-13.02.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1749472f6fa790fa7050b2a8a2531152
diff --git a/metadata/md5-cache/media-sound/rosegarden-13.04 b/metadata/md5-cache/media-sound/rosegarden-13.04
index d348fd8b6243..c838def15d2b 100644
--- a/metadata/md5-cache/media-sound/rosegarden-13.04
+++ b/metadata/md5-cache/media-sound/rosegarden-13.04
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=dev-qt/qtgui: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 ) virtual/pkgconfig x11-misc/makedepend || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-qt/qtgui: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 ) virtual/pkgconfig x11-misc/makedepend || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=MIDI and audio sequencer and notation editor
 EAPI=5
 HOMEPAGE=http://www.rosegardenmusic.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui: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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/rosegarden/rosegarden-13.04.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fe9236aa7d90376fa76bfebd4032399c
diff --git a/metadata/md5-cache/media-sound/rplay-3.3.2-r1 b/metadata/md5-cache/media-sound/rplay-3.3.2-r1
index d2f5c9c56bc4..e02797957618 100644
--- a/metadata/md5-cache/media-sound/rplay-3.3.2-r1
+++ b/metadata/md5-cache/media-sound/rplay-3.3.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup unpack
-DEPEND=media-sound/gsm || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-sound/gsm || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Play sounds on remote Unix systems, without sending audio data over the network.
 HOMEPAGE=http://rplay.doit.org/
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=media-sound/gsm
 SLOT=0
 SRC_URI=http://rplay.doit.org/dist/rplay-3.3.2.tar.gz mirror://debian/pool/main/r/rplay/rplay_3.3.2-12.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1423b116d354e455687326015b553287
diff --git a/metadata/md5-cache/media-sound/sfc-0.018 b/metadata/md5-cache/media-sound/sfc-0.018
index fd7929520a74..fb12edd2428a 100644
--- a/metadata/md5-cache/media-sound/sfc-0.018
+++ b/metadata/md5-cache/media-sound/sfc-0.018
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=media-libs/alsa-lib x11-libs/fltk:1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/alsa-lib x11-libs/fltk:1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=SoundFontCombi is an opensource software pseudo synthesizer.
 EAPI=4
 HOMEPAGE=http://personal.telefonica.terra.es/web/soudfontcombi/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib x11-libs/fltk:1
 SLOT=0
 SRC_URI=http://personal.telefonica.terra.es/web/soudfontcombi/sfc-0.018.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=24e70f6a2ee5f8fb62acb2eb54b28788
diff --git a/metadata/md5-cache/media-sound/snd-12.7 b/metadata/md5-cache/media-sound/snd-12.7
index 29f407c81033..1349c41fde27 100644
--- a/metadata/md5-cache/media-sound/snd-12.7
+++ b/metadata/md5-cache/media-sound/snd-12.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Snd is a sound editor
 EAPI=4
 HOMEPAGE=http://ccrma.stanford.edu/software/snd/
@@ -10,5 +10,5 @@ RDEPEND=media-libs/audiofile alsa? ( media-libs/alsa-lib ) fam? ( virtual/fam )
 REQUIRED_USE=portaudio? ( !pulseaudio ) pulseaudio? ( !portaudio ) ^^ ( ( !ruby !s7 ) ( ruby !s7 ) ( !ruby s7 ) )
 SLOT=0
 SRC_URI=ftp://ccrma-ftp.stanford.edu/pub/Lisp/snd-12.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=be9c95c9ab4b98557e8395ac0540763d
diff --git a/metadata/md5-cache/media-sound/snd-12.8 b/metadata/md5-cache/media-sound/snd-12.8
index f23c32d06c7e..f3ec35b57500 100644
--- a/metadata/md5-cache/media-sound/snd-12.8
+++ b/metadata/md5-cache/media-sound/snd-12.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Snd is a sound editor
 EAPI=4
 HOMEPAGE=http://ccrma.stanford.edu/software/snd/
@@ -10,5 +10,5 @@ RDEPEND=media-libs/audiofile alsa? ( media-libs/alsa-lib ) fam? ( virtual/fam )
 REQUIRED_USE=portaudio? ( !pulseaudio ) pulseaudio? ( !portaudio ) ^^ ( ( !ruby !s7 ) ( ruby !s7 ) ( !ruby s7 ) )
 SLOT=0
 SRC_URI=ftp://ccrma-ftp.stanford.edu/pub/Lisp/snd-12.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dfa5e3dadc2af349e39301461273a3ac
diff --git a/metadata/md5-cache/media-sound/sonic-visualiser-1.9 b/metadata/md5-cache/media-sound/sonic-visualiser-1.9
index e2bfe64e84b3..dee8bdaaa952 100644
--- a/metadata/md5-cache/media-sound/sonic-visualiser-1.9
+++ b/metadata/md5-cache/media-sound/sonic-visualiser-1.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui: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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-qt/qtcore:4 dev-qt/qtgui: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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Music audio files viewer and analiser
 EAPI=4
 HOMEPAGE=http://www.sonicvisualiser.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/libsndfile media-libs/libsampl
 REQUIRED_USE=|| ( jack pulseaudio portaudio )
 SLOT=0
 SRC_URI=http://code.soundsoftware.ac.uk/attachments/download/194/sonic-visualiser-1.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1909b3f39af5263ae371c8db98db8f15
diff --git a/metadata/md5-cache/media-sound/sooperlooper-1.6.17 b/metadata/md5-cache/media-sound/sooperlooper-1.6.17
index 5b51f9727a51..fdd456891931 100644
--- a/metadata/md5-cache/media-sound/sooperlooper-1.6.17
+++ b/metadata/md5-cache/media-sound/sooperlooper-1.6.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure prepare
-DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Live looping sampler with immediate loop recording
 EAPI=4
 HOMEPAGE=http://essej.net/sooperlooper/index.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=http://essej.net/sooperlooper/sooperlooper-1.6.17.tar.gz mirror://gentoo/sooperlooper-1.6.5-m4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=25da550689616c78a026c0f4938cad46
diff --git a/metadata/md5-cache/media-sound/sooperlooper-1.6.18 b/metadata/md5-cache/media-sound/sooperlooper-1.6.18
index b0dc80f54d51..bb41b8a75a7e 100644
--- a/metadata/md5-cache/media-sound/sooperlooper-1.6.18
+++ b/metadata/md5-cache/media-sound/sooperlooper-1.6.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure prepare
-DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Live looping sampler with immediate loop recording
 EAPI=4
 HOMEPAGE=http://essej.net/sooperlooper/index.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=http://essej.net/sooperlooper/sooperlooper-1.6.18.tar.gz mirror://gentoo/sooperlooper-1.6.5-m4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=cf481534d9c8dccd26f70e1b5217ceb8
diff --git a/metadata/md5-cache/media-sound/sox-14.4.1 b/metadata/md5-cache/media-sound/sox-14.4.1
index 124ad57b6c52..cb55d36b44c4 100644
--- a/metadata/md5-cache/media-sound/sox-14.4.1
+++ b/metadata/md5-cache/media-sound/sox-14.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-devel/libtool-2.2.6b >=media-sound/gsm-1.0.12-r1 alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ao? ( media-libs/libao ) encode? ( >=media-sound/lame-3.98.4 ) ffmpeg? ( >=virtual/ffmpeg-0.9 ) flac? ( >=media-libs/flac-1.1.3 ) id3tag? ( media-libs/libid3tag ) ladspa? ( media-libs/ladspa-sdk ) mad? ( media-libs/libmad ) ogg? ( media-libs/libvorbis media-libs/libogg ) png? ( media-libs/libpng sys-libs/zlib ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( >=media-libs/libsndfile-1.0.11 ) twolame? ( media-sound/twolame ) wavpack? ( media-sound/wavpack ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-devel/libtool-2.2.6b >=media-sound/gsm-1.0.12-r1 alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ao? ( media-libs/libao ) encode? ( >=media-sound/lame-3.98.4 ) ffmpeg? ( >=virtual/ffmpeg-0.9 ) flac? ( >=media-libs/flac-1.1.3 ) id3tag? ( media-libs/libid3tag ) ladspa? ( media-libs/ladspa-sdk ) mad? ( media-libs/libmad ) ogg? ( media-libs/libvorbis media-libs/libogg ) png? ( media-libs/libpng sys-libs/zlib ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( >=media-libs/libsndfile-1.0.11 ) twolame? ( media-sound/twolame ) wavpack? ( media-sound/wavpack ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The swiss army knife of sound processing programs
 EAPI=4
 HOMEPAGE=http://sox.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-devel/libtool-2.2.6b >=media-sound/gsm-1.0.12-r1 alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ao? ( media-libs/libao ) encode? ( >=media-sound/lame-3.98.4 ) ffmpeg? ( >=virtual/ffmpeg-0.9 ) flac? ( >=media-libs/flac-1.1.3 ) id3tag? ( media-libs/libid3tag ) ladspa? ( media-libs/ladspa-sdk ) mad? ( media-libs/libmad ) ogg? ( media-libs/libvorbis media-libs/libogg ) png? ( media-libs/libpng sys-libs/zlib ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( >=media-libs/libsndfile-1.0.11 ) twolame? ( media-sound/twolame ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=mirror://sourceforge/sox/sox-14.4.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b2c17f6156129e70fd24ec4bed63f0ad
diff --git a/metadata/md5-cache/media-sound/streamtranscoder-1.2.4 b/metadata/md5-cache/media-sound/streamtranscoder-1.2.4
index c56ae98e3671..1d1d5e5e0b11 100644
--- a/metadata/md5-cache/media-sound/streamtranscoder-1.2.4
+++ b/metadata/md5-cache/media-sound/streamtranscoder-1.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=media-libs/libogg-1.1 >=media-libs/libvorbis-1.0.1-r2 >=media-sound/lame-3.96 >=media-libs/libmad-0.15.1b >=net-misc/curl-7.11.0 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libogg-1.1 >=media-libs/libvorbis-1.0.1-r2 >=media-sound/lame-3.96 >=media-libs/libmad-0.15.1b >=net-misc/curl-7.11.0 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Command line application to transcode shoutcast/icecast streams to different bitrates
 EAPI=4
 HOMEPAGE=http://www.oddsock.org
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libogg-1.1 >=media-libs/libvorbis-1.0.1-r2 >=media-sound/lame-3.96 >=media-libs/libmad-0.15.1b >=net-misc/curl-7.11.0
 SLOT=0
 SRC_URI=http://www.oddsock.org/tools/streamTranscoder/streamtranscoder-1.2.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a010f19e957e745347513f9e85833543
diff --git a/metadata/md5-cache/media-sound/sweep-0.9.3-r1 b/metadata/md5-cache/media-sound/sweep-0.9.3-r1
index fda725e91dae..12d8c72b6f04 100644
--- a/metadata/md5-cache/media-sound/sweep-0.9.3-r1
+++ b/metadata/md5-cache/media-sound/sweep-0.9.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Audio editor and live playback tool
 EAPI=4
 HOMEPAGE=http://www.metadecks.org/software/sweep/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/sweep/sweep-0.9.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=32a7bcc6f2857949857437b596f692f3
diff --git a/metadata/md5-cache/media-sound/takcd-0.10 b/metadata/md5-cache/media-sound/takcd-0.10
index 152e80dcb27e..1a4efedcac8c 100644
--- a/metadata/md5-cache/media-sound/takcd-0.10
+++ b/metadata/md5-cache/media-sound/takcd-0.10
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Command line CD player
 HOMEPAGE=http://bard.sytes.net/takcd/
 KEYWORDS=alpha amd64 ~hppa ia64 ~mips ~ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://bard.sytes.net/takcd/takcd-0.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=69d4a33e1a314a73335294a83a4fa958
diff --git a/metadata/md5-cache/media-sound/tap-reverbed-0 b/metadata/md5-cache/media-sound/tap-reverbed-0
index bdb34d58a8b1..b1abf5304e6b 100644
--- a/metadata/md5-cache/media-sound/tap-reverbed-0
+++ b/metadata/md5-cache/media-sound/tap-reverbed-0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=media-libs/ladspa-sdk media-plugins/tap-plugins x11-libs/gtk+:2 media-sound/jack-audio-connection-kit virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/ladspa-sdk media-plugins/tap-plugins x11-libs/gtk+:2 media-sound/jack-audio-connection-kit virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Standalone JACK counterpart of LADSPA plugin TAP Reverberator.
 EAPI=2
 HOMEPAGE=http://tap-plugins.sourceforge.net/reverbed.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/ladspa-sdk media-plugins/tap-plugins x11-libs/gtk+:2 media-sound/jack-audio-connection-kit
 SLOT=0
 SRC_URI=mirror://sourceforge/tap-plugins/tap-reverbed-r0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b2d29ac9b1a77e96fe895b6fa7b0479f
diff --git a/metadata/md5-cache/media-sound/timidity++-2.13.2-r13 b/metadata/md5-cache/media-sound/timidity++-2.13.2-r13
index 24d9ef3bd5f9..00250e4696eb 100644
--- a/metadata/md5-cache/media-sound/timidity++-2.13.2-r13
+++ b/metadata/md5-cache/media-sound/timidity++-2.13.2-r13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=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/motif-2.3:0 ) X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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/motif-2.3:0 ) X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A handy MIDI to WAV converter with OSS and ALSA output support
 EAPI=2
 HOMEPAGE=http://timidity.sourceforge.net/
@@ -10,5 +10,5 @@ PDEPEND=|| ( media-sound/timidity-eawpatches media-sound/timidity-shompatches me
 RDEPEND=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/motif-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
 SLOT=0
 SRC_URI=mirror://sourceforge/timidity/TiMidity++-2.13.2.tar.bz2 mirror://gentoo/timidity++-2.13.2-patchset-2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7c04fed6ef9fb949e9457eb8ddc15fee
diff --git a/metadata/md5-cache/media-sound/timidity++-2.13.2-r14 b/metadata/md5-cache/media-sound/timidity++-2.13.2-r14
index c9bac59d5b60..c10a9c060896 100644
--- a/metadata/md5-cache/media-sound/timidity++-2.13.2-r14
+++ b/metadata/md5-cache/media-sound/timidity++-2.13.2-r14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=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/motif-2.3:0 ) X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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/motif-2.3:0 ) X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A handy MIDI to WAV converter with OSS and ALSA output support
 EAPI=4
 HOMEPAGE=http://timidity.sourceforge.net/
@@ -10,5 +10,5 @@ PDEPEND=|| ( media-sound/timidity-eawpatches media-sound/timidity-shompatches me
 RDEPEND=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/motif-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
 SLOT=0
 SRC_URI=mirror://sourceforge/timidity/TiMidity++-2.13.2.tar.bz2 mirror://gentoo/timidity++-2.13.2-patchset-2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8e44ddcf723b3a518d28d8f4aaf54754
diff --git a/metadata/md5-cache/media-sound/timidity++-2.14.0 b/metadata/md5-cache/media-sound/timidity++-2.14.0
index ccba1bd8e2ec..cdf2fcd97bdd 100644
--- a/metadata/md5-cache/media-sound/timidity++-2.14.0
+++ b/metadata/md5-cache/media-sound/timidity++-2.14.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=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/motif-2.3:0 ) X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=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/motif-2.3:0 ) X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=A handy MIDI to WAV converter with OSS and ALSA output support
 EAPI=4
 HOMEPAGE=http://timidity.sourceforge.net/
@@ -10,5 +10,5 @@ PDEPEND=|| ( media-sound/timidity-eawpatches media-sound/timidity-shompatches me
 RDEPEND=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/motif-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
 SLOT=0
 SRC_URI=mirror://sourceforge/timidity/TiMidity++-2.14.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6547bff887bb7cf3664509ea0f0bebb1
diff --git a/metadata/md5-cache/media-sound/timidity++-2.14.0-r1 b/metadata/md5-cache/media-sound/timidity++-2.14.0-r1
index dc54d7e5fb2b..83b2b2040a4e 100644
--- a/metadata/md5-cache/media-sound/timidity++-2.14.0-r1
+++ b/metadata/md5-cache/media-sound/timidity++-2.14.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=ncurses? ( >=sys-libs/ncurses-5 ) emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:2 ) tk? ( >=dev-lang/tk-8.5.13 ) 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/motif-2.3:0 ) X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=ncurses? ( >=sys-libs/ncurses-5 ) emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:2 ) tk? ( >=dev-lang/tk-8.5.13 ) 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/motif-2.3:0 ) X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=A handy MIDI to WAV converter with OSS and ALSA output support
 EAPI=5
 HOMEPAGE=http://timidity.sourceforge.net/
@@ -10,5 +10,5 @@ PDEPEND=|| ( media-sound/timidity-eawpatches media-sound/timidity-shompatches me
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5 ) emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:2 ) tk? ( >=dev-lang/tk-8.5.13 ) 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/motif-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
 SLOT=0
 SRC_URI=mirror://sourceforge/timidity/TiMidity++-2.14.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7d465832cb0b9f07a7e2724a444d6cd1
diff --git a/metadata/md5-cache/media-sound/tk707-0.8-r1 b/metadata/md5-cache/media-sound/tk707-0.8-r1
index f380717d5a32..96804a33a73d 100644
--- a/metadata/md5-cache/media-sound/tk707-0.8-r1
+++ b/metadata/md5-cache/media-sound/tk707-0.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=>=media-libs/alsa-lib-0.9.0 >=dev-lang/tcl-8.4 >=dev-lang/tk-8.4 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/alsa-lib-0.9.0 >=dev-lang/tcl-8.4 >=dev-lang/tk-8.4 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An "7x7" type midi drum sequencer for Linux
 HOMEPAGE=http://www-lmc.imag.fr/lmc-edp/Pierre.Saramito/tk707
 KEYWORDS=~amd64 ~ppc ~x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-0.9.0 >=dev-lang/tcl-8.4 >=dev-lang/tk-8.4
 SLOT=0
 SRC_URI=mirror://gentoo/tk707-0.8.tar.gz mirror://gentoo/tk707-0.8-updated_tcl2c.patch.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e5673e4adcdd0ef4668f3a699a388fc7
diff --git a/metadata/md5-cache/media-sound/vsound-0.6-r1 b/metadata/md5-cache/media-sound/vsound-0.6-r1
index 723fa0ec39a1..ffb0dffecf4e 100644
--- a/metadata/md5-cache/media-sound/vsound-0.6-r1
+++ b/metadata/md5-cache/media-sound/vsound-0.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=media-sound/sox-14.2.0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-sound/sox-14.2.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A virtual audio loopback cable
 EAPI=4
 HOMEPAGE=http://www.vsound.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-sound/sox-14.2.0
 SLOT=0
 SRC_URI=http://www.vsound.org/vsound-0.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9ab76026eb47c0d25db6b1125361ec1a
diff --git a/metadata/md5-cache/media-sound/wavbreaker-0.11 b/metadata/md5-cache/media-sound/wavbreaker-0.11
index 829bd2355ff5..45dc3bb2fb34 100644
--- a/metadata/md5-cache/media-sound/wavbreaker-0.11
+++ b/metadata/md5-cache/media-sound/wavbreaker-0.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/libxml2 >=x11-libs/gtk+-2:2 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 >=x11-libs/gtk+-2:2 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=wavbreaker/wavmerge GTK+ utility to break or merge WAV files
 EAPI=4
 HOMEPAGE=http://wavbreaker.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 >=x11-libs/gtk+-2:2 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/wavbreaker/wavbreaker-0.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=716fd25ce74bb31504c4e9c0ccf9adb7
diff --git a/metadata/md5-cache/media-sound/wavplay-2.0 b/metadata/md5-cache/media-sound/wavplay-2.0
index 460ad2be7a81..88f693434696 100644
--- a/metadata/md5-cache/media-sound/wavplay-2.0
+++ b/metadata/md5-cache/media-sound/wavplay-2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A command line player/recorder for wav files
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/wavplay/
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/wavplay/wavplay-2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=969cc96d794b175fb0d0cbd7fbe33ea8
diff --git a/metadata/md5-cache/media-sound/wildmidi-0.2.3.4-r1 b/metadata/md5-cache/media-sound/wildmidi-0.2.3.4-r1
index 6b3687085962..05e2fa426a02 100644
--- a/metadata/md5-cache/media-sound/wildmidi-0.2.3.4-r1
+++ b/metadata/md5-cache/media-sound/wildmidi-0.2.3.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=alsa? ( media-libs/alsa-lib ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=alsa? ( media-libs/alsa-lib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Midi processing library and a midi player using the gus patch set
 EAPI=3
 HOMEPAGE=http://wildmidi.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=alsa? ( media-libs/alsa-lib ) media-sound/timidity-freepats
 SLOT=0
 SRC_URI=mirror://sourceforge/wildmidi/wildmidi-0.2.3.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3ae33ff429f629cf37800ffc2de88602
diff --git a/metadata/md5-cache/media-sound/wildmidi-0.2.3.5 b/metadata/md5-cache/media-sound/wildmidi-0.2.3.5
index b01879507b26..c12422268974 100644
--- a/metadata/md5-cache/media-sound/wildmidi-0.2.3.5
+++ b/metadata/md5-cache/media-sound/wildmidi-0.2.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=alsa? ( media-libs/alsa-lib ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=alsa? ( media-libs/alsa-lib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Midi processing library and a midi player using the gus patch set
 EAPI=5
 HOMEPAGE=http://wildmidi.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=alsa? ( media-libs/alsa-lib ) media-sound/timidity-freepats
 SLOT=0
 SRC_URI=mirror://sourceforge/wildmidi/wildmidi-0.2.3.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1b299851f7fd853aaaf4c0d1ea216e21
diff --git a/metadata/md5-cache/media-sound/xfmpc-0.2.2 b/metadata/md5-cache/media-sound/xfmpc-0.2.2
index 747f12776bf8..dcf5e889d5f5 100644
--- a/metadata/md5-cache/media-sound/xfmpc-0.2.2
+++ b/metadata/md5-cache/media-sound/xfmpc-0.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 >=media-libs/libmpd-0.15 >=x11-libs/gtk+-2.16:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/xfmpc/0.2/xfmpc-0.2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=bea50d77d809a5fdb2e05865430246bb
diff --git a/metadata/md5-cache/media-tv/dvbstreamer-1.1-r1 b/metadata/md5-cache/media-tv/dvbstreamer-1.1-r1
index 24fb5a87b961..b1ffc895db04 100644
--- a/metadata/md5-cache/media-tv/dvbstreamer-1.1-r1
+++ b/metadata/md5-cache/media-tv/dvbstreamer-1.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-db/sqlite:3 sys-libs/readline >=sys-devel/libtool-2.2.6 virtual/linuxtv-dvb-headers || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-db/sqlite:3 sys-libs/readline >=sys-devel/libtool-2.2.6 virtual/linuxtv-dvb-headers || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=DVB over UDP streaming solution
 EAPI=2
 HOMEPAGE=http://dvbstreamer.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 sys-libs/readline >=sys-devel/libtool-2.2.6
 SLOT=0
 SRC_URI=mirror://sourceforge/dvbstreamer/dvbstreamer-1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=243da92325dbde95f60aa6f30d2beb8b
diff --git a/metadata/md5-cache/media-tv/me-tv-1.4.0.10 b/metadata/md5-cache/media-tv/me-tv-1.4.0.10
index df368be27e5c..74f52e750d6d 100644
--- a/metadata/md5-cache/media-tv/me-tv-1.4.0.10
+++ b/metadata/md5-cache/media-tv/me-tv-1.4.0.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-cpp/gconfmm-2.6 dev-cpp/gtkmm:2.4 dev-cpp/libxmlpp:2.6 dev-libs/libunique:1 >=dev-libs/dbus-glib-0.92 net-libs/gnet:2 =dev-db/sqlite-3* >=media-video/vlc-1.1.8 media-libs/gstreamer:0.10 media-plugins/gst-plugins-xvideo:0.10 media-libs/gst-plugins-base:0.10 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-cpp/gconfmm-2.6 dev-cpp/gtkmm:2.4 dev-cpp/libxmlpp:2.6 dev-libs/libunique:1 >=dev-libs/dbus-glib-0.92 net-libs/gnet:2 =dev-db/sqlite-3* >=media-video/vlc-1.1.8 media-libs/gstreamer:0.10 media-plugins/gst-plugins-xvideo:0.10 media-libs/gst-plugins-base:0.10 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Me TV is a GTK desktop application for watching digital television.
 EAPI=4
 HOMEPAGE=http://me-tv.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-cpp/gconfmm-2.6 dev-cpp/gtkmm:2.4 dev-cpp/libxmlpp:2.6 dev-libs/li
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://launchpad.net/me-tv/1.4/1.4.0/+download/me-tv-1.4.0.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f0525f8f217d8beba3ad11eb16ffced0
diff --git a/metadata/md5-cache/media-tv/tvtime-1.0.2_p20110131-r3 b/metadata/md5-cache/media-tv/tvtime-1.0.2_p20110131-r3
index 87683b016c69..31d227107b96 100644
--- a/metadata/md5-cache/media-tv/tvtime-1.0.2_p20110131-r3
+++ b/metadata/md5-cache/media-tv/tvtime-1.0.2_p20110131-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High quality television application for use with video capture cards
 EAPI=4
 HOMEPAGE=http://tvtime.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ab21f4fa25761fd2522fc42037ff8564
diff --git a/metadata/md5-cache/media-tv/xawtv-3.95-r2 b/metadata/md5-cache/media-tv/xawtv-3.95-r2
index 669ecbe75b37..0026e0728124 100644
--- a/metadata/md5-cache/media-tv/xawtv-3.95-r2
+++ b/metadata/md5-cache/media-tv/xawtv-3.95-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=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/motif-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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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/motif-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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Small suite of video4linux related software
 EAPI=1
 HOMEPAGE=http://bytesex.org/xawtv/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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/motif-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/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	496e78852e1e48010965fdd33a505f9c	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=66d333e264060d975147058b30b77d2f
diff --git a/metadata/md5-cache/media-tv/xbmc-11.0 b/metadata/md5-cache/media-tv/xbmc-11.0
index 98084532a7a0..dbe4eaa6771b 100644
--- a/metadata/md5-cache/media-tv/xbmc-11.0
+++ b/metadata/md5-cache/media-tv/xbmc-11.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=virtual/glu 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] cec? ( dev-libs/libcec ) dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 dev-libs/yajl 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 || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) >=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[opengl] ) 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-lang/python-2.7*[sqlite] =dev-lang/python-2.6*[sqlite] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/glu 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] cec? ( dev-libs/libcec ) dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 dev-libs/yajl 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 || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) >=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[opengl] ) 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-lang/python-2.7*[sqlite] =dev-lang/python-2.6*[sqlite] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=XBMC is a free and open source media-player and entertainment hub
 EAPI=4
 HOMEPAGE=http://xbmc.org/
@@ -10,5 +10,5 @@ RDEPEND=virtual/glu virtual/opengl app-arch/bzip2 app-arch/unzip app-arch/zip ap
 REQUIRED_USE=pvr? ( mysql )
 SLOT=0
 SRC_URI=http://mirrors.xbmc.org/releases/source/xbmc-11.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a6fdd56447241905d3d04619405aef2c
diff --git a/metadata/md5-cache/media-tv/xbmc-11.0-r1 b/metadata/md5-cache/media-tv/xbmc-11.0-r1
index 04863381683f..e195e584d7df 100644
--- a/metadata/md5-cache/media-tv/xbmc-11.0-r1
+++ b/metadata/md5-cache/media-tv/xbmc-11.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=virtual/glu 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] cec? ( dev-libs/libcec ) dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 dev-libs/yajl 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 || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) >=virtual/ffmpeg-0.10.2[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[opengl] ) 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-lang/python-2.7*[sqlite] =dev-lang/python-2.6*[sqlite] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/glu 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] cec? ( dev-libs/libcec ) dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 dev-libs/yajl 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 || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) >=virtual/ffmpeg-0.10.2[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[opengl] ) 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-lang/python-2.7*[sqlite] =dev-lang/python-2.6*[sqlite] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=XBMC is a free and open source media-player and entertainment hub
 EAPI=4
 HOMEPAGE=http://xbmc.org/
@@ -10,5 +10,5 @@ RDEPEND=virtual/glu virtual/opengl app-arch/bzip2 app-arch/unzip app-arch/zip ap
 REQUIRED_USE=pvr? ( mysql )
 SLOT=0
 SRC_URI=http://mirrors.xbmc.org/releases/source/xbmc-11.0.tar.gz http://dev.gentoo.org/~aballier/distfiles/xbmc-11.0-ffmpeg-1.0-compat-1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1326d701662131196a7f17b5e8a2de5f
diff --git a/metadata/md5-cache/media-tv/xbmc-12.0 b/metadata/md5-cache/media-tv/xbmc-12.0
index d4e48656b127..43a595fd7fc1 100644
--- a/metadata/md5-cache/media-tv/xbmc-12.0
+++ b/metadata/md5-cache/media-tv/xbmc-12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=virtual/glu 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] cec? ( >=dev-libs/libcec-2 ) dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-libs/yajl 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 >=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/taglib-1.8 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 || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) >=virtual/ffmpeg-0.6[encode] rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) nfs? ( net-fs/libnfs ) webserver? ( net-libs/libmicrohttpd[messages] ) sftp? ( net-libs/libssh ) net-misc/curl samba? ( >=net-fs/samba-3.4.6[smbclient] ) bluetooth? ( net-wireless/bluez ) sys-apps/dbus sys-libs/zlib virtual/jpeg mysql? ( virtual/mysql ) x11-apps/xdpyinfo x11-apps/mesa-progs vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) virtual/ffmpeg[vdpau] ) x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender app-arch/xz-utils dev-lang/swig dev-util/gperf x11-proto/xineramaproto dev-util/cmake x86? ( dev-lang/nasm ) java? ( virtual/jre ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite] =dev-lang/python-2.6*[sqlite] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/glu 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] cec? ( >=dev-libs/libcec-2 ) dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-libs/yajl 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 >=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/taglib-1.8 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 || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) >=virtual/ffmpeg-0.6[encode] rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) nfs? ( net-fs/libnfs ) webserver? ( net-libs/libmicrohttpd[messages] ) sftp? ( net-libs/libssh ) net-misc/curl samba? ( >=net-fs/samba-3.4.6[smbclient] ) bluetooth? ( net-wireless/bluez ) sys-apps/dbus sys-libs/zlib virtual/jpeg mysql? ( virtual/mysql ) x11-apps/xdpyinfo x11-apps/mesa-progs vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) virtual/ffmpeg[vdpau] ) x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender app-arch/xz-utils dev-lang/swig dev-util/gperf x11-proto/xineramaproto dev-util/cmake x86? ( dev-lang/nasm ) java? ( virtual/jre ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite] =dev-lang/python-2.6*[sqlite] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=XBMC is a free and open source media-player and entertainment hub
 EAPI=4
 HOMEPAGE=http://xbmc.org/
@@ -10,5 +10,5 @@ RDEPEND=virtual/glu virtual/opengl app-arch/bzip2 app-arch/unzip app-arch/zip ap
 REQUIRED_USE=pvr? ( mysql )
 SLOT=0
 SRC_URI=http://mirrors.xbmc.org/releases/source/xbmc-12.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6af6981c9f8a3820649b028dcf9ea833
diff --git a/metadata/md5-cache/media-tv/xbmc-12.1 b/metadata/md5-cache/media-tv/xbmc-12.1
index 86b0f1001085..cb032e84a916 100644
--- a/metadata/md5-cache/media-tv/xbmc-12.1
+++ b/metadata/md5-cache/media-tv/xbmc-12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=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] cec? ( >=dev-libs/libcec-2.1 ) dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-libs/yajl 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 >=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 sdl? ( media-libs/libsdl[audio,opengl,video,X] ) alsa? ( media-libs/libsdl[alsa] ) >=media-libs/taglib-1.8 media-libs/libvorbis sdl? ( 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 || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) >=virtual/ffmpeg-0.6[encode] rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) nfs? ( net-fs/libnfs ) webserver? ( net-libs/libmicrohttpd[messages] ) sftp? ( net-libs/libssh ) net-misc/curl samba? ( >=net-fs/samba-3.4.6[smbclient] ) bluetooth? ( net-wireless/bluez ) sys-apps/dbus caps? ( sys-libs/libcap ) sys-libs/zlib virtual/jpeg usb? ( virtual/libusb ) mysql? ( virtual/mysql ) opengl? ( virtual/glu virtual/opengl ) gles? ( virtual/opengl ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) virtual/ffmpeg[vdpau] ) X? ( x11-apps/xdpyinfo x11-apps/mesa-progs x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender ) app-arch/xz-utils dev-lang/swig dev-util/gperf X? ( x11-proto/xineramaproto ) dev-util/cmake x86? ( dev-lang/nasm ) java? ( virtual/jre ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite] =dev-lang/python-2.6*[sqlite] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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] cec? ( >=dev-libs/libcec-2.1 ) dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-libs/yajl 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 >=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 sdl? ( media-libs/libsdl[audio,opengl,video,X] ) alsa? ( media-libs/libsdl[alsa] ) >=media-libs/taglib-1.8 media-libs/libvorbis sdl? ( 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 || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) >=virtual/ffmpeg-0.6[encode] rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) nfs? ( net-fs/libnfs ) webserver? ( net-libs/libmicrohttpd[messages] ) sftp? ( net-libs/libssh ) net-misc/curl samba? ( >=net-fs/samba-3.4.6[smbclient] ) bluetooth? ( net-wireless/bluez ) sys-apps/dbus caps? ( sys-libs/libcap ) sys-libs/zlib virtual/jpeg usb? ( virtual/libusb ) mysql? ( virtual/mysql ) opengl? ( virtual/glu virtual/opengl ) gles? ( virtual/opengl ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) virtual/ffmpeg[vdpau] ) X? ( x11-apps/xdpyinfo x11-apps/mesa-progs x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender ) app-arch/xz-utils dev-lang/swig dev-util/gperf X? ( x11-proto/xineramaproto ) dev-util/cmake x86? ( dev-lang/nasm ) java? ( virtual/jre ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite] =dev-lang/python-2.6*[sqlite] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=XBMC is a free and open source media-player and entertainment hub
 EAPI=4
 HOMEPAGE=http://xbmc.org/
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 app-arch/unzip app-arch/zip app-i18n/enca airplay? ( app-
 REQUIRED_USE=pvr? ( mysql ) rsxs? ( X ) xrandr? ( X )
 SLOT=0
 SRC_URI=http://mirrors.xbmc.org/releases/source/xbmc-12.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ab82eea06f7186a09e0b095bc57018de
diff --git a/metadata/md5-cache/media-tv/xbmc-12.1-r1 b/metadata/md5-cache/media-tv/xbmc-12.1-r1
index b81c2a4288ee..dd5296f62413 100644
--- a/metadata/md5-cache/media-tv/xbmc-12.1-r1
+++ b/metadata/md5-cache/media-tv/xbmc-12.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=python_single_target_python2_6? ( dev-lang/python:2.6[sqlite] ) python_single_target_python2_7? ( dev-lang/python:2.7[sqlite] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] app-arch/bzip2 app-arch/unzip app-arch/zip app-i18n/enca airplay? ( app-pda/libplist ) dev-libs/boost dev-libs/fribidi dev-libs/libcdio[-minimal] cec? ( >=dev-libs/libcec-2.1 ) dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-libs/yajl dev-python/simplejson[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] 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 >=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 sdl? ( media-libs/libsdl[audio,opengl,video,X] ) alsa? ( media-libs/libsdl[alsa] ) >=media-libs/taglib-1.8 media-libs/libvorbis sdl? ( 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 || ( media-libs/libpostproc media-video/ffmpeg ) >=virtual/ffmpeg-9[encode] rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) nfs? ( net-fs/libnfs ) webserver? ( net-libs/libmicrohttpd[messages] ) sftp? ( net-libs/libssh ) net-misc/curl samba? ( >=net-fs/samba-3.4.6[smbclient] ) bluetooth? ( net-wireless/bluez ) sys-apps/dbus caps? ( sys-libs/libcap ) sys-libs/zlib virtual/jpeg usb? ( virtual/libusb ) mysql? ( virtual/mysql ) opengl? ( virtual/glu virtual/opengl ) gles? ( virtual/opengl ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) virtual/ffmpeg[vdpau] ) X? ( x11-apps/xdpyinfo x11-apps/mesa-progs x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender ) app-arch/xz-utils dev-lang/swig dev-util/gperf X? ( x11-proto/xineramaproto ) dev-util/cmake x86? ( dev-lang/nasm ) java? ( virtual/jre ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=python_single_target_python2_6? ( dev-lang/python:2.6[sqlite] ) python_single_target_python2_7? ( dev-lang/python:2.7[sqlite] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] app-arch/bzip2 app-arch/unzip app-arch/zip app-i18n/enca airplay? ( app-pda/libplist ) dev-libs/boost dev-libs/fribidi dev-libs/libcdio[-minimal] cec? ( >=dev-libs/libcec-2.1 ) dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-libs/yajl dev-python/simplejson[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] 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 >=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 sdl? ( media-libs/libsdl[audio,opengl,video,X] ) alsa? ( media-libs/libsdl[alsa] ) >=media-libs/taglib-1.8 media-libs/libvorbis sdl? ( 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 || ( media-libs/libpostproc media-video/ffmpeg ) >=virtual/ffmpeg-9[encode] rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) nfs? ( net-fs/libnfs ) webserver? ( net-libs/libmicrohttpd[messages] ) sftp? ( net-libs/libssh ) net-misc/curl samba? ( >=net-fs/samba-3.4.6[smbclient] ) bluetooth? ( net-wireless/bluez ) sys-apps/dbus caps? ( sys-libs/libcap ) sys-libs/zlib virtual/jpeg usb? ( virtual/libusb ) mysql? ( virtual/mysql ) opengl? ( virtual/glu virtual/opengl ) gles? ( virtual/opengl ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) virtual/ffmpeg[vdpau] ) X? ( x11-apps/xdpyinfo x11-apps/mesa-progs x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender ) app-arch/xz-utils dev-lang/swig dev-util/gperf X? ( x11-proto/xineramaproto ) dev-util/cmake x86? ( dev-lang/nasm ) java? ( virtual/jre ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=XBMC is a free and open source media-player and entertainment hub
 EAPI=5
 HOMEPAGE=http://xbmc.org/
 IUSE=airplay alsa altivec avahi bluetooth bluray caps cec css debug gles goom java joystick midi mysql neon nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba +sdl sse sse2 sftp udev upnp +usb vaapi vdpau webserver +X +xrandr python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_6? ( dev-lang/python:2.6[sqlite] ) python_single_target_python2_7? ( dev-lang/python:2.7[sqlite] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] app-arch/bzip2 app-arch/unzip app-arch/zip app-i18n/enca airplay? ( app-pda/libplist ) dev-libs/boost dev-libs/fribidi dev-libs/libcdio[-minimal] cec? ( >=dev-libs/libcec-2.1 ) dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-libs/yajl dev-python/simplejson[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] 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 >=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 sdl? ( media-libs/libsdl[audio,opengl,video,X] ) alsa? ( media-libs/libsdl[alsa] ) >=media-libs/taglib-1.8 media-libs/libvorbis sdl? ( 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 || ( media-libs/libpostproc media-video/ffmpeg ) >=virtual/ffmpeg-9[encode] rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) nfs? ( net-fs/libnfs ) webserver? ( net-libs/libmicrohttpd[messages] ) sftp? ( net-libs/libssh ) net-misc/curl samba? ( >=net-fs/samba-3.4.6[smbclient] ) bluetooth? ( net-wireless/bluez ) sys-apps/dbus caps? ( sys-libs/libcap ) sys-libs/zlib virtual/jpeg usb? ( virtual/libusb ) mysql? ( virtual/mysql ) opengl? ( virtual/glu virtual/opengl ) gles? ( virtual/opengl ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) virtual/ffmpeg[vdpau] ) X? ( x11-apps/xdpyinfo x11-apps/mesa-progs x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender ) udev? ( sys-fs/udisks:0 sys-power/upower )
-REQUIRED_USE=pvr? ( mysql ) rsxs? ( X ) xrandr? ( X )
+REQUIRED_USE=pvr? ( mysql ) rsxs? ( X ) X? ( sdl ) xrandr? ( X )
 SLOT=0
 SRC_URI=http://mirrors.xbmc.org/releases/source/xbmc-12.1.tar.gz http://dev.gentooexperimental.org/~scarabeus/xbmc-12-libav.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bea3b328a918751572cad54709e80c7b
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=40fdb58aff7a4874351679b7c185748f
diff --git a/metadata/md5-cache/media-tv/xbmc-9999 b/metadata/md5-cache/media-tv/xbmc-9999
index 4833fdbdfb60..104bffe293fc 100644
--- a/metadata/md5-cache/media-tv/xbmc-9999
+++ b/metadata/md5-cache/media-tv/xbmc-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=python_single_target_python2_6? ( dev-lang/python:2.6[sqlite] ) python_single_target_python2_7? ( dev-lang/python:2.7[sqlite] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] 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] cec? ( >=dev-libs/libcec-2.1 ) dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-libs/yajl dev-python/simplejson[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] media-fonts/corefonts media-fonts/roboto 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 >=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 sdl? ( media-libs/libsdl[audio,opengl,video,X] ) alsa? ( media-libs/libsdl[alsa] ) >=media-libs/taglib-1.8 media-libs/libvorbis sdl? ( 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 || ( media-libs/libpostproc media-video/ffmpeg ) >=virtual/ffmpeg-9[encode] rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) nfs? ( net-fs/libnfs ) webserver? ( net-libs/libmicrohttpd[messages] ) sftp? ( net-libs/libssh ) net-misc/curl samba? ( >=net-fs/samba-3.4.6[smbclient] ) bluetooth? ( net-wireless/bluez ) sys-apps/dbus caps? ( sys-libs/libcap ) sys-libs/zlib virtual/jpeg usb? ( virtual/libusb ) mysql? ( virtual/mysql ) opengl? ( virtual/glu virtual/opengl ) gles? ( virtual/opengl ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) virtual/ffmpeg[vdpau] ) X? ( x11-apps/xdpyinfo x11-apps/mesa-progs x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender ) app-arch/xz-utils dev-lang/swig dev-util/gperf X? ( x11-proto/xineramaproto ) dev-util/cmake x86? ( dev-lang/nasm ) java? ( virtual/jre ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=python_single_target_python2_6? ( dev-lang/python:2.6[sqlite] ) python_single_target_python2_7? ( dev-lang/python:2.7[sqlite] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] 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] cec? ( >=dev-libs/libcec-2.1 ) dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-libs/yajl dev-python/simplejson[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] media-fonts/corefonts media-fonts/roboto 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 >=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 sdl? ( media-libs/libsdl[audio,opengl,video,X] ) alsa? ( media-libs/libsdl[alsa] ) >=media-libs/taglib-1.8 media-libs/libvorbis sdl? ( 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 || ( media-libs/libpostproc media-video/ffmpeg ) >=virtual/ffmpeg-9[encode] rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) nfs? ( net-fs/libnfs ) webserver? ( net-libs/libmicrohttpd[messages] ) sftp? ( net-libs/libssh ) net-misc/curl samba? ( >=net-fs/samba-3.4.6[smbclient] ) bluetooth? ( net-wireless/bluez ) sys-apps/dbus caps? ( sys-libs/libcap ) sys-libs/zlib virtual/jpeg usb? ( virtual/libusb ) mysql? ( virtual/mysql ) opengl? ( virtual/glu virtual/opengl ) gles? ( virtual/opengl ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) virtual/ffmpeg[vdpau] ) X? ( x11-apps/xdpyinfo x11-apps/mesa-progs x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender ) app-arch/xz-utils dev-lang/swig dev-util/gperf X? ( x11-proto/xineramaproto ) dev-util/cmake x86? ( dev-lang/nasm ) java? ( virtual/jre ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=XBMC is a free and open source media-player and entertainment hub
 EAPI=5
 HOMEPAGE=http://xbmc.org/
 IUSE=airplay alsa altivec avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql neon nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba +sdl sse sse2 sftp udev upnp +usb vaapi vdpau webserver +X +xrandr python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_6? ( dev-lang/python:2.6[sqlite] ) python_single_target_python2_7? ( dev-lang/python:2.7[sqlite] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] 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] cec? ( >=dev-libs/libcec-2.1 ) dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-libs/yajl dev-python/simplejson[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] media-fonts/corefonts media-fonts/roboto 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 >=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 sdl? ( media-libs/libsdl[audio,opengl,video,X] ) alsa? ( media-libs/libsdl[alsa] ) >=media-libs/taglib-1.8 media-libs/libvorbis sdl? ( 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 || ( media-libs/libpostproc media-video/ffmpeg ) >=virtual/ffmpeg-9[encode] rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) nfs? ( net-fs/libnfs ) webserver? ( net-libs/libmicrohttpd[messages] ) sftp? ( net-libs/libssh ) net-misc/curl samba? ( >=net-fs/samba-3.4.6[smbclient] ) bluetooth? ( net-wireless/bluez ) sys-apps/dbus caps? ( sys-libs/libcap ) sys-libs/zlib virtual/jpeg usb? ( virtual/libusb ) mysql? ( virtual/mysql ) opengl? ( virtual/glu virtual/opengl ) gles? ( virtual/opengl ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) virtual/ffmpeg[vdpau] ) X? ( x11-apps/xdpyinfo x11-apps/mesa-progs x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender ) udev? ( sys-fs/udisks:0 sys-power/upower )
-REQUIRED_USE=pvr? ( mysql ) rsxs? ( X ) xrandr? ( X )
+REQUIRED_USE=pvr? ( mysql ) rsxs? ( X ) X? ( sdl ) xrandr? ( X )
 SLOT=0
 SRC_URI=!java? ( mirror://gentoo/xbmc-9999-20130413-generated-addons.tar.xz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4ba2be0a594137b414397f24106dae8a
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d6487a19b9fbc9bd0f3dbb92c02e07c1
diff --git a/metadata/md5-cache/media-video/aegisub-2.1.9 b/metadata/md5-cache/media-video/aegisub-2.1.9
index f296654dfd34..606210a0e64e 100644
--- a/metadata/md5-cache/media-video/aegisub-2.1.9
+++ b/metadata/md5-cache/media-video/aegisub-2.1.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=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 virtual/pkgconfig media-gfx/imagemagick || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig media-gfx/imagemagick || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Advanced SSA/ASS subtitle editor
 EAPI=4
 HOMEPAGE=http://www.aegisub.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://rion-overlay.googlecode.com/files/aegisub-2.1.9.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=6998eaa3815ffead44541504eeb082a4
diff --git a/metadata/md5-cache/media-video/aegisub-3.0.2 b/metadata/md5-cache/media-video/aegisub-3.0.2
index bafedec54921..599746df4d98 100644
--- a/metadata/md5-cache/media-video/aegisub-3.0.2
+++ b/metadata/md5-cache/media-video/aegisub-3.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/wxGTK-2.9.3:2.9[X,opengl,debug?] virtual/opengl virtual/glu >=media-libs/libass-0.10.0[fontconfig] virtual/libiconv >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2.3.5:2 alsa? ( >=media-libs/alsa-lib-1.0.16 ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( >=media-sound/pulseaudio-0.9.5 ) openal? ( media-libs/openal ) lua? ( >=dev-lang/lua-5.1.1 ) spell? ( >=app-text/hunspell-1.2.2 ) ffmpeg? ( >=media-libs/ffmpegsource-2.17 ) fftw? ( >=sci-libs/fftw-3.3 ) oss? ( virtual/os-headers ) >=sys-devel/gettext-0.18 dev-util/intltool virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/wxGTK-2.9.3:2.9[X,opengl,debug?] virtual/opengl virtual/glu >=media-libs/libass-0.10.0[fontconfig] virtual/libiconv >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2.3.5:2 alsa? ( >=media-libs/alsa-lib-1.0.16 ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( >=media-sound/pulseaudio-0.9.5 ) openal? ( media-libs/openal ) lua? ( >=dev-lang/lua-5.1.1 ) spell? ( >=app-text/hunspell-1.2.2 ) ffmpeg? ( >=media-libs/ffmpegsource-2.17 ) fftw? ( >=sci-libs/fftw-3.3 ) oss? ( virtual/os-headers ) >=sys-devel/gettext-0.18 dev-util/intltool virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Advanced SSA/ASS subtitle editor
 EAPI=5
 HOMEPAGE=http://www.aegisub.org/
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/wxGTK-2.9.3:2.9[X,opengl,debug?] virtual/opengl virtual/glu >
 REQUIRED_USE=|| ( alsa openal oss portaudio pulseaudio )
 SLOT=0
 SRC_URI=http://ftp.aegisub.org/pub/releases/aegisub-3.0.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=f06f72ce8feccc6e33029bb305e79e37
diff --git a/metadata/md5-cache/media-video/aegisub-9999 b/metadata/md5-cache/media-video/aegisub-9999
index d193b3df5929..48b9bed7afdf 100644
--- a/metadata/md5-cache/media-video/aegisub-9999
+++ b/metadata/md5-cache/media-video/aegisub-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=x11-libs/wxGTK-2.9.3:2.9[X,opengl,debug?] virtual/opengl virtual/glu >=media-libs/libass-0.10.0[fontconfig] virtual/libiconv >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2.3.5:2 alsa? ( >=media-libs/alsa-lib-1.0.16 ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( >=media-sound/pulseaudio-0.9.5 ) openal? ( media-libs/openal ) lua? ( >=dev-lang/lua-5.1.1 ) spell? ( >=app-text/hunspell-1.2.2 ) ffmpeg? ( >=media-libs/ffmpegsource-2.17 ) fftw? ( >=sci-libs/fftw-3.3 ) oss? ( virtual/os-headers ) >=sys-devel/gettext-0.18 dev-util/intltool virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=x11-libs/wxGTK-2.9.3:2.9[X,opengl,debug?] virtual/opengl virtual/glu >=media-libs/libass-0.10.0[fontconfig] virtual/libiconv >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2.3.5:2 alsa? ( >=media-libs/alsa-lib-1.0.16 ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( >=media-sound/pulseaudio-0.9.5 ) openal? ( media-libs/openal ) lua? ( >=dev-lang/lua-5.1.1 ) spell? ( >=app-text/hunspell-1.2.2 ) ffmpeg? ( >=media-libs/ffmpegsource-2.17 ) fftw? ( >=sci-libs/fftw-3.3 ) oss? ( virtual/os-headers ) >=sys-devel/gettext-0.18 dev-util/intltool virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Advanced SSA/ASS subtitle editor
 EAPI=5
 HOMEPAGE=http://www.aegisub.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/wxGTK-2.9.3:2.9[X,opengl,debug?] virtual/opengl virtual/glu >=media-libs/libass-0.10.0[fontconfig] virtual/libiconv >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2.3.5:2 alsa? ( >=media-libs/alsa-lib-1.0.16 ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( >=media-sound/pulseaudio-0.9.5 ) openal? ( media-libs/openal ) lua? ( >=dev-lang/lua-5.1.1 ) spell? ( >=app-text/hunspell-1.2.2 ) ffmpeg? ( >=media-libs/ffmpegsource-2.17 ) fftw? ( >=sci-libs/fftw-3.3 )
 REQUIRED_USE=|| ( alsa openal oss portaudio pulseaudio )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=79288ce280cdbc4796890817350646f0
diff --git a/metadata/md5-cache/media-video/aravis-9999 b/metadata/md5-cache/media-video/aravis-9999
index 192c247132dc..e3e44d31b17f 100644
--- a/metadata/md5-cache/media-video/aravis-9999
+++ b/metadata/md5-cache/media-video/aravis-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=dev-libs/glib-2.22 dev-libs/libxml2 X? ( >=x11-libs/gtk+-2.12:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 media-libs/gst-plugins-base:0.10 media-plugins/gst-plugins-xvideo:0.10 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) virtual/pkgconfig dev-libs/gobject-introspection dev-util/gtk-doc dev-util/intltool dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.22 dev-libs/libxml2 X? ( >=x11-libs/gtk+-2.12:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 media-libs/gst-plugins-base:0.10 media-plugins/gst-plugins-xvideo:0.10 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) virtual/pkgconfig dev-libs/gobject-introspection dev-util/gtk-doc dev-util/intltool dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for video acquisition using Genicam cameras.
 EAPI=4
 HOMEPAGE=http://live.gnome.org/Aravis
@@ -7,5 +7,5 @@ IUSE=X gstreamer
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.22 dev-libs/libxml2 X? ( >=x11-libs/gtk+-2.12:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 media-libs/gst-plugins-base:0.10 media-plugins/gst-plugins-xvideo:0.10 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=733e27c417cca9e40af448e3131f9360
diff --git a/metadata/md5-cache/media-video/bino-1.4.2 b/metadata/md5-cache/media-video/bino-1.4.2
index c65cdb74b2f0..f0dd7c3782c4 100644
--- a/metadata/md5-cache/media-video/bino-1.4.2
+++ b/metadata/md5-cache/media-video/bino-1.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=media-libs/glew-1.6.0 media-libs/openal dev-qt/qtgui:4 dev-qt/qtcore:4 dev-qt/qtopengl:4 >=media-libs/libass-0.9.9 >=virtual/ffmpeg-0.6.90 lirc? ( app-misc/lirc ) video_cards_nvidia? ( media-video/nvidia-settings ) virtual/libintl
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/bino/bino-1.4.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=67358ae551513d0433064024b7c0a68f
diff --git a/metadata/md5-cache/media-video/cinelerra-20111223 b/metadata/md5-cache/media-video/cinelerra-20111223
index a36cde011cc3..6680e2c8b4ec 100644
--- a/metadata/md5-cache/media-video/cinelerra-20111223
+++ b/metadata/md5-cache/media-video/cinelerra-20111223
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 virtual/pkgconfig mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The most advanced non-linear video editor and compositor
 EAPI=4
 HOMEPAGE=http://www.cinelerra.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ssuominen/cinelerra-20111223.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0f196b757826ea41441306e517d07759
diff --git a/metadata/md5-cache/media-video/cinelerra-20120707 b/metadata/md5-cache/media-video/cinelerra-20120707
index 5a764ee60b1a..35a8f9bfb74d 100644
--- a/metadata/md5-cache/media-video/cinelerra-20120707
+++ b/metadata/md5-cache/media-video/cinelerra-20120707
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/a52dec media-libs/faac media-libs/faad2 >=media-libs/freetype-2 media-libs/libdv >=media-libs/libogg-1.2 media-libs/libpng: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 virtual/pkgconfig mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/a52dec media-libs/faac media-libs/faad2 >=media-libs/freetype-2 media-libs/libdv >=media-libs/libogg-1.2 media-libs/libpng: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 virtual/pkgconfig mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The most advanced non-linear video editor and compositor
 EAPI=5
 HOMEPAGE=http://www.cinelerra.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/a52dec media-libs/faac media-libs/faad2 >=media-libs/freetype-2 media-libs/libdv >=media-libs/libogg-1.2 media-libs/libpng: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 )
 SLOT=0
 SRC_URI=mirror://gentoo/cinelerra-20120707.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ec78085ec410aee6c3ef3b8e2f559af8
diff --git a/metadata/md5-cache/media-video/dirac-1.0.2 b/metadata/md5-cache/media-video/dirac-1.0.2
index 270cbfa71628..a552bb4a20f6 100644
--- a/metadata/md5-cache/media-video/dirac-1.0.2
+++ b/metadata/md5-cache/media-video/dirac-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz app-text/dvipdfm ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz app-text/dvipdfm ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open Source video codec
 EAPI=4
 HOMEPAGE=http://dirac.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fb
 LICENSE=MPL-1.1
 SLOT=0
 SRC_URI=mirror://sourceforge/dirac/dirac-1.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d7efd375a0f107565e032edcc3289b56
diff --git a/metadata/md5-cache/media-video/em8300-libraries-0.17.4 b/metadata/md5-cache/media-video/em8300-libraries-0.17.4
index 7b456550a954..5957ab2992ec 100644
--- a/metadata/md5-cache/media-video/em8300-libraries-0.17.4
+++ b/metadata/md5-cache/media-video/em8300-libraries-0.17.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=gtk? ( x11-libs/gtk+:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gtk? ( x11-libs/gtk+:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=em8300 (RealMagic Hollywood+/Creative DXR3) video decoder card libraries
 EAPI=1
 HOMEPAGE=http://dxr3.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) ~media-video/em8300-modules-0.17.4
 SLOT=0
 SRC_URI=mirror://sourceforge/dxr3/em8300-0.17.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=475363cc402fd1ddecb92033271427a3
diff --git a/metadata/md5-cache/media-video/em8300-libraries-0.18.0 b/metadata/md5-cache/media-video/em8300-libraries-0.18.0
index ae1c602f7b3b..6835f54257de 100644
--- a/metadata/md5-cache/media-video/em8300-libraries-0.18.0
+++ b/metadata/md5-cache/media-video/em8300-libraries-0.18.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gtk? ( x11-libs/gtk+:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=em8300 (RealMagic Hollywood+/Creative DXR3) video decoder card libraries
 EAPI=2
 HOMEPAGE=http://dxr3.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) modules? ( ~media-video/em8300-modules-0.18.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dxr3/em8300-0.18.0.tar.gz mirror://gentoo/em8300-gtk-2.0.m4.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=0e9ffd89e82ca0f5360a164e13226667
diff --git a/metadata/md5-cache/media-video/em8300-libraries-0.18.0_p20120124 b/metadata/md5-cache/media-video/em8300-libraries-0.18.0_p20120124
index 917618a1fa57..0a0ac0b6e3fa 100644
--- a/metadata/md5-cache/media-video/em8300-libraries-0.18.0_p20120124
+++ b/metadata/md5-cache/media-video/em8300-libraries-0.18.0_p20120124
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gtk? ( x11-libs/gtk+:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=em8300 (RealMagic Hollywood+/Creative DXR3) video decoder card libraries
 EAPI=2
 HOMEPAGE=http://dxr3.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) modules? ( ~media-video/em8300-modules-0.18.0_p20120124 )
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/em8300-0.18.0_p20120124.tar.gz mirror://gentoo/em8300-gtk-2.0.m4.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=8c90cc43d29465ef0c7f1adbb198a801
diff --git a/metadata/md5-cache/media-video/guvcview-1.6.1 b/metadata/md5-cache/media-video/guvcview-1.6.1
index 0d2127460a12..53cfdc15fc26 100644
--- a/metadata/md5-cache/media-video/guvcview-1.6.1
+++ b/metadata/md5-cache/media-video/guvcview-1.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=dev-libs/glib-2.10 media-libs/libpng:0 >=media-libs/libsdl-1.2.10 media-libs/libv4l >=media-libs/portaudio-19_pre virtual/udev virtual/ffmpeg x11-libs/gtk+:3 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) !<sys-kernel/linux-headers-3.4-r2 dev-util/intltool sys-devel/gettext virtual/os-headers virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.10 media-libs/libpng:0 >=media-libs/libsdl-1.2.10 media-libs/libv4l >=media-libs/portaudio-19_pre virtual/udev virtual/ffmpeg x11-libs/gtk+:3 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) !<sys-kernel/linux-headers-3.4-r2 dev-util/intltool sys-devel/gettext virtual/os-headers virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK+ UVC Viewer
 EAPI=5
 HOMEPAGE=http://guvcview.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.10 media-libs/libpng:0 >=media-libs/libsdl-1.2.10 media-libs/libv4l >=media-libs/portaudio-19_pre virtual/udev virtual/ffmpeg x11-libs/gtk+:3 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) !<sys-kernel/linux-headers-3.4-r2
 SLOT=0
 SRC_URI=mirror://sourceforge/guvcview/guvcview-src-1.6.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=c8d016b5d87b02ec6bf706589e5f3c55
diff --git a/metadata/md5-cache/media-video/gxine-0.5.907 b/metadata/md5-cache/media-video/gxine-0.5.907
index feae2f05fb04..97ece0c6d2f4 100644
--- a/metadata/md5-cache/media-video/gxine-0.5.907
+++ b/metadata/md5-cache/media-video/gxine-0.5.907
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=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? ( virtual/udev[gudev] ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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? ( virtual/udev[gudev] ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=GTK+ Front-End for libxine
 EAPI=5
 HOMEPAGE=http://xine.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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? ( virtual/udev[gudev] ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) gnome-screensaver? ( gnome-extra/gnome-screensaver )
 SLOT=0
 SRC_URI=mirror://sourceforge/xine/gxine-0.5.907.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=25c4506789de5521712db4fc4aa637dc
diff --git a/metadata/md5-cache/media-video/imagination-3.0 b/metadata/md5-cache/media-video/imagination-3.0
index d29efd590f4d..c1384a2c82f8 100644
--- a/metadata/md5-cache/media-video/imagination-3.0
+++ b/metadata/md5-cache/media-video/imagination-3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/gtk+:2 media-sound/sox || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 media-sound/sox || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple DVD slideshow maker
 EAPI=4
 HOMEPAGE=http://imagination.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 media-sound/sox virtual/ffmpeg
 SLOT=0
 SRC_URI=mirror://sourceforge/imagination/imagination/3.0/imagination-3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=27b850250a51955d17d0967ee92ff4dd
diff --git a/metadata/md5-cache/media-video/imagination-3.0-r1 b/metadata/md5-cache/media-video/imagination-3.0-r1
index 38de925802f7..180be5374efe 100644
--- a/metadata/md5-cache/media-video/imagination-3.0-r1
+++ b/metadata/md5-cache/media-video/imagination-3.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/gtk+:2 media-sound/sox || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 media-sound/sox || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple DVD slideshow maker
 EAPI=4
 HOMEPAGE=http://imagination.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 media-sound/sox virtual/ffmpeg
 SLOT=0
 SRC_URI=mirror://sourceforge/imagination/imagination/3.0/imagination-3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=74aea1b17a58167fad0ec51a94e03ad8
diff --git a/metadata/md5-cache/media-video/istanbul-0.2.2 b/metadata/md5-cache/media-video/istanbul-0.2.2
index f7eba1b7dbde..adba5a77dd16 100644
--- a/metadata/md5-cache/media-video/istanbul-0.2.2
+++ b/metadata/md5-cache/media-video/istanbul-0.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-python/pygtk-2.6 dev-python/gst-python:0.10 dev-python/python-xlib >=dev-python/egg-python-2.11.3 >=dev-python/gnome-vfs-python-2 >=dev-python/gconf-python-2 >=gnome-base/gconf-2 >=media-libs/libtheora-1.0_alpha6[encode] >=media-libs/gst-plugins-base-0.10.8:0.10 media-plugins/gst-plugins-gconf:0.10 media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-libpng:0.10 media-plugins/gst-plugins-theora:0.10 media-plugins/gst-plugins-vorbis:0.10 >=dev-util/intltool-0.35.0 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-python/pygtk-2.6 dev-python/gst-python:0.10 dev-python/python-xlib >=dev-python/egg-python-2.11.3 >=dev-python/gnome-vfs-python-2 >=dev-python/gconf-python-2 >=gnome-base/gconf-2 >=media-libs/libtheora-1.0_alpha6[encode] >=media-libs/gst-plugins-base-0.10.8:0.10 media-plugins/gst-plugins-gconf:0.10 media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-libpng:0.10 media-plugins/gst-plugins-theora:0.10 media-plugins/gst-plugins-vorbis:0.10 >=dev-util/intltool-0.35.0 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Istanbul is a screencast application for the Unix desktop
 EAPI=5
 HOMEPAGE=http://live.gnome.org/Istanbul
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-python/pygtk-2.6 dev-python/gst-python:0.10 dev-python/python-xlib >=dev-python/egg-python-2.11.3 >=dev-python/gnome-vfs-python-2 >=dev-python/gconf-python-2 >=gnome-base/gconf-2 >=media-libs/libtheora-1.0_alpha6[encode] >=media-libs/gst-plugins-base-0.10.8:0.10 media-plugins/gst-plugins-gconf:0.10 media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-libpng:0.10 media-plugins/gst-plugins-theora:0.10 media-plugins/gst-plugins-vorbis:0.10 =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://zaheer.merali.org/istanbul-0.2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=47218db2f7466cf0bd43063b87a39b1d
diff --git a/metadata/md5-cache/media-video/istanbul-0.2.2.1_pre20120909 b/metadata/md5-cache/media-video/istanbul-0.2.2.1_pre20120909
index 52905480cd23..d5fe9e1b1776 100644
--- a/metadata/md5-cache/media-video/istanbul-0.2.2.1_pre20120909
+++ b/metadata/md5-cache/media-video/istanbul-0.2.2.1_pre20120909
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-python/pygtk-2.6 dev-python/gst-python:0.10 dev-python/python-xlib >=dev-python/egg-python-2.11.3 >=dev-python/gnome-vfs-python-2 >=dev-python/gconf-python-2 >=gnome-base/gconf-2 >=media-libs/libtheora-1.0_alpha6[encode] >=media-libs/gst-plugins-base-0.10.8:0.10 media-plugins/gst-plugins-gconf:0.10 media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-libpng:0.10 media-plugins/gst-plugins-theora:0.10 media-plugins/gst-plugins-vorbis:0.10 >=dev-util/intltool-0.35.0 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-python/pygtk-2.6 dev-python/gst-python:0.10 dev-python/python-xlib >=dev-python/egg-python-2.11.3 >=dev-python/gnome-vfs-python-2 >=dev-python/gconf-python-2 >=gnome-base/gconf-2 >=media-libs/libtheora-1.0_alpha6[encode] >=media-libs/gst-plugins-base-0.10.8:0.10 media-plugins/gst-plugins-gconf:0.10 media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-libpng:0.10 media-plugins/gst-plugins-theora:0.10 media-plugins/gst-plugins-vorbis:0.10 >=dev-util/intltool-0.35.0 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Istanbul is a screencast application for the Unix desktop
 EAPI=5
 HOMEPAGE=http://live.gnome.org/Istanbul
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-python/pygtk-2.6 dev-python/gst-python:0.10 dev-python/python-xlib >=dev-python/egg-python-2.11.3 >=dev-python/gnome-vfs-python-2 >=dev-python/gconf-python-2 >=gnome-base/gconf-2 >=media-libs/libtheora-1.0_alpha6[encode] >=media-libs/gst-plugins-base-0.10.8:0.10 media-plugins/gst-plugins-gconf:0.10 media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-libpng:0.10 media-plugins/gst-plugins-theora:0.10 media-plugins/gst-plugins-vorbis:0.10 =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~tetromino/distfiles/istanbul/istanbul-0.2.2.1_pre20120909.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1501c3315793cca418033dd84c16b08c
diff --git a/metadata/md5-cache/media-video/libav-9.4 b/metadata/md5-cache/media-video/libav-9.5
similarity index 97%
rename from metadata/md5-cache/media-video/libav-9.4
rename to metadata/md5-cache/media-video/libav-9.5
index fb923525dbe9..3f0477ce6f82 100644
--- a/metadata/md5-cache/media-video/libav-9.4
+++ b/metadata/md5-cache/media-video/libav-9.5
@@ -9,6 +9,6 @@ LICENSE=LGPL-2.1 gpl? ( GPL-3 )
 RDEPEND=!media-video/ffmpeg alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) encode? ( aac? ( media-libs/vo-aacenc ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) fdk? ( media-libs/fdk-aac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) ssl? ( openssl? ( dev-libs/openssl ) !openssl? ( net-libs/gnutls ) ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( x11-libs/libva ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=bindist? ( !faac !openssl !fdk ) rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) test? ( encode zlib )
 SLOT=0/9
-SRC_URI=http://libav.org/releases/libav-9.4.tar.xz test? ( http://dev.gentoo.org/~lu_zero/libav/fate-9.tar.xz )
+SRC_URI=http://libav.org/releases/libav-9.5.tar.xz test? ( http://dev.gentoo.org/~lu_zero/libav/fate-9.tar.xz )
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=dc3495e0343a5bf48faa907681013412
+_md5_=f232dec8497606d3a7e42e7896e47f8f
diff --git a/metadata/md5-cache/media-video/lives-1.4.6 b/metadata/md5-cache/media-video/lives-1.4.6
index b0664b858fc2..1e38c4317ade 100644
--- a/metadata/md5-cache/media-video/lives-1.4.6
+++ b/metadata/md5-cache/media-video/lives-1.4.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LiVES is a Video Editing System
 EAPI=4
 HOMEPAGE=http://lives.sf.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://www.xs4all.nl/~salsaman/lives/current/LiVES-1.4.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=94d38dedb590f624892d33aa6b806b8f
diff --git a/metadata/md5-cache/media-video/lsdvd-0.16-r1 b/metadata/md5-cache/media-video/lsdvd-0.16-r1
index 3371ec5254af..8b2706efa922 100644
--- a/metadata/md5-cache/media-video/lsdvd-0.16-r1
+++ b/metadata/md5-cache/media-video/lsdvd-0.16-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=media-libs/libdvdread || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libdvdread || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utility for getting info out of DVDs
 HOMEPAGE=http://untrepid.com/lsdvd/
 KEYWORDS=~alpha amd64 ia64 ppc ppc64 sparc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libdvdread
 SLOT=0
 SRC_URI=mirror://gentoo/lsdvd-0.16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b39ab506f2275e9d5ab6c6116a8e7a3d
diff --git a/metadata/md5-cache/media-video/lsdvd-0.16-r2 b/metadata/md5-cache/media-video/lsdvd-0.16-r2
index e855f6fdcb1f..2a70fdaf0dde 100644
--- a/metadata/md5-cache/media-video/lsdvd-0.16-r2
+++ b/metadata/md5-cache/media-video/lsdvd-0.16-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=media-libs/libdvdread || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libdvdread || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utility for getting info out of DVDs
 EAPI=2
 HOMEPAGE=http://untrepid.com/lsdvd/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libdvdread
 SLOT=0
 SRC_URI=mirror://gentoo/lsdvd-0.16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a7f98fc653c68ace748a896d9d46d063
diff --git a/metadata/md5-cache/media-video/mediainfo-0.7.61 b/metadata/md5-cache/media-video/mediainfo-0.7.61
index eb07b30ff370..80b5f159cb48 100644
--- a/metadata/md5-cache/media-video/mediainfo-0.7.61
+++ b/metadata/md5-cache/media-video/mediainfo-0.7.61
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.61[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:2.8[X] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.61[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:2.8[X] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MediaInfo supplies technical and tag information about media files
 EAPI=4
 HOMEPAGE=http://mediainfo.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.61[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:2.8[X] )
 SLOT=0
 SRC_URI=mirror://sourceforge/mediainfo/source/mediainfo/0.7.61/mediainfo_0.7.61.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=1220822390274147a5ff5607870990fb
diff --git a/metadata/md5-cache/media-video/mediainfo-0.7.62 b/metadata/md5-cache/media-video/mediainfo-0.7.62
index 0cf6713a1791..4e5840464768 100644
--- a/metadata/md5-cache/media-video/mediainfo-0.7.62
+++ b/metadata/md5-cache/media-video/mediainfo-0.7.62
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.62[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:2.8[X] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.62[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:2.8[X] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MediaInfo supplies technical and tag information about media files
 EAPI=5
 HOMEPAGE=http://mediainfo.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.62[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:2.8[X] )
 SLOT=0
 SRC_URI=mirror://sourceforge/mediainfo/source/mediainfo/0.7.62/mediainfo_0.7.62.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=252533f4b60b9bac5a9c2682b4dcaca4
diff --git a/metadata/md5-cache/media-video/mjpegtools-2.0.0-r3 b/metadata/md5-cache/media-video/mjpegtools-2.0.0-r3
index 0ea5cb87f323..ff8ea9b786aa 100644
--- a/metadata/md5-cache/media-video/mjpegtools-2.0.0-r3
+++ b/metadata/md5-cache/media-video/mjpegtools-2.0.0-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=virtual/jpeg quicktime? ( media-libs/libquicktime ) dv? ( >=media-libs/libdv-0.99 ) png? ( media-libs/libpng:0= ) 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 virtual/awk virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/jpeg quicktime? ( media-libs/libquicktime ) dv? ( >=media-libs/libdv-0.99 ) png? ( media-libs/libpng:0= ) 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 virtual/awk virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tools for MJPEG video
 EAPI=5
 HOMEPAGE=http://mjpeg.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=virtual/jpeg quicktime? ( media-libs/libquicktime ) dv? ( >=media-libs/l
 REQUIRED_USE=sdlgfx? ( sdl )
 SLOT=1
 SRC_URI=mirror://sourceforge/mjpeg/mjpegtools-2.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5629ef0873ee8ef41b5df1e27d56121b
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-5.0.1-r1 b/metadata/md5-cache/media-video/mkvtoolnix-5.0.1-r1
index 22a00281c253..051bcde108d3 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-5.0.1-r1
+++ b/metadata/md5-cache/media-video/mkvtoolnix-5.0.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tools to create, alter, and inspect Matroska files
 EAPI=4
 HOMEPAGE=http://www.bunkus.org/videotools/mkvtoolnix
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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] )
 SLOT=0
 SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-5.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=cbc7f47fb161c4b9967301d5928923a1
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-5.8.0 b/metadata/md5-cache/media-video/mkvtoolnix-5.8.0
index 56b8e3914df7..a02101be0c0d 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-5.8.0
+++ b/metadata/md5-cache/media-video/mkvtoolnix-5.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=dev-libs/libebml-1.2.2 >=media-libs/libmatroska-1.3.0 >=dev-libs/boost-1.46.0 dev-libs/pugixml media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file >=sys-devel/gcc-4.6 sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) dev-lang/ruby virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libebml-1.2.2 >=media-libs/libmatroska-1.3.0 >=dev-libs/boost-1.46.0 dev-libs/pugixml media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file >=sys-devel/gcc-4.6 sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) dev-lang/ruby virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tools to create, alter, and inspect Matroska files
 EAPI=4
 HOMEPAGE=http://www.bunkus.org/videotools/mkvtoolnix
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libebml-1.2.2 >=media-libs/libmatroska-1.3.0 >=dev-libs/boost-1.46.0 dev-libs/pugixml media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file >=sys-devel/gcc-4.6 sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X] )
 SLOT=0
 SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-5.8.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=a1c55f2f306b0b25d803ec2e1e94d239
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-5.9.0 b/metadata/md5-cache/media-video/mkvtoolnix-5.9.0
index 40f53e7bf2c1..6e9f0915e153 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-5.9.0
+++ b/metadata/md5-cache/media-video/mkvtoolnix-5.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend
-DEPEND=>=dev-libs/libebml-1.2.2 >=media-libs/libmatroska-1.3.0 >=dev-libs/boost-1.46.0 dev-libs/pugixml media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file >=sys-devel/gcc-4.6 sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) dev-lang/ruby virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libebml-1.2.2 >=media-libs/libmatroska-1.3.0 >=dev-libs/boost-1.46.0 dev-libs/pugixml media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file >=sys-devel/gcc-4.6 sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) dev-lang/ruby virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tools to create, alter, and inspect Matroska files
 EAPI=5
 HOMEPAGE=http://www.bunkus.org/videotools/mkvtoolnix
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libebml-1.2.2 >=media-libs/libmatroska-1.3.0 >=dev-libs/boost-1.46.0 dev-libs/pugixml media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file >=sys-devel/gcc-4.6 sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X] )
 SLOT=0
 SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-5.9.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=21765d666be9d2b270e26d22a6d7a1e2
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-6.0.0 b/metadata/md5-cache/media-video/mkvtoolnix-6.0.0
index 8b4b95c711ca..a8f061c59572 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-6.0.0
+++ b/metadata/md5-cache/media-video/mkvtoolnix-6.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend
-DEPEND=>=dev-libs/libebml-1.2.2 >=media-libs/libmatroska-1.3.0 >=dev-libs/boost-1.46.0 dev-libs/pugixml media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file >=sys-devel/gcc-4.6 sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) dev-lang/ruby virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libebml-1.2.2 >=media-libs/libmatroska-1.3.0 >=dev-libs/boost-1.46.0 dev-libs/pugixml media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file >=sys-devel/gcc-4.6 sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) dev-lang/ruby virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tools to create, alter, and inspect Matroska files
 EAPI=5
 HOMEPAGE=http://www.bunkus.org/videotools/mkvtoolnix
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libebml-1.2.2 >=media-libs/libmatroska-1.3.0 >=dev-libs/boost-1.46.0 dev-libs/pugixml media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file >=sys-devel/gcc-4.6 sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X] )
 SLOT=0
 SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-6.0.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=f64ded967d7986e996184833d6a1474a
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-6.1.0 b/metadata/md5-cache/media-video/mkvtoolnix-6.1.0
index 9c15ad01b27f..3ece3298511f 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-6.1.0
+++ b/metadata/md5-cache/media-video/mkvtoolnix-6.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend
-DEPEND=>=dev-libs/libebml-1.2.2 >=media-libs/libmatroska-1.3.0 >=dev-libs/boost-1.46.0 dev-libs/pugixml media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file >=sys-devel/gcc-4.6 sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) dev-lang/ruby virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libebml-1.2.2 >=media-libs/libmatroska-1.3.0 >=dev-libs/boost-1.46.0 dev-libs/pugixml media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file >=sys-devel/gcc-4.6 sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) dev-lang/ruby virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tools to create, alter, and inspect Matroska files
 EAPI=5
 HOMEPAGE=http://www.bunkus.org/videotools/mkvtoolnix
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libebml-1.2.2 >=media-libs/libmatroska-1.3.0 >=dev-libs/boost-1.46.0 dev-libs/pugixml media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file >=sys-devel/gcc-4.6 sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X] )
 SLOT=0
 SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-6.1.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=ea8d5574e5102e25ab718bb58abdc857
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-6.1.0-r1 b/metadata/md5-cache/media-video/mkvtoolnix-6.1.0-r1
index e6c18afa12d7..d0f3ab3ff806 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-6.1.0-r1
+++ b/metadata/md5-cache/media-video/mkvtoolnix-6.1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend
-DEPEND=>=dev-libs/libebml-1.3.0:= >=media-libs/libmatroska-1.4.0:= >=dev-libs/boost-1.46.0 dev-libs/pugixml media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file >=sys-devel/gcc-4.6 sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) dev-lang/ruby virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libebml-1.3.0:= >=media-libs/libmatroska-1.4.0:= >=dev-libs/boost-1.46.0 dev-libs/pugixml media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file >=sys-devel/gcc-4.6 sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) dev-lang/ruby virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tools to create, alter, and inspect Matroska files
 EAPI=5
 HOMEPAGE=http://www.bunkus.org/videotools/mkvtoolnix
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libebml-1.3.0:= >=media-libs/libmatroska-1.4.0:= >=dev-libs/boost-1.46.0 dev-libs/pugixml media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file >=sys-devel/gcc-4.6 sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X] )
 SLOT=0
 SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-6.1.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=27e0acdcf9ab07ac5f611da2f0ebbfaa
diff --git a/metadata/md5-cache/media-video/noad-0.7.3 b/metadata/md5-cache/media-video/noad-0.7.3
index 58e28cc8c6b1..3545d75a0cdc 100644
--- a/metadata/md5-cache/media-video/noad-0.7.3
+++ b/metadata/md5-cache/media-video/noad-0.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Mark commercial Breaks in VDR records
 EAPI=4
 HOMEPAGE=http://noad.heliohost.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libmpeg2 ffmpeg? ( >=virtual/ffmpeg-0.4.8 ) imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 ) !media-plugins/vdr-markad
 SLOT=0
 SRC_URI=http://noad.heliohost.org/noad-0.7.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5fdb7525c2b95650e49fd275c936d9c1
diff --git a/metadata/md5-cache/media-video/noad-0.7.3-r1 b/metadata/md5-cache/media-video/noad-0.7.3-r1
index 8e0c1d57e3e7..92431f6e412a 100644
--- a/metadata/md5-cache/media-video/noad-0.7.3-r1
+++ b/metadata/md5-cache/media-video/noad-0.7.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=media-libs/libmpeg2:= ffmpeg? ( virtual/ffmpeg ) imagemagick? ( media-gfx/imagemagick:= ) !media-plugins/vdr-markad || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libmpeg2:= ffmpeg? ( virtual/ffmpeg ) imagemagick? ( media-gfx/imagemagick:= ) !media-plugins/vdr-markad || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Mark commercial Breaks in VDR records
 EAPI=5
 HOMEPAGE=http://noad.heliohost.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libmpeg2:= ffmpeg? ( virtual/ffmpeg ) imagemagick? ( media-gfx/imagemagick:= ) !media-plugins/vdr-markad
 SLOT=0
 SRC_URI=http://noad.heliohost.org/noad-0.7.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=82875ee354d145093399b5befa810f4d
diff --git a/metadata/md5-cache/media-video/ogmrip-0.13.6 b/metadata/md5-cache/media-video/ogmrip-0.13.6
index b9c5a5287ef9..81d95e542d35 100644
--- a/metadata/md5-cache/media-video/ogmrip-0.13.6
+++ b/metadata/md5-cache/media-video/ogmrip-0.13.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4
 EAPI=2
 HOMEPAGE=http://ogmrip.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://sourceforge/ogmrip/ogmrip-0.13.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9d3a24e99adf594fd2dbbe695cf2a3d9
diff --git a/metadata/md5-cache/media-video/ogmrip-0.13.7 b/metadata/md5-cache/media-video/ogmrip-0.13.7
index d8f8b0d3d4bb..8c645b318285 100644
--- a/metadata/md5-cache/media-video/ogmrip-0.13.7
+++ b/metadata/md5-cache/media-video/ogmrip-0.13.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4
 EAPI=4
 HOMEPAGE=http://ogmrip.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://sourceforge/ogmrip/ogmrip-0.13.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b43798f87dc8b8264a29e27cb2408812
diff --git a/metadata/md5-cache/media-video/oxine-0.7.1-r1 b/metadata/md5-cache/media-video/oxine-0.7.1-r1
index 416a9c2ada79..074eb3d53b81 100644
--- a/metadata/md5-cache/media-video/oxine-0.7.1-r1
+++ b/metadata/md5-cache/media-video/oxine-0.7.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/xine-lib dev-libs/libcdio curl? ( net-misc/curl ) joystick? ( media-libs/libjsw ) jpeg? ( media-gfx/imagemagick media-libs/netpbm media-video/mjpegtools ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl sys-devel/gettext ) png? ( media-gfx/imagemagick media-libs/netpbm media-video/mjpegtools ) X? ( x11-libs/libXext x11-libs/libX11 ) virtual/eject
 SLOT=0
 SRC_URI=mirror://sourceforge/oxine/oxine-0.7.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4519e15404b005e1112033272bb8fb4a
diff --git a/metadata/md5-cache/media-video/parole-0.3.0.3 b/metadata/md5-cache/media-video/parole-0.3.0.3
index 42fda393991b..3e67b9e50d56 100644
--- a/metadata/md5-cache/media-video/parole-0.3.0.3
+++ b/metadata/md5-cache/media-video/parole-0.3.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.20:2 >=dev-libs/glib-2.24 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=dev-libs/dbus-glib-0.100 >=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
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/parole/0.3/parole-0.3.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=d99ea24c2d715dbcca814984ab8e1210
diff --git a/metadata/md5-cache/media-video/parole-0.4.0 b/metadata/md5-cache/media-video/parole-0.4.0
index 206d1e6c981f..6cfb6a884d12 100644
--- a/metadata/md5-cache/media-video/parole-0.4.0
+++ b/metadata/md5-cache/media-video/parole-0.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32 >=media-libs/gstreamer-0.10.30:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libnotify? ( >=x11-libs/libnotify-0.7 ) taglib? ( >=media-libs/taglib-1.4 ) media-plugins/gst-plugins-meta:0.10
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/parole/0.4/parole-0.4.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=8efbc90f9de3a16781aa6294450cdd23
diff --git a/metadata/md5-cache/media-video/parole-0.5.0 b/metadata/md5-cache/media-video/parole-0.5.0
index e1c06ae822a9..1982b8577bb9 100644
--- a/metadata/md5-cache/media-video/parole-0.5.0
+++ b/metadata/md5-cache/media-video/parole-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libnotify? ( >=x11-libs/libnotify-0.7 ) taglib? ( >=media-libs/taglib-1.4 ) media-plugins/gst-plugins-meta:1.0
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/parole/0.5/parole-0.5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=f1279412d7a120692f4901b7fba9a23f
diff --git a/metadata/md5-cache/media-video/qt-recordmydesktop-0.3.8-r2 b/metadata/md5-cache/media-video/qt-recordmydesktop-0.3.8-r2
index ae11ebd613ed..32bd6819d655 100644
--- a/metadata/md5-cache/media-video/qt-recordmydesktop-0.3.8-r2
+++ b/metadata/md5-cache/media-video/qt-recordmydesktop-0.3.8-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=>=media-video/recordmydesktop-0.3.8 x11-apps/xwininfo >=dev-python/PyQt4-4.1[X] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=>=media-video/recordmydesktop-0.3.8 x11-apps/xwininfo >=dev-python/PyQt4-4.1[X] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=Qt4 interface for RecordMyDesktop
 EAPI=4
 HOMEPAGE=http://recordmydesktop.sourceforge.net/
@@ -9,5 +9,5 @@ RDEPEND=>=media-video/recordmydesktop-0.3.8 x11-apps/xwininfo || ( =dev-lang/pyt
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/recordmydesktop/qt-recordmydesktop-0.3.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=838a5e3071da9bcdc486e46912f66f5e
diff --git a/metadata/md5-cache/media-video/recordmydesktop-0.3.8.1-r4 b/metadata/md5-cache/media-video/recordmydesktop-0.3.8.1-r4
index 193ee8b0b7ad..5d4354f38ec4 100644
--- a/metadata/md5-cache/media-video/recordmydesktop-0.3.8.1-r4
+++ b/metadata/md5-cache/media-video/recordmydesktop-0.3.8.1-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A desktop session recorder producing Ogg video/audio files
 EAPI=2
 HOMEPAGE=http://recordmydesktop.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/recordmydesktop/recordmydesktop-0.3.8.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cb860c1ae22668315ee8841ef46a1046
diff --git a/metadata/md5-cache/media-video/snappy-9999 b/metadata/md5-cache/media-video/snappy-9999
index 00ebecb23f51..1522b6b4efe1 100644
--- a/metadata/md5-cache/media-video/snappy-9999
+++ b/metadata/md5-cache/media-video/snappy-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=A simple media player written using GStreamer and Clutter
 EAPI=4
 HOMEPAGE=https://github.com/luisbg/snappy
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=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
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=6cbc02302b54d3510f7ae94fc1b64309
diff --git a/metadata/md5-cache/media-video/totem-2.32.0-r2 b/metadata/md5-cache/media-video/totem-2.32.0-r2
index b1a780be6ec0..4fac0ab9bc20 100644
--- a/metadata/md5-cache/media-video/totem-2.32.0-r2
+++ b/metadata/md5-cache/media-video/totem-2.32.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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-av? ( 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/gtk-doc-am-1.11 >=dev-util/intltool-0.40 virtual/pkgconfig app-text/docbook-xml-dtd:4.5 gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] )
+DEPEND=>=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-av? ( 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/gtk-doc-am-1.11 >=dev-util/intltool-0.40 virtual/pkgconfig app-text/docbook-xml-dtd:4.5 gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] )
 DESCRIPTION=Media player for GNOME
 EAPI=3
 HOMEPAGE=http://projects.gnome.org/totem/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=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-av? ( 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] )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=68f934e7c9e9cc513cb44674f8f11320
diff --git a/metadata/md5-cache/media-video/vlc-2.0.3 b/metadata/md5-cache/media-video/vlc-2.0.3
index b7899ad0269b..44b21adc2ba3 100644
--- a/metadata/md5-cache/media-video/vlc-2.0.3
+++ b/metadata/md5-cache/media-video/vlc-2.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=>=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.2.1 ) 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? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore: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 x11-libs/libXinerama ) 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? ( virtual/udev ) 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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.2.1 ) 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? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore: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 x11-libs/libXinerama ) 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? ( virtual/udev ) 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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=VLC media player - Video player and streamer
 EAPI=4
 HOMEPAGE=http://www.videolan.org/vlc/
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) ffmpeg? ( avcodec avformat swscale postproc ) fontconfig? ( truetype ) gnutls? ( gcrypt ) httpd? ( lua ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xosd? ( X ) xv? ( xcb )
 SLOT=0
 SRC_URI=http://download.videolan.org/pub/videolan/vlc/2.0.3/vlc-2.0.3.tar.xz mirror://gentoo/vlc-patches-101.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=905fc5a2477f60f64c9065fa6817e94c
diff --git a/metadata/md5-cache/media-video/vlc-2.0.5 b/metadata/md5-cache/media-video/vlc-2.0.5
index 04461c18a4ad..6ff4a456fafb 100644
--- a/metadata/md5-cache/media-video/vlc-2.0.5
+++ b/metadata/md5-cache/media-video/vlc-2.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=>=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.2.1 ) 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-5.9-r2[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) opus? ( media-libs/opus ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore: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 x11-libs/libXinerama ) 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? ( virtual/udev ) 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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.2.1 ) 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-5.9-r2[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) opus? ( media-libs/opus ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore: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 x11-libs/libXinerama ) 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? ( virtual/udev ) 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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=VLC media player - Video player and streamer
 EAPI=4
 HOMEPAGE=http://www.videolan.org/vlc/
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) ffmpeg? ( avcodec avformat swscale postproc ) fontconfig? ( truetype ) gnutls? ( gcrypt ) httpd? ( lua ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xosd? ( X ) xv? ( xcb )
 SLOT=0
 SRC_URI=http://download.videolan.org/pub/videolan/vlc/2.0.5/vlc-2.0.5.tar.xz mirror://gentoo/vlc-patches-101.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dc17db7d12a487bd77967a1fedf4e6c4
diff --git a/metadata/md5-cache/media-video/vlc-2.0.6 b/metadata/md5-cache/media-video/vlc-2.0.6
index db40fa35f21d..ac7f74367680 100644
--- a/metadata/md5-cache/media-video/vlc-2.0.6
+++ b/metadata/md5-cache/media-video/vlc-2.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=>=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.2.1 ) 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-5.9-r2[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) opus? ( media-libs/opus ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore: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 x11-libs/libXinerama ) 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? ( virtual/udev ) 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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.2.1 ) 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-5.9-r2[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) opus? ( media-libs/opus ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore: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 x11-libs/libXinerama ) 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? ( virtual/udev ) 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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=VLC media player - Video player and streamer
 EAPI=4
 HOMEPAGE=http://www.videolan.org/vlc/
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) ffmpeg? ( avcodec avformat swscale postproc ) fontconfig? ( truetype ) gnutls? ( gcrypt ) httpd? ( lua ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xosd? ( X ) xv? ( xcb )
 SLOT=0
 SRC_URI=http://download.videolan.org/pub/videolan/vlc/2.0.6/vlc-2.0.6.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dcaaf5c23337fd54e3ed174858d89b63
diff --git a/metadata/md5-cache/media-video/vlc-2.0.9999 b/metadata/md5-cache/media-video/vlc-2.0.9999
index 2eecff3b69a2..67969be27051 100644
--- a/metadata/md5-cache/media-video/vlc-2.0.9999
+++ b/metadata/md5-cache/media-video/vlc-2.0.9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=>=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.2.1 ) 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? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore: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 x11-libs/libXinerama ) 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? ( virtual/udev ) 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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=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.2.1 ) 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? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore: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 x11-libs/libXinerama ) 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? ( virtual/udev ) 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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=VLC media player - Video player and streamer
 EAPI=4
 HOMEPAGE=http://www.videolan.org/vlc/
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=>=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.2.1 ) 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? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore: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 x11-libs/libXinerama ) 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? ( virtual/udev ) 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 )
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) ffmpeg? ( avcodec avformat swscale postproc ) fontconfig? ( truetype ) gnutls? ( gcrypt ) httpd? ( lua ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xosd? ( X ) xv? ( xcb )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=31e4014604ecde13fa6099b2a85a4e20
diff --git a/metadata/md5-cache/media-video/vlc-9999 b/metadata/md5-cache/media-video/vlc-9999
index 96c07ea68e21..a6b78f35a467 100644
--- a/metadata/md5-cache/media-video/vlc-9999
+++ b/metadata/md5-cache/media-video/vlc-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=>=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.2.1 ) 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? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm media-fonts/dejavu ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore: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 x11-libs/libXinerama ) speex? ( media-libs/speex ) 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? ( virtual/udev ) 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 ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=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.2.1 ) 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? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm media-fonts/dejavu ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore: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 x11-libs/libXinerama ) speex? ( media-libs/speex ) 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? ( virtual/udev ) 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 ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=VLC media player - Video player and streamer
 EAPI=4
 HOMEPAGE=http://www.videolan.org/vlc/
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=>=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.2.1 ) 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? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm media-fonts/dejavu ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore: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 x11-libs/libXinerama ) speex? ( media-libs/speex ) 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? ( virtual/udev ) 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 ) zvbi? ( >=media-libs/zvbi-0.2.25 )
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) ffmpeg? ( avcodec avformat swscale postproc ) fontconfig? ( truetype ) gnutls? ( gcrypt ) httpd? ( lua ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) vaapi? ( avcodec X ) vlm? ( encode ) xv? ( xcb )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2d6cfdd6481a9758b3aa1ef0350b7a2f
diff --git a/metadata/md5-cache/media-video/xvattr-1.3-r2 b/metadata/md5-cache/media-video/xvattr-1.3-r2
index 827c435c1e64..04e82b50fce9 100644
--- a/metadata/md5-cache/media-video/xvattr-1.3-r2
+++ b/metadata/md5-cache/media-video/xvattr-1.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libX11 x11-libs/libXv x11-libs/libXext gtk? ( x11-libs/gtk+:2 ) x11-libs/libXt virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 x11-libs/libXv x11-libs/libXext gtk? ( x11-libs/gtk+:2 ) x11-libs/libXt virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=X11 XVideo Querying/Setting Tool from Ogle project
 EAPI=1
 HOMEPAGE=http://www.dtek.chalmers.se/groups/dvd
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXv x11-libs/libXext gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=http://www.dtek.chalmers.se/groups/dvd/dist/xvattr-1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a478d7bff6dba1edba13b5b6db7c51fc
diff --git a/metadata/md5-cache/net-analyzer/argus-3.0.6.1 b/metadata/md5-cache/net-analyzer/argus-3.0.6.1
index 3bbe83ee2827..607a80cfb7a0 100644
--- a/metadata/md5-cache/net-analyzer/argus-3.0.6.1
+++ b/metadata/md5-cache/net-analyzer/argus-3.0.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=net-libs/libpcap sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-libs/libpcap sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=network Audit Record Generation and Utilization System
 EAPI=4
 HOMEPAGE=http://www.qosient.com/argus/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=net-libs/libpcap sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 SLOT=0
 SRC_URI=http://qosient.com/argus/dev/argus-3.0.6.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=06e7c6c7a88cf7d2492c0663cc1a7fbd
diff --git a/metadata/md5-cache/net-analyzer/argus-3.0.7.1 b/metadata/md5-cache/net-analyzer/argus-3.0.7.1
index 851c0e15415f..8a5083f5e57c 100644
--- a/metadata/md5-cache/net-analyzer/argus-3.0.7.1
+++ b/metadata/md5-cache/net-analyzer/argus-3.0.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=net-libs/libpcap sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-libs/libpcap sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=network Audit Record Generation and Utilization System
 EAPI=4
 HOMEPAGE=http://www.qosient.com/argus/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=net-libs/libpcap sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 SLOT=0
 SRC_URI=http://qosient.com/argus/dev/argus-3.0.7.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=099519b1e9902eb8329c8f69434fb899
diff --git a/metadata/md5-cache/net-analyzer/argus-3.0.7.2 b/metadata/md5-cache/net-analyzer/argus-3.0.7.2
index 64fed70a38b6..fff2eb3c24a0 100644
--- a/metadata/md5-cache/net-analyzer/argus-3.0.7.2
+++ b/metadata/md5-cache/net-analyzer/argus-3.0.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=net-libs/libpcap sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-libs/libpcap sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=network Audit Record Generation and Utilization System
 EAPI=4
 HOMEPAGE=http://www.qosient.com/argus/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=net-libs/libpcap sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 SLOT=0
 SRC_URI=http://qosient.com/argus/dev/argus-3.0.7.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bd5fc0701abdee357293cc740864b084
diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.6.2 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.6.2
index dea5efc55b01..cf20ebf77666 100644
--- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.6.2
+++ b/metadata/md5-cache/net-analyzer/argus-clients-3.0.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses sys-libs/readline ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses sys-libs/readline ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Clients for net-analyzer/argus
 EAPI=4
 HOMEPAGE=http://www.qosient.com/argus/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses sys-libs/readline ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://qosient.com/argus/dev/argus-clients-3.0.6.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eca975a0b12d133efcaf20916f0ef2da
diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.7.5 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.7.5
index 17454e602666..2996779eb8e1 100644
--- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.7.5
+++ b/metadata/md5-cache/net-analyzer/argus-clients-3.0.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses sys-libs/readline ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses sys-libs/readline ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Clients for net-analyzer/argus
 EAPI=5
 HOMEPAGE=http://www.qosient.com/argus/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses sys-libs/readline ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://qosient.com/argus/dev/argus-clients-3.0.7.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=034d1b4b9bde4ca1ef765865673726db
diff --git a/metadata/md5-cache/net-analyzer/arp-sk-0.0.16-r2 b/metadata/md5-cache/net-analyzer/arp-sk-0.0.16-r2
index e8c740404429..9b7700172015 100644
--- a/metadata/md5-cache/net-analyzer/arp-sk-0.0.16-r2
+++ b/metadata/md5-cache/net-analyzer/arp-sk-0.0.16-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=net-libs/libnet-1.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-libs/libnet-1.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A swiss knife tool for ARP
 EAPI=5
 HOMEPAGE=http://sid.rstack.org/arp-sk/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libnet-1.1
 SLOT=0
 SRC_URI=http://sid.rstack.org/arp-sk/files/arp-sk-0.0.16.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=24d5e6019610973ee2a9f9312bd515ff
diff --git a/metadata/md5-cache/net-analyzer/barnyard-0.2.0-r3 b/metadata/md5-cache/net-analyzer/barnyard-0.2.0-r3
index 79ee82a7aa83..7810ffad99e6 100644
--- a/metadata/md5-cache/net-analyzer/barnyard-0.2.0-r3
+++ b/metadata/md5-cache/net-analyzer/barnyard-0.2.0-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=net-libs/libpcap postgres? ( dev-db/postgresql-server ) mysql? ( virtual/mysql ) sguil? ( dev-lang/tcl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-libs/libpcap postgres? ( dev-db/postgresql-server ) mysql? ( virtual/mysql ) sguil? ( dev-lang/tcl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Fast output system for Snort
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/barnyard
@@ -9,5 +9,5 @@ LICENSE=QPL GPL-2
 RDEPEND=net-libs/libpcap postgres? ( dev-db/postgresql-server ) mysql? ( virtual/mysql ) sguil? ( dev-lang/tcl ) net-analyzer/snort
 SLOT=0
 SRC_URI=mirror://sourceforge/barnyard/barnyard-0.2.0.tar.gz mirror://gentoo/barnyard-0.2.0-patches.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=357593554df6456862d7065abaeb8653
diff --git a/metadata/md5-cache/net-analyzer/bwping-1.4 b/metadata/md5-cache/net-analyzer/bwping-1.4
index e419cf2497ee..f49c00c95d64 100644
--- a/metadata/md5-cache/net-analyzer/bwping-1.4
+++ b/metadata/md5-cache/net-analyzer/bwping-1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A tool to measure bandwidth and RTT between two hosts using ICMP
 EAPI=2
 HOMEPAGE=http://bwping.sourceforge.net/
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~sparc x86 ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/bwping/1.4/bwping-1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=ecfd89b6d921204d3721d829faee3e8d
diff --git a/metadata/md5-cache/net-analyzer/bwping-1.7 b/metadata/md5-cache/net-analyzer/bwping-1.7
index 1fb4974ddb2c..b24badd8fb63 100644
--- a/metadata/md5-cache/net-analyzer/bwping-1.7
+++ b/metadata/md5-cache/net-analyzer/bwping-1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A tool to measure bandwidth and RTT between two hosts using ICMP
 EAPI=5
 HOMEPAGE=http://bwping.sourceforge.net/
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~sparc x86 ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/bwping/1.7/bwping-1.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=9e3c2e573f7eb9713367ff8aa55568d3
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-0.8.7g b/metadata/md5-cache/net-analyzer/cacti-spine-0.8.7g
index 521495223613..2245b6d59f65 100644
--- a/metadata/md5-cache/net-analyzer/cacti-spine-0.8.7g
+++ b/metadata/md5-cache/net-analyzer/cacti-spine-0.8.7g
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=net-analyzer/net-snmp dev-libs/openssl virtual/mysql || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-analyzer/net-snmp dev-libs/openssl virtual/mysql || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
 EAPI=2
 HOMEPAGE=http://cacti.net/spine_info.php
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=net-analyzer/net-snmp dev-libs/openssl virtual/mysql >net-analyzer/cacti-0.8.7
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=35d388a68a30e641fe5461f6cc9fa47d
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-0.8.7h b/metadata/md5-cache/net-analyzer/cacti-spine-0.8.7h
index ff9fa2bd963c..406e946696cf 100644
--- a/metadata/md5-cache/net-analyzer/cacti-spine-0.8.7h
+++ b/metadata/md5-cache/net-analyzer/cacti-spine-0.8.7h
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=net-analyzer/net-snmp dev-libs/openssl virtual/mysql || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-analyzer/net-snmp dev-libs/openssl virtual/mysql || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
 EAPI=4
 HOMEPAGE=http://cacti.net/spine_info.php
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=net-analyzer/net-snmp dev-libs/openssl virtual/mysql >net-analyzer/cacti-0.8.7
 SLOT=0
 SRC_URI=http://www.cacti.net/downloads/spine/cacti-spine-0.8.7h.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6f5468122edf32df6b9c52cd7f25edba
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-0.8.7i b/metadata/md5-cache/net-analyzer/cacti-spine-0.8.7i
index e16806561567..a8b654f4b06e 100644
--- a/metadata/md5-cache/net-analyzer/cacti-spine-0.8.7i
+++ b/metadata/md5-cache/net-analyzer/cacti-spine-0.8.7i
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=net-analyzer/net-snmp dev-libs/openssl virtual/mysql || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-analyzer/net-snmp dev-libs/openssl virtual/mysql || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
 EAPI=4
 HOMEPAGE=http://cacti.net/spine_info.php
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=net-analyzer/net-snmp dev-libs/openssl virtual/mysql >net-analyzer/cacti-0.8.7
 SLOT=0
 SRC_URI=http://www.cacti.net/downloads/spine/cacti-spine-0.8.7i.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f57699cf9815cf64efffd6785899544b
diff --git a/metadata/md5-cache/net-analyzer/dsniff-2.4_beta1-r4 b/metadata/md5-cache/net-analyzer/dsniff-2.4_beta1-r4
index 57125d10d45f..9f85277cbbec 100644
--- a/metadata/md5-cache/net-analyzer/dsniff-2.4_beta1-r4
+++ b/metadata/md5-cache/net-analyzer/dsniff-2.4_beta1-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=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 sys-apps/sed X? ( x11-libs/libXmu ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 sys-apps/sed X? ( x11-libs/libXmu ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A collection of tools for network auditing and penetration testing
 HOMEPAGE=http://monkey.org/~dugsong/dsniff/
 IUSE=X
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=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 sys-apps/sed X? ( x11-libs/libXmu )
 SLOT=0
 SRC_URI=http://monkey.org/~dugsong/dsniff/beta/dsniff-2.4b1.tar.gz mirror://debian/pool/main/d/dsniff/dsniff_2.4b1+debian-18.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=649b4096a1264c3f8954f6cd51dee61f
diff --git a/metadata/md5-cache/net-analyzer/dsniff-2.4_beta1-r5 b/metadata/md5-cache/net-analyzer/dsniff-2.4_beta1-r5
index 3bc593043815..80036ccf74d6 100644
--- a/metadata/md5-cache/net-analyzer/dsniff-2.4_beta1-r5
+++ b/metadata/md5-cache/net-analyzer/dsniff-2.4_beta1-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A collection of tools for network auditing and penetration testing
 EAPI=2
 HOMEPAGE=http://monkey.org/~dugsong/dsniff/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://monkey.org/~dugsong/dsniff/beta/dsniff-2.4b1.tar.gz mirror://debian/pool/main/d/dsniff/dsniff_2.4b1+debian-18.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b35b148caa7e5448b885568bb43db0c
diff --git a/metadata/md5-cache/net-analyzer/echoping-6.0.2-r1 b/metadata/md5-cache/net-analyzer/echoping-6.0.2-r1
index c68c6a51a526..5a13343adacd 100644
--- a/metadata/md5-cache/net-analyzer/echoping-6.0.2-r1
+++ b/metadata/md5-cache/net-analyzer/echoping-6.0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Small program to test performances of remote servers
 EAPI=2
 HOMEPAGE=http://echoping.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=gnutls? ( >=net-libs/gnutls-1.0.17 ) ssl? ( >=dev-libs/openssl-0.9.7d )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/echoping/echoping-6.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=847f38c0cdba452f68bb6637630af9e4
diff --git a/metadata/md5-cache/net-analyzer/echoping-6.0.2-r2 b/metadata/md5-cache/net-analyzer/echoping-6.0.2-r2
index 8867f7b06181..e9559051bef0 100644
--- a/metadata/md5-cache/net-analyzer/echoping-6.0.2-r2
+++ b/metadata/md5-cache/net-analyzer/echoping-6.0.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=idn? ( net-dns/libidn ) postgres? ( dev-db/postgresql-base ) ldap? ( net-nds/openldap ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( >=dev-libs/openssl-0.9.7d ) ) >=sys-devel/libtool-2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=idn? ( net-dns/libidn ) postgres? ( dev-db/postgresql-base ) ldap? ( net-nds/openldap ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( >=dev-libs/openssl-0.9.7d ) ) >=sys-devel/libtool-2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Small program to test performances of remote servers
 EAPI=4
 HOMEPAGE=http://echoping.sourceforge.net/
@@ -11,5 +11,5 @@ REQUIRED_USE=gnutls? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/echoping/echoping-6.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b940d9a2c6876d8b1edf46e45276a72d
diff --git a/metadata/md5-cache/net-analyzer/egressor-1.0-r2 b/metadata/md5-cache/net-analyzer/egressor-1.0-r2
index d2d8bbfc3c6b..1df2385a565f 100644
--- a/metadata/md5-cache/net-analyzer/egressor-1.0-r2
+++ b/metadata/md5-cache/net-analyzer/egressor-1.0-r2
@@ -3,10 +3,10 @@ DEPEND=<net-libs/libnet-1.1 >=net-libs/libnet-1.0.2a-r3
 DESCRIPTION=tool for checking router configuration
 EAPI=2
 HOMEPAGE=http://packetfactory.openwall.net/projects/egressor/
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=egressor
 RDEPEND=net-libs/libpcap dev-perl/Net-RawIP dev-lang/perl
 SLOT=0
 SRC_URI=http://packetfactory.openwall.net/projects/egressor/egressor_release1.0.tar.gz
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=826f75ed3c8ce99979549831c99650c4
+_md5_=0673d5284a2853ee39168adf2c17c407
diff --git a/metadata/md5-cache/net-analyzer/ettercap-9999 b/metadata/md5-cache/net-analyzer/ettercap-9999
index 18acdbc736fa..10403c1e0621 100644
--- a/metadata/md5-cache/net-analyzer/ettercap-9999
+++ b/metadata/md5-cache/net-analyzer/ettercap-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/libpcre net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib gtk? ( >=dev-libs/atk-1.2.4 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.2.2:2 >=x11-libs/pango-1.2.3 ) ncurses? ( >=sys-libs/ncurses-5.3 ) plugins? ( >=net-misc/curl-7.26.0 sys-devel/libtool ) ssl? ( dev-libs/openssl )
 SLOT=0
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	bc8bbf26de246f74e2901a3696ad96d6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e8222f38fb3e529f21ee22632be60efe
+_md5_=0284cb2ca3fd51c787fc191be8f1ccc7
diff --git a/metadata/md5-cache/net-analyzer/fe3d-0.11.2 b/metadata/md5-cache/net-analyzer/fe3d-0.11.2
index 3c400e0ff72c..1e81bb0e02a8 100644
--- a/metadata/md5-cache/net-analyzer/fe3d-0.11.2
+++ b/metadata/md5-cache/net-analyzer/fe3d-0.11.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=postinst prepare
-DEPEND=>=dev-libs/xerces-c-2.7 net-analyzer/nmap x11-libs/wxGTK:2.8[opengl] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/xerces-c-2.7 net-analyzer/nmap x11-libs/wxGTK:2.8[opengl] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A 3D visualization tool for network security information
 EAPI=5
 HOMEPAGE=http://projects.icapsid.net/fe3d/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/xerces-c-2.7 net-analyzer/nmap x11-libs/wxGTK:2.8[opengl]
 SLOT=0
 SRC_URI=mirror://sourceforge/fe3d/fe3d_0.11.2-src.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=65c81077c67d8868ad593f9abc0a05c3
diff --git a/metadata/md5-cache/net-analyzer/flowgrind-0.5.8 b/metadata/md5-cache/net-analyzer/flowgrind-0.5.8
index a1c094ef26ee..58b2b6466c74 100644
--- a/metadata/md5-cache/net-analyzer/flowgrind-0.5.8
+++ b/metadata/md5-cache/net-analyzer/flowgrind-0.5.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/xmlrpc-c[abyss,curl] gsl? ( sci-libs/gsl ) pcap? ( net-libs/libpcap ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/xmlrpc-c[abyss,curl] gsl? ( sci-libs/gsl ) pcap? ( net-libs/libpcap ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Network performance measurement tool
 EAPI=4
 HOMEPAGE=https://launchpad.net/flowgrind
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/xmlrpc-c[abyss,curl] gsl? ( sci-libs/gsl ) pcap? ( net-libs/libpcap )
 SLOT=0
 SRC_URI=https://launchpad.net/flowgrind/trunk/flowgrind-0.5.8/+download/flowgrind-0.5.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6375f47bf202573f8461ac1303fa4387
diff --git a/metadata/md5-cache/net-analyzer/fping-2.4_beta2_p161-r1 b/metadata/md5-cache/net-analyzer/fping-2.4_beta2_p161-r1
index eb62c59f44c7..1ed28214c20f 100644
--- a/metadata/md5-cache/net-analyzer/fping-2.4_beta2_p161-r1
+++ b/metadata/md5-cache/net-analyzer/fping-2.4_beta2_p161-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A utility to ping multiple hosts at once
 EAPI=2
 HOMEPAGE=http://fping.sourceforge.net/ http://packages.qa.debian.org/f/fping.html
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64
 LICENSE=fping
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2ab91d1a89692af955e5faad2c95472d
diff --git a/metadata/md5-cache/net-analyzer/fragroute-1.2.5 b/metadata/md5-cache/net-analyzer/fragroute-1.2.5
index 9b8bd693d7a6..ae6d7dc3c62b 100644
--- a/metadata/md5-cache/net-analyzer/fragroute-1.2.5
+++ b/metadata/md5-cache/net-analyzer/fragroute-1.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libevent net-libs/libpcap >=dev-libs/libdnet-1.12[ipv6] virtual/awk || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libevent net-libs/libpcap >=dev-libs/libdnet-1.12[ipv6] virtual/awk || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Testing of network intrusion detection systems, firewalls and TCP/IP stacks
 EAPI=4
 HOMEPAGE=http://code.google.com/p/fragroute-ipv6/
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libevent net-libs/libpcap >=dev-libs/libdnet-1.12[ipv6]
 SLOT=0
 SRC_URI=http://fragroute-ipv6.googlecode.com/files/fragroute-1.2.5-ipv6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6f9f54d8531a4b09c45c44af80ecca8c
diff --git a/metadata/md5-cache/net-analyzer/fragroute-1.2.6 b/metadata/md5-cache/net-analyzer/fragroute-1.2.6
index 347e6cfcef17..c466872618b9 100644
--- a/metadata/md5-cache/net-analyzer/fragroute-1.2.6
+++ b/metadata/md5-cache/net-analyzer/fragroute-1.2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libevent net-libs/libpcap >=dev-libs/libdnet-1.12[ipv6] virtual/awk || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libevent net-libs/libpcap >=dev-libs/libdnet-1.12[ipv6] virtual/awk || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Testing of network intrusion detection systems, firewalls and TCP/IP stacks
 EAPI=5
 HOMEPAGE=http://code.google.com/p/fragroute-ipv6/
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libevent net-libs/libpcap >=dev-libs/libdnet-1.12[ipv6]
 SLOT=0
 SRC_URI=http://fragroute-ipv6.googlecode.com/files/fragroute-1.2.6-ipv6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fa17ae5f469d981ba4bc7fb9b56d31a1
diff --git a/metadata/md5-cache/net-analyzer/goaccess-0.5-r1 b/metadata/md5-cache/net-analyzer/goaccess-0.5-r1
index 60f0875b2660..495da41f6c52 100644
--- a/metadata/md5-cache/net-analyzer/goaccess-0.5-r1
+++ b/metadata/md5-cache/net-analyzer/goaccess-0.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 sys-libs/ncurses[unicode?] geoip? ( dev-libs/geoip ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 sys-libs/ncurses[unicode?] geoip? ( dev-libs/geoip ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A real-time Apache log analyzer and interactive viewer that runs in a terminal
 EAPI=5
 HOMEPAGE=http://goaccess.prosoftcorp.com
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 sys-libs/ncurses[unicode?] geoip? ( dev-libs/geoip )
 SLOT=0
 SRC_URI=mirror://sourceforge/goaccess/goaccess-0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6f39c0455bb189a82bc6c91e30200c2e
diff --git a/metadata/md5-cache/net-analyzer/gsm-receiver-9999 b/metadata/md5-cache/net-analyzer/gsm-receiver-9999
index 6d309e110a4f..3f7c3eb48a9e 100644
--- a/metadata/md5-cache/net-analyzer/gsm-receiver-9999
+++ b/metadata/md5-cache/net-analyzer/gsm-receiver-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=net-libs/libosmocore net-wireless/gnuradio virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git =dev-lang/python-2*
+DEPEND=net-libs/libosmocore net-wireless/gnuradio virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git =dev-lang/python-2*
 DESCRIPTION=GSM receiver block from the airprobe suite
 EAPI=4
 HOMEPAGE=https://svn.berlin.ccc.de/projects/airprobe/
 LICENSE=GPL-3
 RDEPEND=net-libs/libosmocore net-wireless/gnuradio =dev-lang/python-2*
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=45788e00e995ea1ea04e003bf0491b96
diff --git a/metadata/md5-cache/net-analyzer/gspoof-3.2-r2 b/metadata/md5-cache/net-analyzer/gspoof-3.2-r2
index b5bfc58480f0..e3b0ff709256 100644
--- a/metadata/md5-cache/net-analyzer/gspoof-3.2-r2
+++ b/metadata/md5-cache/net-analyzer/gspoof-3.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 net-libs/libnet:1.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 net-libs/libnet:1.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A simple GTK/command line TCP/IP packet generator
 EAPI=4
 HOMEPAGE=http://gspoof.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2 net-libs/libnet:1.1
 SLOT=0
 SRC_URI=http://gspoof.sourceforge.net/src/gspoof-3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=29c491941db0b8c71387e7147d581d93
diff --git a/metadata/md5-cache/net-analyzer/ifstat-1.1-r2 b/metadata/md5-cache/net-analyzer/ifstat-1.1-r2
index 4eb8bbb37ad8..218bb00c080e 100644
--- a/metadata/md5-cache/net-analyzer/ifstat-1.1-r2
+++ b/metadata/md5-cache/net-analyzer/ifstat-1.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=snmp? ( >=net-analyzer/net-snmp-5.0 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=snmp? ( >=net-analyzer/net-snmp-5.0 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Network interface bandwidth usage, with support for snmp targets.
 EAPI=4
 HOMEPAGE=http://gael.roualland.free.fr/ifstat/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=snmp? ( >=net-analyzer/net-snmp-5.0 )
 SLOT=0
 SRC_URI=http://gael.roualland.free.fr/ifstat/ifstat-1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5602712d98c54fb0bf6c498d36c576e8
diff --git a/metadata/md5-cache/net-analyzer/ipcad-3.7.3 b/metadata/md5-cache/net-analyzer/ipcad-3.7.3
index 6612003d2b71..ab51445805d8 100644
--- a/metadata/md5-cache/net-analyzer/ipcad-3.7.3
+++ b/metadata/md5-cache/net-analyzer/ipcad-3.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=net-libs/libpcap net-firewall/iptables || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-libs/libpcap net-firewall/iptables || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=IP Cisco Accounting Daemon
 EAPI=2
 HOMEPAGE=http://ipcad.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=BSD-2 GPL-2
 RDEPEND=net-libs/libpcap net-firewall/iptables
 SLOT=0
 SRC_URI=mirror://sourceforge/ipcad/ipcad-3.7.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3aebe057f0085a2d6a29688a74713467
diff --git a/metadata/md5-cache/net-analyzer/jnettop-0.13.0-r1 b/metadata/md5-cache/net-analyzer/jnettop-0.13.0-r1
index 863837e1a930..bafd2c6ce3ec 100644
--- a/metadata/md5-cache/net-analyzer/jnettop-0.13.0-r1
+++ b/metadata/md5-cache/net-analyzer/jnettop-0.13.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=net-libs/libpcap >=dev-libs/glib-2.0.1 berkdb? ( =sys-libs/db-4* ) ncurses? ( sys-libs/ncurses ) syslog? ( virtual/logger ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-libs/libpcap >=dev-libs/glib-2.0.1 berkdb? ( =sys-libs/db-4* ) ncurses? ( sys-libs/ncurses ) syslog? ( virtual/logger ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A top like console network traffic visualiser
 EAPI=4
 HOMEPAGE=http://jnettop.kubs.info/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libpcap >=dev-libs/glib-2.0.1 berkdb? ( =sys-libs/db-4* ) ncurses? ( sys-libs/ncurses ) syslog? ( virtual/logger )
 SLOT=0
 SRC_URI=http://jnettop.kubs.info/dist/jnettop-0.13.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4ddd03958431fe15db320c808aa19dee
diff --git a/metadata/md5-cache/net-analyzer/labrea-2.5-r1 b/metadata/md5-cache/net-analyzer/labrea-2.5-r1
index 72cece1487b6..444fbc074be3 100644
--- a/metadata/md5-cache/net-analyzer/labrea-2.5-r1
+++ b/metadata/md5-cache/net-analyzer/labrea-2.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=net-libs/libpcap >=dev-libs/libdnet-1.7 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-libs/libpcap >=dev-libs/libdnet-1.7 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION='Sticky' Honeypot and IDS
 EAPI=2
 HOMEPAGE=http://labrea.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libpcap >=dev-libs/libdnet-1.7
 SLOT=0
 SRC_URI=mirror://sourceforge/labrea/labrea-2.5-stable-1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f27696cfd2b2292692d5b3e20e225674
diff --git a/metadata/md5-cache/net-analyzer/labrea-2.5-r2 b/metadata/md5-cache/net-analyzer/labrea-2.5-r2
index 05e95962ab65..faef4526f015 100644
--- a/metadata/md5-cache/net-analyzer/labrea-2.5-r2
+++ b/metadata/md5-cache/net-analyzer/labrea-2.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=net-libs/libpcap >=dev-libs/libdnet-1.7 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-libs/libpcap >=dev-libs/libdnet-1.7 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION='Sticky' Honeypot and IDS
 EAPI=4
 HOMEPAGE=http://labrea.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libpcap >=dev-libs/libdnet-1.7
 SLOT=0
 SRC_URI=mirror://sourceforge/labrea/labrea-2.5-stable-1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b269fc4ffc59f8f8b8d7740c53a959c1
diff --git a/metadata/md5-cache/net-analyzer/mbrowse-0.4.3 b/metadata/md5-cache/net-analyzer/mbrowse-0.4.3
index 2328cac56a5e..36bc4953ba56 100644
--- a/metadata/md5-cache/net-analyzer/mbrowse-0.4.3
+++ b/metadata/md5-cache/net-analyzer/mbrowse-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/glib net-analyzer/net-snmp x11-libs/gdk-pixbuf x11-libs/gtk+:2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib net-analyzer/net-snmp x11-libs/gdk-pixbuf x11-libs/gtk+:2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MBrowse is a graphical MIB browser
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/mbrowse/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib net-analyzer/net-snmp x11-libs/gdk-pixbuf x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/mbrowse/files/mbrowse-0.4.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e7cf0bca479e91478fe23b4d85a7ec9c
diff --git a/metadata/md5-cache/net-analyzer/mrtg-2.16.4-r1 b/metadata/md5-cache/net-analyzer/mrtg-2.16.4-r1
index c2b0394f2698..25aadc307afe 100644
--- a/metadata/md5-cache/net-analyzer/mrtg-2.16.4-r1
+++ b/metadata/md5-cache/net-analyzer/mrtg-2.16.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-lang/perl dev-perl/SNMP_Session >=dev-perl/Socket6-0.20 >=media-libs/gd-1.8.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl dev-perl/SNMP_Session >=dev-perl/Socket6-0.20 >=media-libs/gd-1.8.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A tool to monitor the traffic load on network-links
 EAPI=3
 HOMEPAGE=http://oss.oetiker.ch/mrtg/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/SNMP_Session >=dev-perl/Socket6-0.20 >=media-libs/gd-1.8.4
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/mrtg/pub/mrtg-2.16.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4f1a0cfb1ac04be883ea15c0be1eb9e6
diff --git a/metadata/md5-cache/net-analyzer/mtr-0.82 b/metadata/md5-cache/net-analyzer/mtr-0.82
index daa493d5e011..fc58a1c5bc08 100644
--- a/metadata/md5-cache/net-analyzer/mtr-0.82
+++ b/metadata/md5-cache/net-analyzer/mtr-0.82
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses gtk? ( x11-libs/gtk+:2 ) gtk? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses gtk? ( x11-libs/gtk+:2 ) gtk? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=My TraceRoute, an Excellent network diagnostic tool
 EAPI=4
 HOMEPAGE=http://www.bitwizard.nl/mtr/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=ftp://ftp.bitwizard.nl/mtr/mtr-0.82.tar.gz mirror://gentoo/gtk-2.0-for-mtr.m4.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=23f317307ff0a5b64a53140da8610dae
diff --git a/metadata/md5-cache/net-analyzer/mtr-0.83 b/metadata/md5-cache/net-analyzer/mtr-0.83
index 6c827f782bc1..3671ec6acb0a 100644
--- a/metadata/md5-cache/net-analyzer/mtr-0.83
+++ b/metadata/md5-cache/net-analyzer/mtr-0.83
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses dev-libs/glib:2 gtk? ( x11-libs/gtk+:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses dev-libs/glib:2 gtk? ( x11-libs/gtk+:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=My TraceRoute, an Excellent network diagnostic tool
 EAPI=5
 HOMEPAGE=http://www.bitwizard.nl/mtr/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses dev-libs/glib:2 gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=ftp://ftp.bitwizard.nl/mtr/mtr-0.83.tar.gz mirror://gentoo/gtk-2.0-for-mtr.m4.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a96ae5d0bcc5af079d71ff5b027e9d4e
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_dnssec-0.1_p28 b/metadata/md5-cache/net-analyzer/nagios-check_dnssec-0.1_p28
index b8b1d8b38681..353b863c9541 100644
--- a/metadata/md5-cache/net-analyzer/nagios-check_dnssec-0.1_p28
+++ b/metadata/md5-cache/net-analyzer/nagios-check_dnssec-0.1_p28
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=net-analyzer/nagios-plugins net-libs/ldns || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-analyzer/nagios-plugins net-libs/ldns || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=check_dnssec is a set of Nagios plugins to monitor DNSSEC services.
 EAPI=4
 HOMEPAGE=https://svn.durchmesser.ch/trac/check_dnssec
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=net-analyzer/nagios-plugins net-libs/ldns
 SLOT=0
 SRC_URI=mirror://gentoo/check_dnssec-0.1_p28.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=764833818d28419f7a2aeba550bc6cdc
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_fail2ban-3 b/metadata/md5-cache/net-analyzer/nagios-check_fail2ban-3
index 914adab3fb1b..4b9eb8468a34 100644
--- a/metadata/md5-cache/net-analyzer/nagios-check_fail2ban-3
+++ b/metadata/md5-cache/net-analyzer/nagios-check_fail2ban-3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=net-analyzer/nagios-plugins-1.4.13-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-analyzer/nagios-plugins-1.4.13-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A nagios plugin for checking the fail2ban daemon
 EAPI=2
 HOMEPAGE=https://github.com/hollow/check_fail2ban
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=net-analyzer/nagios-plugins-1.4.13-r1
 SLOT=0
 SRC_URI=http://nodeload.github.com/hollow/check_fail2ban/tarball/v3 -> nagios-check_fail2ban-3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=38677f873889b655223beed6dda0b7f3
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_mysql_health-2.1.5 b/metadata/md5-cache/net-analyzer/nagios-check_mysql_health-2.1.5
index d083ad9e7b0f..19346237f760 100644
--- a/metadata/md5-cache/net-analyzer/nagios-check_mysql_health-2.1.5
+++ b/metadata/md5-cache/net-analyzer/nagios-check_mysql_health-2.1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=net-analyzer/nagios-plugins-1.4.13-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-analyzer/nagios-plugins-1.4.13-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A nagios plugin for checking MySQL server health
 EAPI=2
 HOMEPAGE=http://labs.consol.de/lang/de/nagios/check_mysql_health/
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=net-analyzer/nagios-plugins-1.4.13-r1 virtual/mysql
 SLOT=0
 SRC_URI=http://labs.consol.de/wp-content/uploads/2010/12/check_mysql_health-2.1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=8441e9c690f5f6a8dfa798546e356ff4
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_mysql_health-2.1.7 b/metadata/md5-cache/net-analyzer/nagios-check_mysql_health-2.1.7
index 00e621e437b6..964ca47df56e 100644
--- a/metadata/md5-cache/net-analyzer/nagios-check_mysql_health-2.1.7
+++ b/metadata/md5-cache/net-analyzer/nagios-check_mysql_health-2.1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=net-analyzer/nagios-plugins-1.4.13-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-analyzer/nagios-plugins-1.4.13-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A nagios plugin for checking MySQL server health
 EAPI=2
 HOMEPAGE=http://labs.consol.de/lang/de/nagios/check_mysql_health/
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=net-analyzer/nagios-plugins-1.4.13-r1 virtual/mysql
 SLOT=0
 SRC_URI=http://labs.consol.de/wp-content/uploads/2011/08/check_mysql_health-2.1.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=29b285eb160676f070cea1c5dee3b641
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_pidfile-1 b/metadata/md5-cache/net-analyzer/nagios-check_pidfile-1
index 0213cded775c..8ee5e14cff39 100644
--- a/metadata/md5-cache/net-analyzer/nagios-check_pidfile-1
+++ b/metadata/md5-cache/net-analyzer/nagios-check_pidfile-1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=net-analyzer/nagios-plugins-1.4.13-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-analyzer/nagios-plugins-1.4.13-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A nagios plugin for checking daemons via pidfiles
 EAPI=3
 HOMEPAGE=https://github.com/hollow/check_pidfile
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=net-analyzer/nagios-plugins-1.4.13-r1
 SLOT=0
 SRC_URI=https://github.com/hollow/check_pidfile/archive/v1.tar.gz -> nagios-check_pidfile-1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=b02f06be3e9d069b4020016c58aa4e74
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-1.4.14-r2 b/metadata/md5-cache/net-analyzer/nagios-plugins-1.4.14-r2
index 51c07fadd010..04da18130c53 100644
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-1.4.14-r2
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-1.4.14-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Nagios 1.4.14 plugins - Pack of plugins to make Nagios work properly
 EAPI=1
 HOMEPAGE=http://www.nagios.org/
@@ -10,5 +10,5 @@ RDEPEND=ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) postgres? (
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nagiosplug/nagios-plugins-1.4.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2be8138a42c583571d337209c75fd356
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-1.4.16-r2 b/metadata/md5-cache/net-analyzer/nagios-plugins-1.4.16-r2
index f3f7e03a1071..f7f1d061aeeb 100644
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-1.4.16-r2
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-1.4.16-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.6g ) gnutls? ( net-libs/gnutls ) ) radius? ( >=net-dialup/radiusclient-0.3.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.6g ) gnutls? ( net-libs/gnutls ) ) radius? ( >=net-dialup/radiusclient-0.3.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Nagios 1.4.16 plugins - Pack of plugins to make Nagios work properly
 EAPI=4
 HOMEPAGE=http://www.nagios.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=smart? ( sudo )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nagiosplug/nagios-plugins-1.4.16.tar.gz http://dev.gentoo.org/~flameeyes/nagios-plugins/nagios-plugins-1.4.16-patches-2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=367460540eb912e02190d185d1792cf8
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-1.4.16-r3 b/metadata/md5-cache/net-analyzer/nagios-plugins-1.4.16-r3
index 3c0106f25abc..09fcf9ef7b4f 100644
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-1.4.16-r3
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-1.4.16-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.6g ) gnutls? ( net-libs/gnutls ) ) radius? ( >=net-dialup/radiusclient-0.3.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.6g ) gnutls? ( net-libs/gnutls ) ) radius? ( >=net-dialup/radiusclient-0.3.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Nagios 1.4.16 plugins - Pack of plugins to make Nagios work properly
 EAPI=4
 HOMEPAGE=http://www.nagios.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=smart? ( sudo )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nagiosplug/nagios-plugins-1.4.16.tar.gz http://dev.gentoo.org/~flameeyes/nagios-plugins/nagios-plugins-1.4.16-patches-2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ae2b9efadf1a270b740d9f54d949facb
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-snmp-0.6.0-r1 b/metadata/md5-cache/net-analyzer/nagios-plugins-snmp-0.6.0-r1
index 441763e69ae3..9aff0d556427 100644
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-snmp-0.6.0-r1
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-snmp-0.6.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup unpack
-DEPEND=net-analyzer/net-snmp || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-analyzer/net-snmp || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Additional Nagios plugins for monitoring SNMP capable devices
 HOMEPAGE=http://nagios.manubulon.com
 KEYWORDS=amd64 ~ppc ppc64 ~sparc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=net-analyzer/net-snmp
 SLOT=0
 SRC_URI=http://nagios.manubulon.com/nagios-plugins-snmp-0.6.0.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4da7806414c9e4e2bd17f7e200dabefc
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-snmp-0.6.0-r2 b/metadata/md5-cache/net-analyzer/nagios-plugins-snmp-0.6.0-r2
index c2127c94fde6..b1e8c56f90ff 100644
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-snmp-0.6.0-r2
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-snmp-0.6.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=net-analyzer/net-snmp || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-analyzer/net-snmp || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Additional Nagios plugins for monitoring SNMP capable devices
 EAPI=4
 HOMEPAGE=http://nagios.manubulon.com
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-analyzer/net-snmp
 SLOT=0
 SRC_URI=http://nagios.manubulon.com/nagios-plugins-snmp-0.6.0.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f75c754f7113c2417feb829b0f98a6e8
diff --git a/metadata/md5-cache/net-analyzer/nast-0.2.0-r1 b/metadata/md5-cache/net-analyzer/nast-0.2.0-r1
index 6466d50b4183..020dde7b4b54 100644
--- a/metadata/md5-cache/net-analyzer/nast-0.2.0-r1
+++ b/metadata/md5-cache/net-analyzer/nast-0.2.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=>=net-libs/libnet-1.1.1 net-libs/libpcap ncurses? ( >=sys-libs/ncurses-5.4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-libs/libnet-1.1.1 net-libs/libpcap ncurses? ( >=sys-libs/ncurses-5.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NAST - Network Analyzer Sniffer Tool
 EAPI=4
 HOMEPAGE=http://nast.berlios.de/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libnet-1.1.1 net-libs/libpcap ncurses? ( >=sys-libs/ncurses-5.4 )
 SLOT=0
 SRC_URI=mirror://berlios/nast/nast-0.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=1017782a2b3c58c4a696f450fae1b95a
diff --git a/metadata/md5-cache/net-analyzer/nb-0.6.5-r1 b/metadata/md5-cache/net-analyzer/nb-0.6.5-r1
index 33aa25df36d9..72c446943ce9 100644
--- a/metadata/md5-cache/net-analyzer/nb-0.6.5-r1
+++ b/metadata/md5-cache/net-analyzer/nb-0.6.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=dev-lang/perl || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Nodebrain is a tool to monitor and do event correlation.
 HOMEPAGE=http://nodebrain.sourceforge.net/
 KEYWORDS=~ppc ~x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!sys-boot/netboot !www-apps/nanoblogger
 SLOT=0
 SRC_URI=mirror://sourceforge/nodebrain/nb-0.6.5-source.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=140c694e26ee11c1908ea7852730df48
diff --git a/metadata/md5-cache/net-analyzer/nb-0.8.14 b/metadata/md5-cache/net-analyzer/nb-0.8.14
index f2a82908ccc6..ec6fac020085 100644
--- a/metadata/md5-cache/net-analyzer/nb-0.8.14
+++ b/metadata/md5-cache/net-analyzer/nb-0.8.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/perl virtual/pkgconfig sys-apps/texinfo || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl virtual/pkgconfig sys-apps/texinfo || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Nodebrain is a tool to monitor and do event correlation.
 EAPI=5
 HOMEPAGE=http://nodebrain.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!sys-boot/netboot !www-apps/nanoblogger
 SLOT=0
 SRC_URI=mirror://sourceforge/nodebrain/nodebrain-0.8.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=54dcf6d2fbee4b041d63212e452ff145
diff --git a/metadata/md5-cache/net-analyzer/ndsad-1.33 b/metadata/md5-cache/net-analyzer/ndsad-1.33
index 5d6610ba7fe3..07ef8563d70f 100644
--- a/metadata/md5-cache/net-analyzer/ndsad-1.33
+++ b/metadata/md5-cache/net-analyzer/ndsad-1.33
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=net-libs/libpcap-0.8 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-libs/libpcap-0.8 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Cisco netflow probe from libpcap, ULOG, tee/divert sources.
 HOMEPAGE=http://sourceforge.net/projects/ndsad
 KEYWORDS=x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libpcap-0.8
 SLOT=0
 SRC_URI=mirror://sourceforge/ndsad/ndsad-1.33.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=c9ede7211219c29f892ea0edda3621e1
diff --git a/metadata/md5-cache/net-analyzer/nepenthes-0.2.2 b/metadata/md5-cache/net-analyzer/nepenthes-0.2.2
index 298d1c81972c..32d6fc4ef4a1 100644
--- a/metadata/md5-cache/net-analyzer/nepenthes-0.2.2
+++ b/metadata/md5-cache/net-analyzer/nepenthes-0.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=net-misc/curl sys-apps/file dev-libs/libpcre net-libs/adns || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-misc/curl sys-apps/file dev-libs/libpcre net-libs/adns || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Nepenthes is a low interaction honeypot that captures worms by emulating known vulnerabilities
 EAPI=2
 HOMEPAGE=http://nepenthes.sourceforge.net
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/nepenthes/nepenthes-0.2.2.tar.bz2 mirror://gentoo/nepenthes-0.2.2-gcc44.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=089f9661f56bd00a3837879908423f2d
diff --git a/metadata/md5-cache/net-analyzer/nessus-core-2.2.9-r1 b/metadata/md5-cache/net-analyzer/nessus-core-2.2.9-r1
index fc9046a4b313..07ed031b2797 100644
--- a/metadata/md5-cache/net-analyzer/nessus-core-2.2.9-r1
+++ b/metadata/md5-cache/net-analyzer/nessus-core-2.2.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=~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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=~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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A remote security scanner for Linux (nessus-core)
 EAPI=4
 HOMEPAGE=http://www.nessus.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=~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
 SLOT=0
 SRC_URI=ftp://ftp.nessus.org/pub/nessus/nessus-2.2.9/src/nessus-core-2.2.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1b05ed5cbcf553cfd320ddface636043
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.7.2 b/metadata/md5-cache/net-analyzer/net-snmp-5.7.2
index f5e32666762e..893bb40a4101 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.7.2
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.7.2
@@ -11,5 +11,5 @@ REQUIRED_USE=rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/net-snmp/net-snmp-5.7.2.tar.gz http://dev.gentoo.org/~flameeyes/net-snmp/net-snmp-5.7.2-patches-1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=afcfb183dd371f31ab90d4131eba93ff
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.7.2_rc1 b/metadata/md5-cache/net-analyzer/net-snmp-5.7.2_rc1
index 07c43197a818..9a341bda08a4 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.7.2_rc1
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.7.2_rc1
@@ -11,5 +11,5 @@ REQUIRED_USE=rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/net-snmp/net-snmp-5.7.2.rc1.tar.gz http://dev.gentoo.org/~flameeyes/net-snmp/net-snmp-5.7.2.rc1-patches-3.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=02b80f048dd9317cae8530a2140d8abc
diff --git a/metadata/md5-cache/net-analyzer/netcat6-1.0-r2 b/metadata/md5-cache/net-analyzer/netcat6-1.0-r2
index ccd9edb47c9a..f6e16c051d06 100644
--- a/metadata/md5-cache/net-analyzer/netcat6-1.0-r2
+++ b/metadata/md5-cache/net-analyzer/netcat6-1.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=bluetooth? ( net-wireless/bluez ) !net-analyzer/netcat || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=bluetooth? ( net-wireless/bluez ) !net-analyzer/netcat || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=netcat clone with better IPv6 support, improved code, etc...
 HOMEPAGE=http://netcat6.sourceforge.net/
 IUSE=ipv6 nls bluetooth
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=bluetooth? ( net-wireless/bluez ) !net-analyzer/netcat
 SLOT=0
 SRC_URI=ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6eea6c4a896d125fd671084e3f751a94
diff --git a/metadata/md5-cache/net-analyzer/netdiscover-0.3_beta6-r2 b/metadata/md5-cache/net-analyzer/netdiscover-0.3_beta6-r2
index 5c6b6d1c4303..f6d5fa417011 100644
--- a/metadata/md5-cache/net-analyzer/netdiscover-0.3_beta6-r2
+++ b/metadata/md5-cache/net-analyzer/netdiscover-0.3_beta6-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=net-libs/libnet-1.1.2.1-r1 >=net-libs/libpcap-0.8.3-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-libs/libnet-1.1.2.1-r1 >=net-libs/libpcap-0.8.3-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An active/passive address reconnaissance tool.
 EAPI=2
 HOMEPAGE=http://nixgeneration.com/~jaime/netdiscover/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libnet-1.1.2.1-r1 >=net-libs/libpcap-0.8.3-r1
 SLOT=0
 SRC_URI=http://nixgeneration.com/~jaime/netdiscover/releases/netdiscover-0.3-beta6.tar.gz mirror://gentoo/netdiscover-0.3-beta6-oui-db-update-20091010.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4c7bfae9f289f8a131562743703144a0
diff --git a/metadata/md5-cache/net-analyzer/netdiscover-0.3_beta6-r3 b/metadata/md5-cache/net-analyzer/netdiscover-0.3_beta6-r3
index 15aaec603847..22f102eb34e4 100644
--- a/metadata/md5-cache/net-analyzer/netdiscover-0.3_beta6-r3
+++ b/metadata/md5-cache/net-analyzer/netdiscover-0.3_beta6-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=net-libs/libnet-1.1.2.1-r1 >=net-libs/libpcap-0.8.3-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-libs/libnet-1.1.2.1-r1 >=net-libs/libpcap-0.8.3-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An active/passive address reconnaissance tool.
 EAPI=2
 HOMEPAGE=http://nixgeneration.com/~jaime/netdiscover/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libnet-1.1.2.1-r1 >=net-libs/libpcap-0.8.3-r1
 SLOT=0
 SRC_URI=http://nixgeneration.com/~jaime/netdiscover/releases/netdiscover-0.3-beta6.tar.gz mirror://gentoo/netdiscover-0.3-beta6-oui-db-update-20091010.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f4a31863fd9e635e5341656a9887f983
diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.6.5 b/metadata/md5-cache/net-analyzer/nfdump-1.6.5
index 824e013c1623..467dfe35dc7d 100644
--- a/metadata/md5-cache/net-analyzer/nfdump-1.6.5
+++ b/metadata/md5-cache/net-analyzer/nfdump-1.6.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A set of tools to collect and process netflow data
 EAPI=4
 HOMEPAGE=http://nfdump.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) dev-lang/perl
 SLOT=0
 SRC_URI=mirror://sourceforge/nfdump/nfdump-1.6.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=787b16970a30b5b022d89f41da006994
diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.6.6 b/metadata/md5-cache/net-analyzer/nfdump-1.6.6
index fad4b8b24497..963e9142f3ec 100644
--- a/metadata/md5-cache/net-analyzer/nfdump-1.6.6
+++ b/metadata/md5-cache/net-analyzer/nfdump-1.6.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A set of tools to collect and process netflow data
 EAPI=4
 HOMEPAGE=http://nfdump.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) dev-lang/perl
 SLOT=0
 SRC_URI=mirror://sourceforge/nfdump/nfdump-1.6.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8885f2197ecf48fe2b384fbbfaf8aba3
diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.6.8 b/metadata/md5-cache/net-analyzer/nfdump-1.6.8
index 815dd50b20b8..fa824c4ed3cf 100644
--- a/metadata/md5-cache/net-analyzer/nfdump-1.6.8
+++ b/metadata/md5-cache/net-analyzer/nfdump-1.6.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A set of tools to collect and process netflow data
 EAPI=4
 HOMEPAGE=http://nfdump.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) dev-lang/perl
 SLOT=0
 SRC_URI=mirror://sourceforge/nfdump/nfdump-1.6.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=958452b4806801de6203ed57df8a4b20
diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.6.9 b/metadata/md5-cache/net-analyzer/nfdump-1.6.9
index 642cfd645891..568ea23dda2e 100644
--- a/metadata/md5-cache/net-analyzer/nfdump-1.6.9
+++ b/metadata/md5-cache/net-analyzer/nfdump-1.6.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A set of tools to collect and process netflow data
 EAPI=5
 HOMEPAGE=http://nfdump.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap ) dev-lang/perl
 SLOT=0
 SRC_URI=mirror://sourceforge/nfdump/nfdump-1.6.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9810c0f9245253ed020f656b9cea616e
diff --git a/metadata/md5-cache/net-analyzer/ngrep-1.45-r3 b/metadata/md5-cache/net-analyzer/ngrep-1.45-r3
index 7655f6dd6b42..00d997b7ac8f 100644
--- a/metadata/md5-cache/net-analyzer/ngrep-1.45-r3
+++ b/metadata/md5-cache/net-analyzer/ngrep-1.45-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install preinst prepare
-DEPEND=net-libs/libpcap pcre? ( dev-libs/libpcre ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-libs/libpcap pcre? ( dev-libs/libpcre ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A grep for network layers
 EAPI=3
 HOMEPAGE=http://ngrep.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=ngrep
 RDEPEND=net-libs/libpcap pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=mirror://sourceforge/ngrep/ngrep-1.45.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8bc175f8f5473cc88e740913c37d845b
diff --git a/metadata/md5-cache/net-analyzer/nrpe-2.13-r4 b/metadata/md5-cache/net-analyzer/nrpe-2.13-r4
index 94ceb725db8e..f2144668f4a8 100644
--- a/metadata/md5-cache/net-analyzer/nrpe-2.13-r4
+++ b/metadata/md5-cache/net-analyzer/nrpe-2.13-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=ssl? ( dev-libs/openssl ) !minimal? ( tcpd? ( sys-apps/tcp-wrappers ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ssl? ( dev-libs/openssl ) !minimal? ( tcpd? ( sys-apps/tcp-wrappers ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Nagios Remote Plugin Executor
 EAPI=4
 HOMEPAGE=http://www.nagios.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl ) !minimal? ( tcpd? ( sys-apps/tcp-wrappers ) ) !minimal? ( >=net-analyzer/nagios-plugins-1.3.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/nrpe-2.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=da22c412b71e2be2fd36c646f076e084
diff --git a/metadata/md5-cache/net-analyzer/nrpe-2.14 b/metadata/md5-cache/net-analyzer/nrpe-2.14
index b00da36ea3bb..243330206095 100644
--- a/metadata/md5-cache/net-analyzer/nrpe-2.14
+++ b/metadata/md5-cache/net-analyzer/nrpe-2.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=ssl? ( dev-libs/openssl ) !minimal? ( tcpd? ( sys-apps/tcp-wrappers ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ssl? ( dev-libs/openssl ) !minimal? ( tcpd? ( sys-apps/tcp-wrappers ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Nagios Remote Plugin Executor
 EAPI=4
 HOMEPAGE=http://www.nagios.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=ssl? ( dev-libs/openssl ) !minimal? ( tcpd? ( sys-apps/tcp-wrappers ) ) !minimal? ( >=net-analyzer/nagios-plugins-1.3.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/nrpe-2.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c0e2ced1439ecf4f304b77b68cf467a9
diff --git a/metadata/md5-cache/net-analyzer/nsat-1.5 b/metadata/md5-cache/net-analyzer/nsat-1.5
index de5defd54f23..a180039bede3 100644
--- a/metadata/md5-cache/net-analyzer/nsat-1.5
+++ b/metadata/md5-cache/net-analyzer/nsat-1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=X? ( x11-libs/libX11 dev-lang/tk ) net-libs/libpcap >=sys-devel/autoconf-2.58 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=X? ( x11-libs/libX11 dev-lang/tk ) net-libs/libpcap >=sys-devel/autoconf-2.58 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Network Security Analysis Tool, an application-level network security scanner
 HOMEPAGE=http://nsat.sourceforge.net/
 IUSE=X
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libX11 dev-lang/tk ) net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/nsat/nsat-1.5.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9a8e46675b9a8bd1a66f84f65b63e639
diff --git a/metadata/md5-cache/net-analyzer/nsat-1.5-r1 b/metadata/md5-cache/net-analyzer/nsat-1.5-r1
index 4be4886f6a88..4db788550605 100644
--- a/metadata/md5-cache/net-analyzer/nsat-1.5-r1
+++ b/metadata/md5-cache/net-analyzer/nsat-1.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=X? ( x11-libs/libX11 dev-lang/tk ) net-libs/libpcap >=sys-devel/autoconf-2.58 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=X? ( x11-libs/libX11 dev-lang/tk ) net-libs/libpcap >=sys-devel/autoconf-2.58 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Network Security Analysis Tool, an application-level network security scanner
 EAPI=2
 HOMEPAGE=http://nsat.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libX11 dev-lang/tk ) net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/nsat/nsat-1.5.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7ffeeadcc9d95b3a20cb2b87dc38ee23
diff --git a/metadata/md5-cache/net-analyzer/ntop-4.0.1 b/metadata/md5-cache/net-analyzer/ntop-4.0.1
index 9f38755ad325..d5ce82508f25 100644
--- a/metadata/md5-cache/net-analyzer/ntop-4.0.1
+++ b/metadata/md5-cache/net-analyzer/ntop-4.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=virtual/awk 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/awk 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Network traffic analyzer with web interface
 EAPI=2
 HOMEPAGE=http://www.ntop.org/ntop.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/awk 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
 SLOT=0
 SRC_URI=mirror://sourceforge/ntop/ntop-4.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a060afb8bb2b68ec964054110d7b4e5
diff --git a/metadata/md5-cache/net-analyzer/ntop-4.0.3 b/metadata/md5-cache/net-analyzer/ntop-4.0.3
index 6a5a8955c749..2853e0dbf9dd 100644
--- a/metadata/md5-cache/net-analyzer/ntop-4.0.3
+++ b/metadata/md5-cache/net-analyzer/ntop-4.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=virtual/awk 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/awk 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Network traffic analyzer with web interface
 EAPI=2
 HOMEPAGE=http://www.ntop.org/products/ntop/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/awk 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
 SLOT=0
 SRC_URI=mirror://sourceforge/ntop/ntop-4.0.3.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e5187adbc96d1388c4f425e26a75c9e6
diff --git a/metadata/md5-cache/net-analyzer/ntop-4.1.0 b/metadata/md5-cache/net-analyzer/ntop-4.1.0
index 85b96b71f2bf..69e86ddc20ad 100644
--- a/metadata/md5-cache/net-analyzer/ntop-4.1.0
+++ b/metadata/md5-cache/net-analyzer/ntop-4.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=virtual/awk 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/awk 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Network traffic analyzer with web interface
 EAPI=2
 HOMEPAGE=http://www.ntop.org/products/ntop/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/awk 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 dev-libs/glib:2 dev-python/mako
 SLOT=0
 SRC_URI=mirror://sourceforge/ntop/ntop/Stable/ntop-4.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=95f40ab177ce6c4c246b8c58379fae40
diff --git a/metadata/md5-cache/net-analyzer/pchar-1.5-r1 b/metadata/md5-cache/net-analyzer/pchar-1.5-r1
index 758375a480e0..c7485a391291 100644
--- a/metadata/md5-cache/net-analyzer/pchar-1.5-r1
+++ b/metadata/md5-cache/net-analyzer/pchar-1.5-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.kitchenlab.org/www/bmah/Software/pchar/pchar-1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5e185b21ce479a8dafc142190b755237
diff --git a/metadata/md5-cache/net-analyzer/postal-0.70 b/metadata/md5-cache/net-analyzer/postal-0.70
index 3401806a2249..90e3de9d2fb5 100644
--- a/metadata/md5-cache/net-analyzer/postal-0.70
+++ b/metadata/md5-cache/net-analyzer/postal-0.70
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup unpack
-DEPEND=ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8g ) gnutls? ( >=net-libs/gnutls-2.2.2 ) ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8g ) gnutls? ( >=net-libs/gnutls-2.2.2 ) ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=SMTP and POP mailserver benchmark. Supports SSL, randomized user accounts and more.
 HOMEPAGE=http://www.coker.com.au/postal/
 IUSE=ssl gnutls
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8g ) gnutls? ( >=net-libs/gnutls-2.2.2 ) )
 SLOT=0
 SRC_URI=http://www.coker.com.au/postal/postal-0.70.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d9fbfec7847821ce0c8f28465f4e4743
diff --git a/metadata/md5-cache/net-analyzer/postal-0.72 b/metadata/md5-cache/net-analyzer/postal-0.72
index 9ed6f075320f..a5ce7ce30c00 100644
--- a/metadata/md5-cache/net-analyzer/postal-0.72
+++ b/metadata/md5-cache/net-analyzer/postal-0.72
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8g ) gnutls? ( >=net-libs/gnutls-2.2.2 ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8g ) gnutls? ( >=net-libs/gnutls-2.2.2 ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=SMTP and POP mailserver benchmark. Supports SSL, randomized user accounts and more.
 EAPI=4
 HOMEPAGE=http://www.coker.com.au/postal/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8g ) gnutls? ( >=net-libs/gnutls-2.2.2 ) )
 SLOT=0
 SRC_URI=http://www.coker.com.au/postal/postal-0.72.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cc9044e37c0c0ec7ed3ecd31f272d293
diff --git a/metadata/md5-cache/net-analyzer/raddump-0.2.1 b/metadata/md5-cache/net-analyzer/raddump-0.2.1
index a4320164b48e..80522786f82d 100644
--- a/metadata/md5-cache/net-analyzer/raddump-0.2.1
+++ b/metadata/md5-cache/net-analyzer/raddump-0.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=>=net-analyzer/tcpdump-3.8.3-r1 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-analyzer/tcpdump-3.8.3-r1 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=raddump interprets captured RADIUS packets to print a timestamp, packet length, RADIUS packet type, source and destination hosts and ports, and included attribute names and values for each packet.
 HOMEPAGE=http://sourceforge.net/projects/raddump/
 KEYWORDS=~x86 ~ppc
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-analyzer/tcpdump-3.8.3-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/raddump/raddump-0.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=c0bb0675a5bbda16b1c6d37d1ffaaa27
diff --git a/metadata/md5-cache/net-analyzer/raddump-0.3.1 b/metadata/md5-cache/net-analyzer/raddump-0.3.1
index 9f97c8f5804b..5b8613924a96 100644
--- a/metadata/md5-cache/net-analyzer/raddump-0.3.1
+++ b/metadata/md5-cache/net-analyzer/raddump-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=>=net-analyzer/tcpdump-3.8.3-r1 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-analyzer/tcpdump-3.8.3-r1 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=raddump interprets captured RADIUS packets to print a timestamp, packet length, RADIUS packet type, source and destination hosts and ports, and included attribute names and values for each packet.
 HOMEPAGE=http://sourceforge.net/projects/raddump/
 KEYWORDS=amd64 ~ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-analyzer/tcpdump-3.8.3-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/raddump/raddump-0.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=b17e842207978e944cde2562ef1321b4
diff --git a/metadata/md5-cache/net-analyzer/rain-1.2.9_beta1 b/metadata/md5-cache/net-analyzer/rain-1.2.9_beta1
index 756afe599ea1..0cfaf6aa2e8c 100644
--- a/metadata/md5-cache/net-analyzer/rain-1.2.9_beta1
+++ b/metadata/md5-cache/net-analyzer/rain-1.2.9_beta1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=powerful tool for testing stability of hardware and software utilizing IP protocols
 EAPI=2
 HOMEPAGE=http://www.mirrors.wiretapped.net/security/packet-construction/rain/
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bd5a27c37fb9a511c60431e99d969f40
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.4.5-r1 b/metadata/md5-cache/net-analyzer/rrdtool-1.4.5-r1
index b75612a60207..96a23078c939 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.4.5-r1
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.4.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=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 ) virtual/pkgconfig virtual/awk python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig virtual/awk python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A system to store and display time-series data
 EAPI=3
 HOMEPAGE=http://oss.oetiker.ch/rrdtool/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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* )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=22042c411e5b83c35ca22129661217f9
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.4.5-r2 b/metadata/md5-cache/net-analyzer/rrdtool-1.4.5-r2
index 2d1061b977a0..9ce7e746e1cd 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.4.5-r2
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.4.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=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 ) virtual/pkgconfig virtual/awk python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig virtual/awk python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A system to store and display time-series data
 EAPI=3
 HOMEPAGE=http://oss.oetiker.ch/rrdtool/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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* )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=48d8abb01bf97e0819304500a9dd92a1
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.4.7-r1 b/metadata/md5-cache/net-analyzer/rrdtool-1.4.7-r1
index e72eada89321..acdf5ca46cbc 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.4.7-r1
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.4.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=media-libs/libpng-1.5.10 >=dev-libs/libxml2-2.7.8 >=x11-libs/cairo-1.10.2[svg] >=dev-libs/glib-2.28.7 >=x11-libs/pango-1.28 lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 ) tcl? ( dev-lang/tcl ) tcpd? ( sys-apps/tcp-wrappers ) dbi? ( dev-db/libdbi ) virtual/pkgconfig virtual/awk python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libpng-1.5.10 >=dev-libs/libxml2-2.7.8 >=x11-libs/cairo-1.10.2[svg] >=dev-libs/glib-2.28.7 >=x11-libs/pango-1.28 lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 ) tcl? ( dev-lang/tcl ) tcpd? ( sys-apps/tcp-wrappers ) dbi? ( dev-db/libdbi ) virtual/pkgconfig virtual/awk python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A system to store and display time-series data
 EAPI=4
 HOMEPAGE=http://oss.oetiker.ch/rrdtool/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.5.10 >=dev-libs/libxml2-2.7.8 >=x11-libs/cairo-1.10.2[svg] >=dev-libs/glib-2.28.7 >=x11-libs/pango-1.28 lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 ) tcl? ( dev-lang/tcl ) tcpd? ( sys-apps/tcp-wrappers ) dbi? ( dev-db/libdbi ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2c13e4db2380aa944c8eae00d35ac215
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.4.7-r2 b/metadata/md5-cache/net-analyzer/rrdtool-1.4.7-r2
index 19126666e79d..f16facdf2698 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.4.7-r2
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.4.7-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.28.7[static-libs(+)?] >=dev-libs/libxml2-2.7.8[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) python? ( python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 ) tcl? ( dev-lang/tcl ) tcpd? ( sys-apps/tcp-wrappers ) virtual/pkgconfig virtual/awk python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.28.7[static-libs(+)?] >=dev-libs/libxml2-2.7.8[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) python? ( python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 ) tcl? ( dev-lang/tcl ) tcpd? ( sys-apps/tcp-wrappers ) virtual/pkgconfig virtual/awk python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A system to store and display time-series data
 EAPI=5
 HOMEPAGE=http://oss.oetiker.ch/rrdtool/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.28.7[static-libs(+)?] >=dev-libs/libxml2-2.7.8[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) python? ( python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 ) tcl? ( dev-lang/tcl ) tcpd? ( sys-apps/tcp-wrappers ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8d41cd9b6ec9a99f47e3cbdb957dcbb1
diff --git a/metadata/md5-cache/net-analyzer/sarg-2.3.3-r1 b/metadata/md5-cache/net-analyzer/sarg-2.3.3-r1
index 64f2e6cdb7b4..9b14ff453348 100644
--- a/metadata/md5-cache/net-analyzer/sarg-2.3.3-r1
+++ b/metadata/md5-cache/net-analyzer/sarg-2.3.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=gd? ( media-libs/gd[png,truetype] ) pcre? ( dev-libs/libpcre ) ldap? ( net-nds/openldap ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gd? ( media-libs/gd[png,truetype] ) pcre? ( dev-libs/libpcre ) ldap? ( net-nds/openldap ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Squid Analysis Report Generator
 EAPI=4
 HOMEPAGE=http://sarg.sourceforge.net/sarg.php
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gd? ( media-libs/gd[png,truetype] ) pcre? ( dev-libs/libpcre ) ldap? ( net-nds/openldap )
 SLOT=0
 SRC_URI=mirror://sourceforge/sarg/sarg-2.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e261443528cf30a05385fb30c00878cd
diff --git a/metadata/md5-cache/net-analyzer/sarg-2.3.4 b/metadata/md5-cache/net-analyzer/sarg-2.3.4
index 7180f6465573..28a0ff926df3 100644
--- a/metadata/md5-cache/net-analyzer/sarg-2.3.4
+++ b/metadata/md5-cache/net-analyzer/sarg-2.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=gd? ( media-libs/gd[png,truetype] ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gd? ( media-libs/gd[png,truetype] ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Squid Analysis Report Generator
 EAPI=5
 HOMEPAGE=http://sarg.sourceforge.net/sarg.php
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gd? ( media-libs/gd[png,truetype] ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=mirror://sourceforge/sarg/sarg-2.3.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c47df1c0766c16307fc4abd9b5673565
diff --git a/metadata/md5-cache/net-analyzer/sflowtool-3.27 b/metadata/md5-cache/net-analyzer/sflowtool-3.27
index d71ca30e6d16..c34568caef72 100644
--- a/metadata/md5-cache/net-analyzer/sflowtool-3.27
+++ b/metadata/md5-cache/net-analyzer/sflowtool-3.27
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=sflowtool is a utility for collecting and processing sFlow data
 EAPI=4
 HOMEPAGE=http://www.inmon.com/technology/sflowTools.php
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=inmon-sflow
 SLOT=0
 SRC_URI=http://www.inmon.com/bin/sflowtool-3.27.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c1a3c8f3574fa8e48a12c5a71c728b4c
diff --git a/metadata/md5-cache/net-analyzer/sinfo-0.0.47 b/metadata/md5-cache/net-analyzer/sinfo-0.0.47
index b700358df1f3..62856de785cb 100644
--- a/metadata/md5-cache/net-analyzer/sinfo-0.0.47
+++ b/metadata/md5-cache/net-analyzer/sinfo-0.0.47
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-cluster/slurm dev-libs/boost sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.ant.uni-bremen.de/whomes/rinas/sinfo/download/sinfo-0.0.47.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7ded71f8f25e47e7f88631da5db6b3ed
diff --git a/metadata/md5-cache/net-analyzer/slurm-0.3.3 b/metadata/md5-cache/net-analyzer/slurm-0.3.3
index e874952e39c2..c0ac82dfe893 100644
--- a/metadata/md5-cache/net-analyzer/slurm-0.3.3
+++ b/metadata/md5-cache/net-analyzer/slurm-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Realtime network interface monitor based on FreeBSD's pppstatus
 HOMEPAGE=http://www.wormulon.net/projects/slurm
 KEYWORDS=amd64 ~ppc ~sparc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.wormulon.net/files/code/slurm/slurm-0.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a84c3fe72db82b344ac85d37501769a8
diff --git a/metadata/md5-cache/net-analyzer/slurm-0.3.3-r1 b/metadata/md5-cache/net-analyzer/slurm-0.3.3-r1
index 7814ef0a41e5..e02acb894277 100644
--- a/metadata/md5-cache/net-analyzer/slurm-0.3.3-r1
+++ b/metadata/md5-cache/net-analyzer/slurm-0.3.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Realtime network interface monitor based on FreeBSD's pppstatus
 EAPI=4
 HOMEPAGE=http://www.wormulon.net/projects/slurm
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.wormulon.net/files/code/slurm/slurm-0.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3f249f111979135e62aac766bf421096
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.0.5 b/metadata/md5-cache/net-analyzer/snort-2.9.0.5
index b51734f91657..f84c897ec9a0 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.0.5
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The de facto standard for intrusion detection/prevention
 EAPI=2
 HOMEPAGE=http://www.snort.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://www.snort.org/dl/snort-current/snort-2.9.0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d428c9be87da7f9b1881b2b52a794e36
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.1 b/metadata/md5-cache/net-analyzer/snort-2.9.1
index 2c2e0953352d..e242a0d6f86a 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.1
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The de facto standard for intrusion detection/prevention
 EAPI=2
 HOMEPAGE=http://www.snort.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://www.snort.org/dl/snort-current/snort-2.9.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ecfb4859185d49b620b8b6a214d28b93
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.2.1 b/metadata/md5-cache/net-analyzer/snort-2.9.2.1
index 45d34617c750..b02150293a13 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.2.1
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The de facto standard for intrusion detection/prevention
 EAPI=2
 HOMEPAGE=http://www.snort.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://www.snort.org/dl/snort-current/snort-2.9.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bddeb0967f2b1423af8e38e7fb643248
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.2.2 b/metadata/md5-cache/net-analyzer/snort-2.9.2.2
index 6d319a8f5060..f191f243fd6e 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.2.2
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The de facto standard for intrusion detection/prevention
 EAPI=2
 HOMEPAGE=http://www.snort.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://www.snort.org/dl/snort-current/snort-2.9.2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=771c889518129268e5223f6d13f4238b
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.2.3 b/metadata/md5-cache/net-analyzer/snort-2.9.2.3
index a01788fe25f7..23ed2281b08f 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.2.3
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The de facto standard for intrusion detection/prevention
 EAPI=2
 HOMEPAGE=http://www.snort.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://www.snort.org/dl/snort-current/snort-2.9.2.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=772330d00bdf08a128ff3c45f5c62e79
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.2.3-r1 b/metadata/md5-cache/net-analyzer/snort-2.9.2.3-r1
index d2af1d2e051a..e18035a0f339 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.2.3-r1
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.2.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The de facto standard for intrusion detection/prevention
 EAPI=5
 HOMEPAGE=http://www.snort.org/
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libpcap-1.0.0 >=net-libs/daq-0.6 >=dev-libs/libpcre-6.0 dev-l
 REQUIRED_USE=zlib? ( dynamicplugin )
 SLOT=0
 SRC_URI=http://www.snort.org/dl/snort-current/snort-2.9.2.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=df0e8c5131838d0a1c7e9fbcec528741
diff --git a/metadata/md5-cache/net-analyzer/ssldump-0.9-r2 b/metadata/md5-cache/net-analyzer/ssldump-0.9-r2
index 61a8505a4588..7bd984ac8e60 100644
--- a/metadata/md5-cache/net-analyzer/ssldump-0.9-r2
+++ b/metadata/md5-cache/net-analyzer/ssldump-0.9-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-libs/libpcap ssl? ( >=dev-libs/openssl-1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-libs/libpcap ssl? ( >=dev-libs/openssl-1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Tool for network monitoring and data acquisition
 EAPI=5
 HOMEPAGE=http://www.rtfm.com/ssldump/
@@ -9,5 +9,5 @@ LICENSE=openssl
 RDEPEND=net-libs/libpcap ssl? ( >=dev-libs/openssl-1 )
 SLOT=0
 SRC_URI=http://www.rtfm.com/ssldump/ssldump-0.9b3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3dd9ff109faf9b504d8c589a53d2df81
diff --git a/metadata/md5-cache/net-analyzer/sslsniff-0.6 b/metadata/md5-cache/net-analyzer/sslsniff-0.6
index 4d79c055b202..ad1e235afe74 100644
--- a/metadata/md5-cache/net-analyzer/sslsniff-0.6
+++ b/metadata/md5-cache/net-analyzer/sslsniff-0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/boost dev-libs/log4cpp dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/boost dev-libs/log4cpp dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MITM all SSL connections on a LAN and dynamically generates certs
 EAPI=2
 HOMEPAGE=http://thoughtcrime.org/software/sslsniff/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/boost dev-libs/log4cpp dev-libs/openssl
 SLOT=0
 SRC_URI=http://thoughtcrime.org/software/sslsniff/sslsniff-0.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e78b6a81d0e47ab60ba6a4363877d6f4
diff --git a/metadata/md5-cache/net-analyzer/sslsniff-0.8-r1 b/metadata/md5-cache/net-analyzer/sslsniff-0.8-r1
index 99e20e583aa4..b1a19b1e2dd6 100644
--- a/metadata/md5-cache/net-analyzer/sslsniff-0.8-r1
+++ b/metadata/md5-cache/net-analyzer/sslsniff-0.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/boost dev-libs/log4cpp dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/boost dev-libs/log4cpp dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MITM all SSL connections on a LAN and dynamically generates certs
 EAPI=4
 HOMEPAGE=http://thoughtcrime.org/software/sslsniff/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/boost dev-libs/log4cpp dev-libs/openssl
 SLOT=0
 SRC_URI=http://thoughtcrime.org/software/sslsniff/sslsniff-0.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cc0a2995879f14848bf424f5039ff7c6
diff --git a/metadata/md5-cache/net-analyzer/synscan-5.01 b/metadata/md5-cache/net-analyzer/synscan-5.01
index e36b16d0ed02..df65ad2a581a 100644
--- a/metadata/md5-cache/net-analyzer/synscan-5.01
+++ b/metadata/md5-cache/net-analyzer/synscan-5.01
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/libpcap || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-libs/libpcap || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fast asynchronous half-open TCP portscanner
 EAPI=3
 HOMEPAGE=http://www.digit-labs.org/files/tools/synscan/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=http://www.digit-labs.org/files/tools/synscan/releases/synscan-5.01.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3ba5a675a7e3cd34dada2734f9cc1288
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.3.0 b/metadata/md5-cache/net-analyzer/tcpdump-4.3.0
index d8002f29b4c8..f0bbf632dfad 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.3.0
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libpcap smi? ( net-libs/libsmi ) ssl? ( >=dev-libs/openssl-0.9.6m )
 SLOT=0
 SRC_URI=http://www.tcpdump.org/release/tcpdump-4.3.0.tar.gz http://www.jp.tcpdump.org/release/tcpdump-4.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=022518cbfa0d1d8a3b12a1e735d520e4
diff --git a/metadata/md5-cache/net-analyzer/tcpreplay-3.4.4-r2 b/metadata/md5-cache/net-analyzer/tcpreplay-3.4.4-r2
index 541fddede264..2f9416588532 100644
--- a/metadata/md5-cache/net-analyzer/tcpreplay-3.4.4-r2
+++ b/metadata/md5-cache/net-analyzer/tcpreplay-3.4.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare test
-DEPEND=>=sys-devel/autogen-5.9.8 dev-libs/libdnet >=net-libs/libpcap-0.9 tcpdump? ( net-analyzer/tcpdump ) pcapnav? ( net-libs/libpcapnav ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-devel/autogen-5.9.8 dev-libs/libdnet >=net-libs/libpcap-0.9 tcpdump? ( net-analyzer/tcpdump ) pcapnav? ( net-libs/libpcapnav ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=replay saved tcpdump or snoop files at arbitrary speeds
 EAPI=4
 HOMEPAGE=http://tcpreplay.synfin.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=sys-devel/autogen-5.9.8 dev-libs/libdnet >=net-libs/libpcap-0.9 tcpdump? ( net-analyzer/tcpdump ) pcapnav? ( net-libs/libpcapnav )
 SLOT=0
 SRC_URI=mirror://sourceforge/tcpreplay/tcpreplay-3.4.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e8e26535612638a63a20ff34f6a67172
diff --git a/metadata/md5-cache/net-analyzer/tcpstat-1.5-r1 b/metadata/md5-cache/net-analyzer/tcpstat-1.5-r1
index 753b41b1df16..79fc7db4e9e0 100644
--- a/metadata/md5-cache/net-analyzer/tcpstat-1.5-r1
+++ b/metadata/md5-cache/net-analyzer/tcpstat-1.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=net-libs/libpcap || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-libs/libpcap || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Reports network interface statistics
 HOMEPAGE=http://www.frenchfries.net/paul/tcpstat/
 IUSE=ipv6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=http://www.frenchfries.net/paul/tcpstat/tcpstat-1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8ca81e0953c169e6b5c29827ab2bd0a0
diff --git a/metadata/md5-cache/net-analyzer/tcptrack-1.4.2 b/metadata/md5-cache/net-analyzer/tcptrack-1.4.2
index 4c8975ef7bdc..d025a9acbdb5 100644
--- a/metadata/md5-cache/net-analyzer/tcptrack-1.4.2
+++ b/metadata/md5-cache/net-analyzer/tcptrack-1.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=net-libs/libpcap sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-libs/libpcap sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Passive per-connection tcp bandwidth monitor
 EAPI=4
 HOMEPAGE=http://www.rhythm.cx/~steve/devel/tcptrack/
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=net-libs/libpcap sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.rhythm.cx/~steve/devel/tcptrack/release/1.4.2/source/tcptrack-1.4.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=ed61c7fdad198a4627adb9563fd708ec
diff --git a/metadata/md5-cache/net-analyzer/thrulay-0.9-r1 b/metadata/md5-cache/net-analyzer/thrulay-0.9-r1
index c0b6c275cfff..5d2f9e84241a 100644
--- a/metadata/md5-cache/net-analyzer/thrulay-0.9-r1
+++ b/metadata/md5-cache/net-analyzer/thrulay-0.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Measure the capacity of a network by sending a bulk TCP stream over it.
 EAPI=4
 HOMEPAGE=http://www.internet2.edu/~shalunov/thrulay/
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.internet2.edu/~shalunov/thrulay/thrulay-0.9.tar.gz mirror://sourceforge/thrulay/thrulay-0.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=521990927d585daf69eda39d38bd7115
diff --git a/metadata/md5-cache/net-analyzer/traceproto-1.1.2_beta1 b/metadata/md5-cache/net-analyzer/traceproto-1.1.2_beta1
index 8971661249fb..29ce361cf60e 100644
--- a/metadata/md5-cache/net-analyzer/traceproto-1.1.2_beta1
+++ b/metadata/md5-cache/net-analyzer/traceproto-1.1.2_beta1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=net-libs/libnet-1.1.0 net-libs/libpcap ncurses? ( sys-libs/ncurses ) debug? ( dev-libs/dmalloc ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-libs/libnet-1.1.0 net-libs/libpcap ncurses? ( sys-libs/ncurses ) debug? ( dev-libs/dmalloc ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A traceroute-like utility that sends packets based on protocol
 HOMEPAGE=http://traceproto.sourceforge.net/
 IUSE=debug ncurses
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libnet-1.1.0 net-libs/libpcap ncurses? ( sys-libs/ncurses ) debug? ( dev-libs/dmalloc )
 SLOT=0
 SRC_URI=mirror://gentoo/traceproto-1.1.2beta1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=af3830c449c64b025488c039e558e0e8
diff --git a/metadata/md5-cache/net-analyzer/upnpscan-0.4-r2 b/metadata/md5-cache/net-analyzer/upnpscan-0.4-r2
index 2d398eccb08e..ea37067edeb7 100644
--- a/metadata/md5-cache/net-analyzer/upnpscan-0.4-r2
+++ b/metadata/md5-cache/net-analyzer/upnpscan-0.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Scans the network for UPNP capable devices
 EAPI=2
 HOMEPAGE=http://www.cqure.net/wp/upnpscan/
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.cqure.net/tools/upnpscan-v0.4-src.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=50e1d22d35c61c58de99ccf811070766
diff --git a/metadata/md5-cache/net-analyzer/upnpscan-0.4-r3 b/metadata/md5-cache/net-analyzer/upnpscan-0.4-r3
index f19b8af7f919..45352669c1b0 100644
--- a/metadata/md5-cache/net-analyzer/upnpscan-0.4-r3
+++ b/metadata/md5-cache/net-analyzer/upnpscan-0.4-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Scans the network for UPNP capable devices
 EAPI=4
 HOMEPAGE=http://www.cqure.net/wp/upnpscan/
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.cqure.net/tools/upnpscan-v0.4-src.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ba33bd76279366192b7e891a27bc7721
diff --git a/metadata/md5-cache/net-analyzer/wireshark-1.6.14 b/metadata/md5-cache/net-analyzer/wireshark-1.6.14
index 8ebdb680b0e3..35e6e78f619f 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-1.6.14
+++ b/metadata/md5-cache/net-analyzer/wireshark-1.6.14
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.14:2 adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) crypt? ( dev-libs/libgcrypt ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( <net-libs/gnutls-3 ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl doc? ( app-doc/doxygen dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) ) sys-apps/sed sys-devel/bison sys-devel/flex virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool filecaps? ( sys-libs/libcap ) python? ( =dev-lang/python-2* )
+DEPEND=>=dev-libs/glib-2.14:2 adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) crypt? ( dev-libs/libgcrypt ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( <net-libs/gnutls-3 ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl doc? ( app-doc/doxygen dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) ) sys-apps/sed sys-devel/bison sys-devel/flex virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool filecaps? ( sys-libs/libcap ) python? ( =dev-lang/python-2* )
 DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=5
 HOMEPAGE=http://www.wireshark.org/
-IUSE=adns crypt doc doc-pdf +filecaps geoip gtk ipv6 kerberos libadns lua +pcap portaudio profile python selinux smi ssl threads zlib +filecaps
+IUSE=adns +caps crypt doc doc-pdf geoip gtk ipv6 kerberos libadns lua +pcap portaudio profile python selinux smi ssl threads zlib +filecaps
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) crypt? ( dev-libs/libgcrypt ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( <net-libs/gnutls-3 ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) python? ( =dev-lang/python-2* )
+RDEPEND=>=dev-libs/glib-2.14:2 adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) crypt? ( dev-libs/libgcrypt ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( <net-libs/gnutls-3 ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) python? ( =dev-lang/python-2* )
 SLOT=0/1.6.14
 SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-1.6.14.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fcaps	6719ae71a423a3f427a62731d126b098	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6eaf4e94af60a12bfe7e0954166a90c4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fcaps	6719ae71a423a3f427a62731d126b098	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7e4ba4c00aab66862f194ee76daf05a8
diff --git a/metadata/md5-cache/net-analyzer/wireshark-1.6.14-r1 b/metadata/md5-cache/net-analyzer/wireshark-1.6.14-r1
index 6dfad60690c5..282345f104e2 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-1.6.14-r1
+++ b/metadata/md5-cache/net-analyzer/wireshark-1.6.14-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.14:2 adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) crypt? ( dev-libs/libgcrypt ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( <net-libs/gnutls-3 ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl doc? ( app-doc/doxygen dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) ) sys-apps/sed sys-devel/bison sys-devel/flex virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool filecaps? ( sys-libs/libcap )
+DEPEND=>=dev-libs/glib-2.14:2 adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) crypt? ( dev-libs/libgcrypt ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( <net-libs/gnutls-3 ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl doc? ( app-doc/doxygen dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) ) sys-apps/sed sys-devel/bison sys-devel/flex virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool filecaps? ( sys-libs/libcap )
 DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=5
 HOMEPAGE=http://www.wireshark.org/
-IUSE=adns crypt doc doc-pdf +filecaps geoip gtk ipv6 kerberos libadns lua +pcap portaudio profile python selinux smi ssl threads zlib +filecaps python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7
+IUSE=adns +caps crypt doc doc-pdf geoip gtk ipv6 kerberos libadns lua +pcap portaudio profile python selinux smi ssl threads zlib +filecaps python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) crypt? ( dev-libs/libgcrypt ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( <net-libs/gnutls-3 ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+RDEPEND=>=dev-libs/glib-2.14:2 adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) crypt? ( dev-libs/libgcrypt ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( <net-libs/gnutls-3 ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
 SLOT=0/1.6.14
 SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-1.6.14.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fcaps	6719ae71a423a3f427a62731d126b098	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=791ae90c3a8d7c2f73ecd1deeb5c639e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fcaps	6719ae71a423a3f427a62731d126b098	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=25064878ce661cce309a850122e6b258
diff --git a/metadata/md5-cache/net-analyzer/wireshark-1.8.6 b/metadata/md5-cache/net-analyzer/wireshark-1.8.6
index a47c522ea445..ad592b9f6db9 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-1.8.6
+++ b/metadata/md5-cache/net-analyzer/wireshark-1.8.6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.14:2 adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) crypt? ( dev-libs/libgcrypt ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl doc? ( app-doc/doxygen dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) ) sys-apps/sed sys-devel/bison sys-devel/flex virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool filecaps? ( sys-libs/libcap ) python? ( =dev-lang/python-2* )
+DEPEND=>=dev-libs/glib-2.14:2 adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) crypt? ( dev-libs/libgcrypt ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl doc? ( app-doc/doxygen dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) ) sys-apps/sed sys-devel/bison sys-devel/flex virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool filecaps? ( sys-libs/libcap ) python? ( =dev-lang/python-2* )
 DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=5
 HOMEPAGE=http://www.wireshark.org/
-IUSE=adns crypt doc doc-pdf +filecaps geoip gtk ipv6 kerberos libadns lua +pcap portaudio profile python selinux smi ssl zlib +filecaps
+IUSE=adns +caps crypt doc doc-pdf geoip gtk ipv6 kerberos libadns lua +pcap portaudio profile python selinux smi ssl zlib +filecaps
 KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) crypt? ( dev-libs/libgcrypt ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) python? ( =dev-lang/python-2* )
+RDEPEND=>=dev-libs/glib-2.14:2 adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) crypt? ( dev-libs/libgcrypt ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) python? ( =dev-lang/python-2* )
 SLOT=0/1.8.6
 SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-1.8.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fcaps	6719ae71a423a3f427a62731d126b098	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b4934f953e854d07075a2fd07686cedf
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fcaps	6719ae71a423a3f427a62731d126b098	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c6eb5d1727806c6e01b98b7b82700646
diff --git a/metadata/md5-cache/net-analyzer/wireshark-1.8.6-r1 b/metadata/md5-cache/net-analyzer/wireshark-1.8.6-r1
index d50d2cb439d7..f6bc5f3e0e3b 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-1.8.6-r1
+++ b/metadata/md5-cache/net-analyzer/wireshark-1.8.6-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.14:2 adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) crypt? ( dev-libs/libgcrypt ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl doc? ( app-doc/doxygen dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) ) sys-apps/sed sys-devel/bison sys-devel/flex virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool filecaps? ( sys-libs/libcap )
+DEPEND=>=dev-libs/glib-2.14:2 adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) caps? ( sys-libs/libcap ) crypt? ( dev-libs/libgcrypt ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl doc? ( app-doc/doxygen dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) ) sys-apps/sed sys-devel/bison sys-devel/flex virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool filecaps? ( sys-libs/libcap )
 DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=5
 HOMEPAGE=http://www.wireshark.org/
-IUSE=adns crypt doc doc-pdf +filecaps geoip gtk ipv6 kerberos libadns lua +pcap portaudio profile python selinux smi ssl zlib +filecaps python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7
+IUSE=adns +caps crypt doc doc-pdf geoip gtk ipv6 kerberos libadns lua +pcap portaudio profile python selinux smi ssl zlib +filecaps python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) crypt? ( dev-libs/libgcrypt ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+RDEPEND=>=dev-libs/glib-2.14:2 adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) caps? ( sys-libs/libcap ) crypt? ( dev-libs/libgcrypt ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
 SLOT=0/1.8.6
 SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-1.8.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fcaps	6719ae71a423a3f427a62731d126b098	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3a60dd4388a664f7ad3011965a7aee0b
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fcaps	6719ae71a423a3f427a62731d126b098	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f3413e4e7694d1c8c2c7ff610163cd4c
diff --git a/metadata/md5-cache/net-analyzer/wireshark-1.9.2 b/metadata/md5-cache/net-analyzer/wireshark-1.9.2
index cac8392dc21c..27e834149067 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-1.9.2
+++ b/metadata/md5-cache/net-analyzer/wireshark-1.9.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl ) adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) crypt? ( dev-libs/libgcrypt ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap[-netlink] ) portaudio? ( media-libs/portaudio ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl doc? ( app-doc/doxygen dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) ) sys-apps/sed sys-devel/bison sys-devel/flex virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool filecaps? ( sys-libs/libcap )
+DEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl ) adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) crypt? ( dev-libs/libgcrypt ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap[-netlink] ) portaudio? ( media-libs/portaudio ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl doc? ( app-doc/doxygen dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) ) sys-apps/sed sys-devel/bison sys-devel/flex virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool filecaps? ( sys-libs/libcap )
 DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=5
 HOMEPAGE=http://www.wireshark.org/
-IUSE=adns crypt doc doc-pdf +filecaps geoip gtk ipv6 kerberos libadns lua +netlink +pcap portaudio profile python selinux smi ssl zlib +filecaps python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7
+IUSE=adns +caps crypt doc doc-pdf geoip gtk ipv6 kerberos libadns lua +netlink +pcap portaudio profile python selinux smi ssl zlib +filecaps python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl ) adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) crypt? ( dev-libs/libgcrypt ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap[-netlink] ) portaudio? ( media-libs/portaudio ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl ) adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) crypt? ( dev-libs/libgcrypt ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap[-netlink] ) portaudio? ( media-libs/portaudio ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls dev-libs/libgcrypt ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
 SLOT=0/1.9.2
 SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-1.9.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fcaps	6719ae71a423a3f427a62731d126b098	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b552d6b835c45c7b9a3797562373eddf
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fcaps	6719ae71a423a3f427a62731d126b098	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=162a0dbeada0b5c5dc630b01647b79ee
diff --git a/metadata/md5-cache/net-analyzer/zabbix-1.8.16 b/metadata/md5-cache/net-analyzer/zabbix-1.8.16
index fee34bf881a3..df0c763b6ec7 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-1.8.16
+++ b/metadata/md5-cache/net-analyzer/zabbix-1.8.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare prerm setup
-DEPEND=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 ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers.
 EAPI=2
 HOMEPAGE=http://www.zabbix.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) proxy? ( <=net-analyzer/fping-2.9 ) server? ( <=net-analyzer/fping-2.9 app-admin/webapp-config ) frontend? ( dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session] media-libs/gd[png] app-admin/webapp-config )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-1.8.16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.php	df169a364e191b840b695604097e3c21	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.php	df169a364e191b840b695604097e3c21	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=0a445651cbf711aaf40f3dc6eeda47a1
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.0.4-r1 b/metadata/md5-cache/net-analyzer/zabbix-2.0.4-r1
index 5b20f76ac3f3..8ff9294d745b 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-2.0.4-r1
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.0.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( >=dev-db/postgresql-base-8.3.0 ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( >=virtual/jdk-1.4 ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( >=dev-db/postgresql-base-8.3.0 ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( >=virtual/jdk-1.4 ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers.
 EAPI=2
 HOMEPAGE=http://www.zabbix.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( >=dev-db/postgresql-base-8.3.0 ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( >=virtual/jdk-1.4 ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) proxy? ( <=net-analyzer/fping-2.9 ) server? ( <=net-analyzer/fping-2.9 app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api dev-java/json-simple ) frontend? ( dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.php	df169a364e191b840b695604097e3c21	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.php	df169a364e191b840b695604097e3c21	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=1af5184aa2835074a2bf9cfa7edbb4d6
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.0.5 b/metadata/md5-cache/net-analyzer/zabbix-2.0.5
index 485bc3c1783e..1a60aa87cd01 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-2.0.5
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( >=dev-db/postgresql-base-8.3.0 ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( >=virtual/jdk-1.4 ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( >=dev-db/postgresql-base-8.3.0 ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( >=virtual/jdk-1.4 ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers.
 EAPI=2
 HOMEPAGE=http://www.zabbix.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( >=dev-db/postgresql-base-8.3.0 ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( >=virtual/jdk-1.4 ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) proxy? ( <=net-analyzer/fping-2.9 ) server? ( <=net-analyzer/fping-2.9 app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api dev-java/json-simple ) frontend? ( dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.php	df169a364e191b840b695604097e3c21	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.php	df169a364e191b840b695604097e3c21	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=9c1c04372b2eefa5b4ba3a53996bf861
diff --git a/metadata/md5-cache/net-dialup/capifwd-0.6.3-r1 b/metadata/md5-cache/net-dialup/capifwd-0.6.3-r1
index 3e6305b22fb5..806464979710 100644
--- a/metadata/md5-cache/net-dialup/capifwd-0.6.3-r1
+++ b/metadata/md5-cache/net-dialup/capifwd-0.6.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=net-dialup/capi4k-utils || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-dialup/capi4k-utils || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A daemon forwarding CAPI messages to capi20proxy clients
 HOMEPAGE=http://capi20proxy.sourceforge.net/
 KEYWORDS=~amd64 x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/capi4k-utils
 SLOT=0
 SRC_URI=mirror://sourceforge/capi20proxy/capifwd-0.6.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=38d0cf04219e09709c3dfd40ee2188ad
diff --git a/metadata/md5-cache/net-dialup/capisuite-0.4.5-r6 b/metadata/md5-cache/net-dialup/capisuite-0.4.5-r6
index 42b35eaafe88..a878d8c17538 100644
--- a/metadata/md5-cache/net-dialup/capisuite-0.4.5-r6
+++ b/metadata/md5-cache/net-dialup/capisuite-0.4.5-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=dev-lang/python media-sound/sox >=media-libs/tiff-3.7.1 media-gfx/jpeg2ps media-gfx/sfftobmp app-text/ghostscript-gpl net-dialup/capi4k-utils || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/python media-sound/sox >=media-libs/tiff-3.7.1 media-gfx/jpeg2ps media-gfx/sfftobmp app-text/ghostscript-gpl net-dialup/capi4k-utils || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ISDN telecommunication suite providing fax and voice services
 HOMEPAGE=http://www.capisuite.org
 KEYWORDS=amd64 ~ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/python media-sound/sox >=media-libs/tiff-3.7.1 media-gfx/jpeg2ps media-gfx/sfftobmp app-text/ghostscript-gpl net-dialup/capi4k-utils virtual/mta
 SLOT=0
 SRC_URI=http://www.capisuite.org/capisuite-0.4.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=69591fb7eadcc0f706fd4a0a25b8b3f8
diff --git a/metadata/md5-cache/net-dialup/capisuite-0.4.5-r7 b/metadata/md5-cache/net-dialup/capisuite-0.4.5-r7
index a4dc8c73d48c..ab63969d034b 100644
--- a/metadata/md5-cache/net-dialup/capisuite-0.4.5-r7
+++ b/metadata/md5-cache/net-dialup/capisuite-0.4.5-r7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] media-sound/sox >=media-libs/tiff-3.7.1 media-gfx/jpeg2ps media-gfx/sfftobmp app-text/ghostscript-gpl net-dialup/capi4k-utils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] media-sound/sox >=media-libs/tiff-3.7.1 media-gfx/jpeg2ps media-gfx/sfftobmp app-text/ghostscript-gpl net-dialup/capi4k-utils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ISDN telecommunication suite providing fax and voice services
 EAPI=5
 HOMEPAGE=http://www.capisuite.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] media-sound/sox >=media-libs/tiff-3.7.1 media-gfx/jpeg2ps media-gfx/sfftobmp app-text/ghostscript-gpl net-dialup/capi4k-utils virtual/mta
 SLOT=0
 SRC_URI=http://www.capisuite.org/capisuite-0.4.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cb3bc2008e59a653ae0f4558430e19bc
diff --git a/metadata/md5-cache/net-dialup/diald-1.0-r2 b/metadata/md5-cache/net-dialup/diald-1.0-r2
index 10214ba93c8b..993b2a9948dd 100644
--- a/metadata/md5-cache/net-dialup/diald-1.0-r2
+++ b/metadata/md5-cache/net-dialup/diald-1.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=pam? ( virtual/pam ) sys-apps/tcp-wrappers || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pam? ( virtual/pam ) sys-apps/tcp-wrappers || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Daemon that provides on demand IP links via SLIP or PPP
 HOMEPAGE=http://diald.sourceforge.net
 IUSE=pam
@@ -8,5 +8,5 @@ LICENSE=Old-MIT GPL-2
 RDEPEND=pam? ( virtual/pam ) sys-apps/tcp-wrappers net-dialup/ppp
 SLOT=0
 SRC_URI=mirror://sourceforge/diald/diald-1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b470ca5c1413bb470c7602d660a2ac41
diff --git a/metadata/md5-cache/net-dialup/freeradius-2.2.0 b/metadata/md5-cache/net-dialup/freeradius-2.2.0
index 63dc41516caf..7f54e179d782 100644
--- a/metadata/md5-cache/net-dialup/freeradius-2.2.0
+++ b/metadata/md5-cache/net-dialup/freeradius-2.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=!net-dialup/cistronradius !net-dialup/gnuradius sys-devel/libtool dev-lang/perl sys-libs/gdbm python? ( >=dev-lang/python-2.4 ) readline? ( sys-libs/readline ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) firebird? ( dev-db/firebird ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ruby? ( dev-lang/ruby:1.8 ) sqlite? ( dev-db/sqlite:3 ) odbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) oracle? ( dev-db/oracle-instantclient-basic ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!net-dialup/cistronradius !net-dialup/gnuradius sys-devel/libtool dev-lang/perl sys-libs/gdbm python? ( >=dev-lang/python-2.4 ) readline? ( sys-libs/readline ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) firebird? ( dev-db/firebird ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ruby? ( dev-lang/ruby:1.8 ) sqlite? ( dev-db/sqlite:3 ) odbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) oracle? ( dev-db/oracle-instantclient-basic ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Highly configurable free RADIUS server
 EAPI=4
 HOMEPAGE=http://www.freeradius.org/
@@ -10,5 +10,5 @@ RDEPEND=!net-dialup/cistronradius !net-dialup/gnuradius sys-devel/libtool dev-la
 REQUIRED_USE=bindist? ( !firebird )
 SLOT=0
 SRC_URI=ftp://ftp.freeradius.org/pub/radius/freeradius-server-2.2.0.tar.gz ftp://ftp.freeradius.org/pub/radius/old/freeradius-server-2.2.0.tar.gz http://dev.gentoo.org/~flameeyes/freeradius/freeradius-2.2.0-patches-4.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0beab107ef00fa552609960223046ec3
diff --git a/metadata/md5-cache/net-dialup/gtkterm-0.99.7_rc1 b/metadata/md5-cache/net-dialup/gtkterm-0.99.7_rc1
index 7798941dcd49..eaeccddde57c 100644
--- a/metadata/md5-cache/net-dialup/gtkterm-0.99.7_rc1
+++ b/metadata/md5-cache/net-dialup/gtkterm-0.99.7_rc1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=x11-libs/gtk+-2.16:2 >=x11-libs/vte-0.20:0 >=dev-util/intltool-0.40 virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.16:2 >=x11-libs/vte-0.20:0 >=dev-util/intltool-0.40 virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A serial port terminal written in GTK+, similar to Windows' HyperTerminal
 EAPI=4
 HOMEPAGE=https://fedorahosted.org/gtkterm/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.16:2 >=x11-libs/vte-0.20:0
 SLOT=0
 SRC_URI=https://fedorahosted.org/released/gtkterm/gtkterm-0.99.7-rc1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6f25d2a5e6e1998a336bf96cc27274ba
diff --git a/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r3 b/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r3
index ffae69d6408e..640d4681a8ab 100644
--- a/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r3
+++ b/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=nls? ( virtual/libintl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=nls? ( virtual/libintl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Communication package providing the X, Y, and ZMODEM file transfer protocols
 EAPI=2
 HOMEPAGE=http://www.ohse.de/uwe/software/lrzsz.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://www.ohse.de/uwe/releases/lrzsz-0.12.20.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1f66dc6b960dc5b57c14fb1f9c609f16
diff --git a/metadata/md5-cache/net-dialup/mwavem-2.0-r1 b/metadata/md5-cache/net-dialup/mwavem-2.0-r1
index c595f38195b9..d9113e011e8c 100644
--- a/metadata/md5-cache/net-dialup/mwavem-2.0-r1
+++ b/metadata/md5-cache/net-dialup/mwavem-2.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=User level application for IBM Mwave modem
 EAPI=2
 HOMEPAGE=http://oss.software.ibm.com/acpmodem/
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://www-126.ibm.com/pub/acpmodem/2.0/mwavem-2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=76f1a52f650350728c41450a51af37cd
diff --git a/metadata/md5-cache/net-dialup/pptpd-1.3.4-r2 b/metadata/md5-cache/net-dialup/pptpd-1.3.4-r2
index 9ea63c571036..0e1334086c88 100644
--- a/metadata/md5-cache/net-dialup/pptpd-1.3.4-r2
+++ b/metadata/md5-cache/net-dialup/pptpd-1.3.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=net-dialup/ppp tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-dialup/ppp tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Linux Point-to-Point Tunnelling Protocol Server
 EAPI=5
 HOMEPAGE=http://poptop.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/ppp tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=mirror://sourceforge/poptop/pptpd-1.3.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c74fc7bd21ee1ca5bb133ea321da8904
diff --git a/metadata/md5-cache/net-dialup/radiusclient-0.3.2 b/metadata/md5-cache/net-dialup/radiusclient-0.3.2
index 025631d97120..04145a0bd88d 100644
--- a/metadata/md5-cache/net-dialup/radiusclient-0.3.2
+++ b/metadata/md5-cache/net-dialup/radiusclient-0.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=!net-dialup/radiusclient-ng !net-dialup/freeradius-client || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!net-dialup/radiusclient-ng !net-dialup/freeradius-client || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for writing RADIUS clients accompanied with several client utilities.
 HOMEPAGE=http://freshmeat.net/projects/radiusclient/
 KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=!net-dialup/radiusclient-ng !net-dialup/freeradius-client
 SLOT=0
 SRC_URI=ftp://ftp.cityline.net/pub/radiusclient/radiusclient-0.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=00f3ff8038ad9066f3a396898c7d13dd
diff --git a/metadata/md5-cache/net-dialup/rp-pppoe-3.10-r1 b/metadata/md5-cache/net-dialup/rp-pppoe-3.10-r1
index 1d80d2e3d485..6abcc3313d11 100644
--- a/metadata/md5-cache/net-dialup/rp-pppoe-3.10-r1
+++ b/metadata/md5-cache/net-dialup/rp-pppoe-3.10-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst preinst unpack
-DEPEND=|| ( <sys-kernel/linux-headers-2.6.24 >=sys-kernel/linux-headers-2.6.25 ) net-dialup/ppp X? ( dev-lang/tk ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( <sys-kernel/linux-headers-2.6.24 >=sys-kernel/linux-headers-2.6.25 ) net-dialup/ppp X? ( dev-lang/tk ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A user-mode PPPoE client and server suite for Linux
 HOMEPAGE=http://www.roaringpenguin.com/pppoe/
 IUSE=X
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/ppp X? ( dev-lang/tk )
 SLOT=0
 SRC_URI=http://www.roaringpenguin.com/files/download/rp-pppoe-3.10.tar.gz ftp://ftp.samba.org/pub/ppp/ppp-2.4.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f311298cdcd58716f8ad839ae5a3b038
diff --git a/metadata/md5-cache/net-dialup/rp-pppoe-3.8-r2 b/metadata/md5-cache/net-dialup/rp-pppoe-3.8-r2
index 01624f6ce8c4..6481bbeb4155 100644
--- a/metadata/md5-cache/net-dialup/rp-pppoe-3.8-r2
+++ b/metadata/md5-cache/net-dialup/rp-pppoe-3.8-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst preinst unpack
-DEPEND=|| ( <sys-kernel/linux-headers-2.6.24 >=sys-kernel/linux-headers-2.6.25 ) net-dialup/ppp X? ( dev-lang/tk ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( <sys-kernel/linux-headers-2.6.24 >=sys-kernel/linux-headers-2.6.25 ) net-dialup/ppp X? ( dev-lang/tk ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A user-mode PPPoE client and server suite for Linux
 HOMEPAGE=http://www.roaringpenguin.com/pppoe/
 IUSE=X
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/ppp X? ( dev-lang/tk )
 SLOT=0
 SRC_URI=http://www.roaringpenguin.com/penguin/pppoe/rp-pppoe-3.8.tar.gz ftp://ftp.samba.org/pub/ppp/ppp-2.4.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=661dcc34e76acf9fda1987894b82b731
diff --git a/metadata/md5-cache/net-dns/avahi-0.6.30-r1 b/metadata/md5-cache/net-dns/avahi-0.6.30-r1
index 04332e4fb46a..a4c53f082991 100644
--- a/metadata/md5-cache/net-dns/avahi-0.6.30-r1
+++ b/metadata/md5-cache/net-dns/avahi-0.6.30-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/libdaemon-0.14 dev-libs/expat dev-libs/glib:2 gdbm? ( sys-libs/gdbm ) qt4? ( dev-qt/qtcore: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 virtual/pkgconfig doc? ( app-doc/doxygen mono? ( >=virtual/monodoc-1.1.8 ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[gdbm] )
+DEPEND=>=dev-libs/libdaemon-0.14 dev-libs/expat dev-libs/glib:2 gdbm? ( sys-libs/gdbm ) qt4? ( dev-qt/qtcore: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 virtual/pkgconfig doc? ( app-doc/doxygen mono? ( >=virtual/monodoc-1.1.8 ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[gdbm] )
 DESCRIPTION=System which facilitates service discovery on a local network
 EAPI=3
 HOMEPAGE=http://avahi.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libdaemon-0.14 dev-libs/expat dev-libs/glib:2 gdbm? ( sys-libs/gdbm ) qt4? ( dev-qt/qtcore: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] )
 SLOT=0
 SRC_URI=http://avahi.org/download/avahi-0.6.30.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fe38c056f811f5f46599448539f17ebf
diff --git a/metadata/md5-cache/net-dns/avahi-0.6.30-r3 b/metadata/md5-cache/net-dns/avahi-0.6.30-r3
index c19439134ff7..b5d43e85c99e 100644
--- a/metadata/md5-cache/net-dns/avahi-0.6.30-r3
+++ b/metadata/md5-cache/net-dns/avahi-0.6.30-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libdaemon-0.14 dev-libs/expat dev-libs/glib:2 gdbm? ( sys-libs/gdbm ) qt4? ( dev-qt/qtcore: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] )
 SLOT=0
 SRC_URI=http://avahi.org/download/avahi-0.6.30.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=54c0f0a1f01d4b09b52fb73f696d2299
diff --git a/metadata/md5-cache/net-dns/avahi-0.6.31 b/metadata/md5-cache/net-dns/avahi-0.6.31
index a883e513d74f..156a3e80943c 100644
--- a/metadata/md5-cache/net-dns/avahi-0.6.31
+++ b/metadata/md5-cache/net-dns/avahi-0.6.31
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libdaemon-0.14 dev-libs/expat dev-libs/glib:2 gdbm? ( sys-libs/gdbm ) qt4? ( dev-qt/qtcore: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] )
 SLOT=0
 SRC_URI=http://avahi.org/download/avahi-0.6.31.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=21e75b855e23825c285f4b6505578f3d
diff --git a/metadata/md5-cache/net-dns/avahi-0.6.31-r1 b/metadata/md5-cache/net-dns/avahi-0.6.31-r1
index 2ee3831cf6bb..15438a66c8c5 100644
--- a/metadata/md5-cache/net-dns/avahi-0.6.31-r1
+++ b/metadata/md5-cache/net-dns/avahi-0.6.31-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libdaemon-0.14 dev-libs/expat dev-libs/glib:2 gdbm? ( sys-libs/gdbm ) qt4? ( dev-qt/qtcore: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] )
 SLOT=0
 SRC_URI=http://avahi.org/download/avahi-0.6.31.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a04c6685270cd9e950fe6d009d2eeab6
diff --git a/metadata/md5-cache/net-dns/bind-9.8.4_p2 b/metadata/md5-cache/net-dns/bind-9.8.4_p2
index 7c8575bdf012..16a74cd7b10c 100644
--- a/metadata/md5-cache/net-dns/bind-9.8.4_p2
+++ b/metadata/md5-cache/net-dns/bind-9.8.4_p2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=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[-bindist] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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[-bindist] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=BIND - Berkeley Internet Name Domain - Name Server
 EAPI=4
 HOMEPAGE=http://www.isc.org/software/bind
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc?
 REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) sdb-ldap? ( dlz ) gost? ( ssl ) threads? ( caps )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.8.4-P2/bind-9.8.4-P2.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.3-P1-geoip-1.3.patch ) sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-1.1.0-fc14.patch.bz2 ) rrl? ( http://ss.vix.su/~vjs/rl-9.8.4-P2.patch )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6e075f74a727118e4dd58f8f5692e60b
diff --git a/metadata/md5-cache/net-dns/bind-9.9.2_p1 b/metadata/md5-cache/net-dns/bind-9.9.2_p1
index 6825bf85b9fd..75bd647241d5 100644
--- a/metadata/md5-cache/net-dns/bind-9.9.2_p1
+++ b/metadata/md5-cache/net-dns/bind-9.9.2_p1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=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[-bindist] ) python? ( virtual/python-argparse ) python? ( || ( =dev-lang/python-3* =dev-lang/python-2.7* ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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[-bindist] ) python? ( virtual/python-argparse ) python? ( || ( =dev-lang/python-3* =dev-lang/python-2.7* ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=BIND - Berkeley Internet Name Domain - Name Server
 EAPI=4
 HOMEPAGE=http://www.isc.org/software/bind
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc?
 REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) sdb-ldap? ( dlz ) gost? ( ssl ) threads? ( caps )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.9.2-P1/bind-9.9.2-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.9.2-geoip-1.3.patch ) sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-1.1.0-fc14.patch.bz2 ) rrl? ( http://ss.vix.com/~vixie/rl-9.9.2.patch )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c3bf026efc46c54152c64d4dd8b683c1
diff --git a/metadata/md5-cache/net-dns/bind-9.9.2_p2 b/metadata/md5-cache/net-dns/bind-9.9.2_p2
index ef90a91c6257..9f6b24028c09 100644
--- a/metadata/md5-cache/net-dns/bind-9.9.2_p2
+++ b/metadata/md5-cache/net-dns/bind-9.9.2_p2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=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[-bindist] ) python? ( virtual/python-argparse ) python? ( || ( =dev-lang/python-3* =dev-lang/python-2.7* ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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[-bindist] ) python? ( virtual/python-argparse ) python? ( || ( =dev-lang/python-3* =dev-lang/python-2.7* ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=BIND - Berkeley Internet Name Domain - Name Server
 EAPI=4
 HOMEPAGE=http://www.isc.org/software/bind
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc?
 REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) sdb-ldap? ( dlz ) gost? ( ssl ) threads? ( caps )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.9.2-P2/bind-9.9.2-P2.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.2-geoip-1.3.patch ) sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-1.1.0-fc14.patch.bz2 ) rrl? ( http://ss.vix.su/~vjs/rl-9.9.2-P2.patch )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f58a993ece70f235d432d80447d8ac9b
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.9.1_p2 b/metadata/md5-cache/net-dns/bind-tools-9.9.1_p2
index ad6dc02cbb68..ae5c76582f10 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.9.1_p2
+++ b/metadata/md5-cache/net-dns/bind-tools-9.9.1_p2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=4
 HOMEPAGE=http://www.isc.org/software/bind
@@ -9,5 +9,5 @@ LICENSE=ISC BSD BSD-2 HPND JNIC RSA openssl
 RDEPEND=ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.9.1-P2/bind-9.9.1-P2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=04862b398644648b0a8312190f321f4e
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.9.1_p4 b/metadata/md5-cache/net-dns/bind-tools-9.9.1_p4
index 70692f9f1d13..5ef379377a34 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.9.1_p4
+++ b/metadata/md5-cache/net-dns/bind-tools-9.9.1_p4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=4
 HOMEPAGE=http://www.isc.org/software/bind
@@ -9,5 +9,5 @@ LICENSE=ISC BSD BSD-2 HPND JNIC RSA openssl
 RDEPEND=ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.9.1-P4/bind-9.9.1-P4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a3bba9dbce49d9e54443e2f3ac893833
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.9.2 b/metadata/md5-cache/net-dns/bind-tools-9.9.2
index 26ed4d6d050c..afad26dccdb5 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.9.2
+++ b/metadata/md5-cache/net-dns/bind-tools-9.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=4
 HOMEPAGE=http://www.isc.org/software/bind
@@ -9,5 +9,5 @@ LICENSE=ISC BSD BSD-2 HPND JNIC RSA openssl
 RDEPEND=ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.9.2/bind-9.9.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e3d2521e818bd7fa26e5bd6c30ca9c13
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.9.2_p2 b/metadata/md5-cache/net-dns/bind-tools-9.9.2_p2
index 5e68a3ef8d37..21cf8669586d 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.9.2_p2
+++ b/metadata/md5-cache/net-dns/bind-tools-9.9.2_p2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=4
 HOMEPAGE=http://www.isc.org/software/bind
@@ -9,5 +9,5 @@ LICENSE=ISC BSD BSD-2 HPND JNIC RSA openssl
 RDEPEND=ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.9.2-P2/bind-9.9.2-P2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=be35d2e5524fd63a775248406195e9d2
diff --git a/metadata/md5-cache/net-dns/dnrd-2.20.3-r1 b/metadata/md5-cache/net-dns/dnrd-2.20.3-r1
index 177c1a9b1bee..31d71a3ed409 100644
--- a/metadata/md5-cache/net-dns/dnrd-2.20.3-r1
+++ b/metadata/md5-cache/net-dns/dnrd-2.20.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A caching DNS proxy server
 HOMEPAGE=http://dnrd.sourceforge.net/
 IUSE=debug
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/dnrd/dnrd-2.20.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=710fd509d58145ee30cd855003ca5a5f
diff --git a/metadata/md5-cache/net-dns/hesinfo-3.1.0 b/metadata/md5-cache/net-dns/hesinfo-3.1.0
index fced92874420..54d400c90c38 100644
--- a/metadata/md5-cache/net-dns/hesinfo-3.1.0
+++ b/metadata/md5-cache/net-dns/hesinfo-3.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=net-dns/hesiod-3.1.0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-dns/hesiod-3.1.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A simple command-line interface to the net-dns/hesiod service library
 EAPI=2
 HOMEPAGE=ftp://athena-dist.mit.edu/pub/ATHENA/hesiod
@@ -8,5 +8,5 @@ LICENSE=ISC
 RDEPEND=>=net-dns/hesiod-3.1.0
 SLOT=0
 SRC_URI=ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesinfo-3.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d43bf8a211fe01cf0b8d78da56a5e8a3
diff --git a/metadata/md5-cache/net-dns/hesiod-3.0.2-r2 b/metadata/md5-cache/net-dns/hesiod-3.0.2-r2
index 2779f4e98766..38980fb16d82 100644
--- a/metadata/md5-cache/net-dns/hesiod-3.0.2-r2
+++ b/metadata/md5-cache/net-dns/hesiod-3.0.2-r2
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=system which uses existing DNS functionality to provide access to databases of information that changes infrequently
 HOMEPAGE=ftp://athena-dist.mit.edu/pub/ATHENA/hesiod
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd
 LICENSE=ISC
 SLOT=0
 SRC_URI=ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-3.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cddfa5a76b804e347cd956fd56b2df2c
diff --git a/metadata/md5-cache/net-dns/hesiod-3.1.0 b/metadata/md5-cache/net-dns/hesiod-3.1.0
index eb620828d3b2..749635bbe7b0 100644
--- a/metadata/md5-cache/net-dns/hesiod-3.1.0
+++ b/metadata/md5-cache/net-dns/hesiod-3.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=system which uses existing DNS functionality to provide access to databases of information that changes infrequently
 EAPI=2
 HOMEPAGE=ftp://athena-dist.mit.edu/pub/ATHENA/hesiod
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=ISC
 SLOT=0
 SRC_URI=ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-3.1.0.tar.gz mirror://gentoo/hesiod-3.1.0-patches.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=53aa3fd956d645575807d3130c388d9a
diff --git a/metadata/md5-cache/net-dns/idnkit-1.0-r2 b/metadata/md5-cache/net-dns/idnkit-1.0-r2
index 3f48a69e3d70..4d3aaac263f6 100644
--- a/metadata/md5-cache/net-dns/idnkit-1.0-r2
+++ b/metadata/md5-cache/net-dns/idnkit-1.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=virtual/libiconv || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=virtual/libiconv || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Toolkit for Internationalized Domain Names (IDN)
 EAPI=4
 HOMEPAGE=http://www.nic.ad.jp/ja/idn/idnkit/download/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=JNIC
 SLOT=0
 SRC_URI=http://www.nic.ad.jp/ja/idn/idnkit/download/sources/idnkit-1.0-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8249a8304550d8a26bfd23a29dc46d87
diff --git a/metadata/md5-cache/net-dns/knot-1.1.3 b/metadata/md5-cache/net-dns/knot-1.1.3
index 967152659dfd..3e776980a299 100644
--- a/metadata/md5-cache/net-dns/knot-1.1.3
+++ b/metadata/md5-cache/net-dns/knot-1.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/openssl dev-libs/userspace-rcu virtual/pkgconfig sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl dev-libs/userspace-rcu virtual/pkgconfig sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High-performance authoritative-only DNS server
 EAPI=5
 HOMEPAGE=http://www.knot-dns.cz/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/openssl dev-libs/userspace-rcu
 SLOT=0
 SRC_URI=http://public.nic.cz/files/knot-dns/knot-1.1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f8ea1d091bbae1ef53536afaea859dce
diff --git a/metadata/md5-cache/net-dns/knot-1.2.0 b/metadata/md5-cache/net-dns/knot-1.2.0
index 0a106042f466..464e2ec59bb9 100644
--- a/metadata/md5-cache/net-dns/knot-1.2.0
+++ b/metadata/md5-cache/net-dns/knot-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/openssl dev-libs/userspace-rcu virtual/pkgconfig sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl dev-libs/userspace-rcu virtual/pkgconfig sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High-performance authoritative-only DNS server
 EAPI=5
 HOMEPAGE=http://www.knot-dns.cz/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/openssl dev-libs/userspace-rcu
 SLOT=0
 SRC_URI=http://public.nic.cz/files/knot-dns/knot-1.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=91ddb0273b141bddbf21333c8bc2b2f3
diff --git a/metadata/md5-cache/net-dns/ldns-utils-1.6.12 b/metadata/md5-cache/net-dns/ldns-utils-1.6.12
index b71225f4043d..3a21b3acc277 100644
--- a/metadata/md5-cache/net-dns/ldns-utils-1.6.12
+++ b/metadata/md5-cache/net-dns/ldns-utils-1.6.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=net-libs/ldns-1.6.12[gost?,ssl?] examples? ( net-libs/libpcap ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-libs/ldns-1.6.12[gost?,ssl?] examples? ( net-libs/libpcap ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Set of utilities to simplify various dns(sec) tasks.
 EAPI=3
 HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=net-libs/ldns-1.6.12[gost?,ssl?] examples? ( net-libs/libpcap )
 SLOT=0
 SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=913466c58e997b1bfdce09b98d53473e
diff --git a/metadata/md5-cache/net-dns/mydns-1.2.8.31 b/metadata/md5-cache/net-dns/mydns-1.2.8.31
index 70cfd0db7080..c99b953f9021 100644
--- a/metadata/md5-cache/net-dns/mydns-1.2.8.31
+++ b/metadata/md5-cache/net-dns/mydns-1.2.8.31
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A DNS-Server which gets its data from a MySQL-/PostgreSQL-database
 EAPI=5
 HOMEPAGE=http://www.mydns.pl/
@@ -10,5 +10,5 @@ RDEPEND=mysql? ( virtual/mysql ) nls? ( virtual/libintl ) postgres? ( dev-db/pos
 REQUIRED_USE=^^ ( mysql postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/mydns-ng/mydns-1.2.8.31.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a53556ff6ec62549a56262254773c013
diff --git a/metadata/md5-cache/net-dns/opendnssec-1.3.12 b/metadata/md5-cache/net-dns/opendnssec-1.3.12
index 41616c6aca02..61307216a331 100644
--- a/metadata/md5-cache/net-dns/opendnssec-1.3.12
+++ b/metadata/md5-cache/net-dns/opendnssec-1.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
-DEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt >=net-libs/ldns-1.6.12 auditor? ( dev-lang/ruby[ssl] dev-ruby/dnsruby ) 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt >=net-libs/ldns-1.6.12 auditor? ( dev-lang/ruby[ssl] dev-ruby/dnsruby ) 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An open-source turn-key solution for DNSSEC
 EAPI=4
 HOMEPAGE=http://www.opendnssec.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt >=net-libs/ldns-1.6.12 a
 REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm ) eppclient? ( curl )
 SLOT=0
 SRC_URI=http://www.opendnssec.org/files/source/opendnssec-1.3.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9b941ac764300e255346b9b717616924
diff --git a/metadata/md5-cache/net-dns/opendnssec-1.3.13 b/metadata/md5-cache/net-dns/opendnssec-1.3.13
index 3fd7b0e77234..3c10bd6bfd5e 100644
--- a/metadata/md5-cache/net-dns/opendnssec-1.3.13
+++ b/metadata/md5-cache/net-dns/opendnssec-1.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
-DEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt >=net-libs/ldns-1.6.12 auditor? ( dev-lang/ruby[ssl] dev-ruby/dnsruby ) 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt >=net-libs/ldns-1.6.12 auditor? ( dev-lang/ruby[ssl] dev-ruby/dnsruby ) 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An open-source turn-key solution for DNSSEC
 EAPI=4
 HOMEPAGE=http://www.opendnssec.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt >=net-libs/ldns-1.6.12 a
 REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm ) eppclient? ( curl )
 SLOT=0
 SRC_URI=http://www.opendnssec.org/files/source/opendnssec-1.3.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=95a41cefd5cbd93a3baf2cbbbab4b060
diff --git a/metadata/md5-cache/net-dns/opendnssec-1.3.7 b/metadata/md5-cache/net-dns/opendnssec-1.3.7
index 4a9c2055ba24..e88ca43a0798 100644
--- a/metadata/md5-cache/net-dns/opendnssec-1.3.7
+++ b/metadata/md5-cache/net-dns/opendnssec-1.3.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An open-source turn-key solution for DNSSEC
 EAPI=4
 HOMEPAGE=http://www.opendnssec.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt >=net-libs/ldns-1.6.12 a
 REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm ) eppclient? ( curl )
 SLOT=0
 SRC_URI=http://www.opendnssec.org/files/source/opendnssec-1.3.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed085f0707e4cc212f37229ad07b0b71
diff --git a/metadata/md5-cache/net-dns/pdns-3.0.1 b/metadata/md5-cache/net-dns/pdns-3.0.1
index 550b7b9f9874..7c3ad8f3dbcc 100644
--- a/metadata/md5-cache/net-dns/pdns-3.0.1
+++ b/metadata/md5-cache/net-dns/pdns-3.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=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 ) virtual/pkgconfig static? ( >=dev-libs/boost-1.34[static-libs] ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig static? ( >=dev-libs/boost-1.34[static-libs] ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The PowerDNS Daemon
 EAPI=4
 HOMEPAGE=http://www.powerdns.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://downloads.powerdns.com/releases/pdns-3.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b1098634eaa029e5f5c76c5eaf9b2f3f
diff --git a/metadata/md5-cache/net-dns/unbound-1.4.17-r1 b/metadata/md5-cache/net-dns/unbound-1.4.17-r1
index 206dbe44ce45..748e7c9cbf2a 100644
--- a/metadata/md5-cache/net-dns/unbound-1.4.17-r1
+++ b/metadata/md5-cache/net-dns/unbound-1.4.17-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=dev-libs/expat dev-libs/libevent >=dev-libs/openssl-0.9.8 >=net-libs/ldns-1.6.13[ecdsa,ssl,gost?] selinux? ( sec-policy/selinux-bind ) python? ( dev-lang/swig ) test? ( net-dns/ldns-utils[examples] dev-util/splint app-text/wdiff ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=dev-libs/expat dev-libs/libevent >=dev-libs/openssl-0.9.8 >=net-libs/ldns-1.6.13[ecdsa,ssl,gost?] selinux? ( sec-policy/selinux-bind ) python? ( dev-lang/swig ) test? ( net-dns/ldns-utils[examples] dev-util/splint app-text/wdiff ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=A validating, recursive and caching DNS resolver
 EAPI=4
 HOMEPAGE=http://unbound.net/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-libs/expat dev-libs/libevent >=dev-libs/openssl-0.9.8 >=net-libs/ldns-1.6.13[ecdsa,ssl,gost?] selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://unbound.net/downloads/unbound-1.4.17.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=610c30f439841b02ee61566d7a310ecc
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.2.12 b/metadata/md5-cache/net-firewall/firewalld-0.2.12
index 2209565e313f..2e95f0810247 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.2.12
+++ b/metadata/md5-cache/net-firewall/firewalld-0.2.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/dbus-python dev-python/decorator >=dev-python/python-slip-0.2.7[dbus] dev-python/pygobject:3 net-firewall/ebtables net-firewall/iptables[ipv6] || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) gui? ( dev-python/pygtk:2 >=x11-libs/gtk+-2.6:2 x11-libs/gtk+:3 ) dev-libs/glib:2 >=dev-util/intltool-0.35 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 virtual/pkgconfig
+DEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/dbus-python dev-python/decorator >=dev-python/python-slip-0.2.7[dbus] dev-python/pygobject:3 net-firewall/ebtables net-firewall/iptables[ipv6] || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) gui? ( dev-python/pygtk:2 >=x11-libs/gtk+-2.6:2 x11-libs/gtk+:3 ) dev-libs/glib:2 >=dev-util/intltool-0.35 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 virtual/pkgconfig
 DESCRIPTION=A firewall daemon with D-BUS interface providing a dynamic firewall
 EAPI=5
 HOMEPAGE=http://fedorahosted.org/firewalld
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/dbus-python dev-python/decorator >=dev-python/python-slip-0.2.7[dbus] dev-python/pygobject:3 net-firewall/ebtables net-firewall/iptables[ipv6] || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) gui? ( dev-python/pygtk:2 >=x11-libs/gtk+-2.6:2 x11-libs/gtk+:3 )
 SLOT=0
 SRC_URI=https://fedorahosted.org/released/firewalld/firewalld-0.2.12.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8ff18519744c8ebfcce5590a85991a18
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.2.9-r1 b/metadata/md5-cache/net-firewall/firewalld-0.2.9-r1
index f773d7797b81..9044fca0e5d8 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.2.9-r1
+++ b/metadata/md5-cache/net-firewall/firewalld-0.2.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/dbus-python dev-python/decorator >=dev-python/python-slip-0.2.7[dbus] dev-python/pygobject:3 net-firewall/ebtables net-firewall/iptables[ipv6] || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) gui? ( dev-python/pygtk:2 >=x11-libs/gtk+-2.6:2 x11-libs/gtk+:3 ) dev-libs/glib:2 >=dev-util/intltool-0.35 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 virtual/pkgconfig
+DEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/dbus-python dev-python/decorator >=dev-python/python-slip-0.2.7[dbus] dev-python/pygobject:3 net-firewall/ebtables net-firewall/iptables[ipv6] || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) gui? ( dev-python/pygtk:2 >=x11-libs/gtk+-2.6:2 x11-libs/gtk+:3 ) dev-libs/glib:2 >=dev-util/intltool-0.35 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 virtual/pkgconfig
 DESCRIPTION=A firewall daemon with D-BUS interface providing a dynamic firewall
 EAPI=5
 HOMEPAGE=http://fedorahosted.org/firewalld
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/dbus-python dev-python/decorator >=dev-python/python-slip-0.2.7[dbus] dev-python/pygobject:3 net-firewall/ebtables net-firewall/iptables[ipv6] || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) gui? ( dev-python/pygtk:2 >=x11-libs/gtk+-2.6:2 x11-libs/gtk+:3 )
 SLOT=0
 SRC_URI=https://fedorahosted.org/released/firewalld/firewalld-0.2.9.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/firewalld-0.2.9-190680ba.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=83cc5b67512ff65b8d5063236955d07e
diff --git a/metadata/md5-cache/net-firewall/fwbuilder-4.2.2.3541 b/metadata/md5-cache/net-firewall/fwbuilder-4.2.2.3541
index f6c67ff06651..b8f6d8195283 100644
--- a/metadata/md5-cache/net-firewall/fwbuilder-4.2.2.3541
+++ b/metadata/md5-cache/net-firewall/fwbuilder-4.2.2.3541
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=>=dev-qt/qtgui-4.3:4 dev-libs/openssl dev-libs/elfutils sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-qt/qtgui-4.3:4 dev-libs/openssl dev-libs/elfutils sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A firewall GUI
 EAPI=4
 HOMEPAGE=http://www.fwbuilder.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-4.3:4 dev-libs/openssl dev-libs/elfutils sys-devel/gnuconfig
 SLOT=0
 SRC_URI=mirror://sourceforge/fwbuilder/fwbuilder-4.2.2.3541.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8ba33040002dc6bd75232ae27002a11a
diff --git a/metadata/md5-cache/net-firewall/fwbuilder-5.0.1.3592-r1 b/metadata/md5-cache/net-firewall/fwbuilder-5.0.1.3592-r1
index 1ef3348883b5..27326cfa971f 100644
--- a/metadata/md5-cache/net-firewall/fwbuilder-5.0.1.3592-r1
+++ b/metadata/md5-cache/net-firewall/fwbuilder-5.0.1.3592-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=>=dev-qt/qtgui-4.3:4 dev-libs/openssl dev-libs/elfutils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-qt/qtgui-4.3:4 dev-libs/openssl dev-libs/elfutils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A firewall GUI
 EAPI=4
 HOMEPAGE=http://www.fwbuilder.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-4.3:4 dev-libs/openssl dev-libs/elfutils
 SLOT=0
 SRC_URI=mirror://sourceforge/fwbuilder/fwbuilder-5.0.1.3592.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=65df851e5e4edd87454d41cd50b8d48f
diff --git a/metadata/md5-cache/net-firewall/fwbuilder-5.1.0.3599 b/metadata/md5-cache/net-firewall/fwbuilder-5.1.0.3599
index 1c85ff43f7ab..bfb6e18e7b9c 100644
--- a/metadata/md5-cache/net-firewall/fwbuilder-5.1.0.3599
+++ b/metadata/md5-cache/net-firewall/fwbuilder-5.1.0.3599
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=>=dev-qt/qtgui-4.3:4 dev-libs/openssl dev-libs/elfutils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-qt/qtgui-4.3:4 dev-libs/openssl dev-libs/elfutils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A firewall GUI
 EAPI=4
 HOMEPAGE=http://www.fwbuilder.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-4.3:4 dev-libs/openssl dev-libs/elfutils
 SLOT=0
 SRC_URI=mirror://sourceforge/fwbuilder/fwbuilder-5.1.0.3599.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=679143660c17899848b82c4ca907cb8a
diff --git a/metadata/md5-cache/net-firewall/ipsec-tools-0.8.0-r3 b/metadata/md5-cache/net-firewall/ipsec-tools-0.8.0-r3
index 7213683e56c4..15ca457822b7 100644
--- a/metadata/md5-cache/net-firewall/ipsec-tools-0.8.0-r3
+++ b/metadata/md5-cache/net-firewall/ipsec-tools-0.8.0-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=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 ) >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation
 EAPI=4
 HOMEPAGE=http://ipsec-tools.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ipsec-tools/ipsec-tools-0.8.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=829baf91100ab9ba903bdc19dc8b9741
diff --git a/metadata/md5-cache/net-firewall/ipsec-tools-0.8.0-r4 b/metadata/md5-cache/net-firewall/ipsec-tools-0.8.0-r4
index d0861045fc7f..c2192a7d825c 100644
--- a/metadata/md5-cache/net-firewall/ipsec-tools-0.8.0-r4
+++ b/metadata/md5-cache/net-firewall/ipsec-tools-0.8.0-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=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 ) >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation
 EAPI=4
 HOMEPAGE=http://ipsec-tools.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ipsec-tools/ipsec-tools-0.8.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cb75ba5fe3633a372644274c5a57fa19
diff --git a/metadata/md5-cache/net-firewall/ipsec-tools-0.8.0-r5 b/metadata/md5-cache/net-firewall/ipsec-tools-0.8.0-r5
index cd5e4e8453ad..a7b449f0d7bf 100644
--- a/metadata/md5-cache/net-firewall/ipsec-tools-0.8.0-r5
+++ b/metadata/md5-cache/net-firewall/ipsec-tools-0.8.0-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=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 ) >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation
 EAPI=4
 HOMEPAGE=http://ipsec-tools.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ipsec-tools/ipsec-tools-0.8.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=38c2ccd180555e8fec18517c4771e0da
diff --git a/metadata/md5-cache/net-firewall/ipsec-tools-0.8.1 b/metadata/md5-cache/net-firewall/ipsec-tools-0.8.1
index 2731e536d83b..c66dd0dc5117 100644
--- a/metadata/md5-cache/net-firewall/ipsec-tools-0.8.1
+++ b/metadata/md5-cache/net-firewall/ipsec-tools-0.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=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 ) >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation
 EAPI=5
 HOMEPAGE=http://ipsec-tools.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ipsec-tools/ipsec-tools-0.8.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5202c916fcba261f3389be2e9e26674c
diff --git a/metadata/md5-cache/net-firewall/ipset-6.15 b/metadata/md5-cache/net-firewall/ipset-6.15
index 1550d61e2a08..9b16071d477a 100644
--- a/metadata/md5-cache/net-firewall/ipset-6.15
+++ b/metadata/md5-cache/net-firewall/ipset-6.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=IPset tool for iptables, successor to ippool.
 EAPI=4
 HOMEPAGE=http://ipset.netfilter.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://ipset.netfilter.org/ipset-6.15.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7c0a628dc0a391ecf45df6b121d7bcb7
diff --git a/metadata/md5-cache/net-firewall/ipset-6.16 b/metadata/md5-cache/net-firewall/ipset-6.16
index 57e8331f2f7c..4ddcb3b936df 100644
--- a/metadata/md5-cache/net-firewall/ipset-6.16
+++ b/metadata/md5-cache/net-firewall/ipset-6.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=IPset tool for iptables, successor to ippool.
 EAPI=5
 HOMEPAGE=http://ipset.netfilter.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://ipset.netfilter.org/ipset-6.16.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0a70eee3b82de5a9d65d7db7d69c81a9
diff --git a/metadata/md5-cache/net-firewall/ipset-6.16.1 b/metadata/md5-cache/net-firewall/ipset-6.16.1
index c31e6646baf8..2b2fd82c16d2 100644
--- a/metadata/md5-cache/net-firewall/ipset-6.16.1
+++ b/metadata/md5-cache/net-firewall/ipset-6.16.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=IPset tool for iptables, successor to ippool.
 EAPI=5
 HOMEPAGE=http://ipset.netfilter.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://ipset.netfilter.org/ipset-6.16.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5c958ac1008a2341a8b9618336cc4ff9
diff --git a/metadata/md5-cache/net-firewall/ipset-6.17 b/metadata/md5-cache/net-firewall/ipset-6.17
index 4bd3a226d356..6f0c720a4123 100644
--- a/metadata/md5-cache/net-firewall/ipset-6.17
+++ b/metadata/md5-cache/net-firewall/ipset-6.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=IPset tool for iptables, successor to ippool.
 EAPI=5
 HOMEPAGE=http://ipset.netfilter.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://ipset.netfilter.org/ipset-6.17.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=af5fe867b16485b1142b2067fbabbb9a
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.10 b/metadata/md5-cache/net-firewall/iptables-1.4.10
index a4ef72f33dc7..8ea27048e282 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.4.10
+++ b/metadata/md5-cache/net-firewall/iptables-1.4.10
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=de1e8df3ff42c26e78a6410396c90a90
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.10-r1 b/metadata/md5-cache/net-firewall/iptables-1.4.10-r1
index 5c5fe3e01aaf..a5362c0f20a6 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.4.10-r1
+++ b/metadata/md5-cache/net-firewall/iptables-1.4.10-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=netlink? ( net-libs/libnfnetlink )
 SLOT=0
 SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=956eb8ca6f191e25ce36e78bbb6a1c18
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.11.1-r2 b/metadata/md5-cache/net-firewall/iptables-1.4.11.1-r2
index b5405e4068a3..70c4a4a51228 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.4.11.1-r2
+++ b/metadata/md5-cache/net-firewall/iptables-1.4.11.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=netlink? ( net-libs/libnfnetlink )
 SLOT=0
 SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.11.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cc02b21543c3bd0c5752c730c68bd172
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.12 b/metadata/md5-cache/net-firewall/iptables-1.4.12
index a995ec65e513..779899eb8305 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.4.12
+++ b/metadata/md5-cache/net-firewall/iptables-1.4.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=netlink? ( net-libs/libnfnetlink )
 SLOT=0
 SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.12.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1272dc3389034257b821c878846ddf78
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.12.1 b/metadata/md5-cache/net-firewall/iptables-1.4.12.1
index da2ea60def1b..ce091783af1e 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.4.12.1
+++ b/metadata/md5-cache/net-firewall/iptables-1.4.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=netlink? ( net-libs/libnfnetlink )
 SLOT=0
 SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.12.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=37fc555528961199364807fca1e6ac3e
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.12.1-r1 b/metadata/md5-cache/net-firewall/iptables-1.4.12.1-r1
index dd8158381cd5..ad50745003ed 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.4.12.1-r1
+++ b/metadata/md5-cache/net-firewall/iptables-1.4.12.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=netlink? ( net-libs/libnfnetlink )
 SLOT=0
 SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.12.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a262ec2785aa45f75aa6a0abf2a85b46
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.13 b/metadata/md5-cache/net-firewall/iptables-1.4.13
index 62fa69021bba..5f4302953845 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.4.13
+++ b/metadata/md5-cache/net-firewall/iptables-1.4.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=netlink? ( net-libs/libnfnetlink )
 SLOT=0
 SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.13.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=142339bb7a8a69210487a3fbcb80b08e
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.13-r2 b/metadata/md5-cache/net-firewall/iptables-1.4.13-r2
index 3a60f313b08a..b1222c67fb79 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.4.13-r2
+++ b/metadata/md5-cache/net-firewall/iptables-1.4.13-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=netlink? ( net-libs/libnfnetlink )
 SLOT=0
 SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.13.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a3d7fb8c66df05cc7cdbed4e266b0bdc
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.14-r1 b/metadata/md5-cache/net-firewall/iptables-1.4.14-r1
index 9c02e031e384..8ea091c77a5b 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.4.14-r1
+++ b/metadata/md5-cache/net-firewall/iptables-1.4.14-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=netlink? ( net-libs/libnfnetlink )
 SLOT=0
 SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.14.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3686aeb6539f49a1217810b6b6018128
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.15-r1 b/metadata/md5-cache/net-firewall/iptables-1.4.15-r1
index de85e8a3beee..e1884ef490c5 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.4.15-r1
+++ b/metadata/md5-cache/net-firewall/iptables-1.4.15-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=netlink? ( net-libs/libnfnetlink )
 SLOT=0
 SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.15.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=956cc17b2d0e01d11f5acca9b8245744
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.16.2 b/metadata/md5-cache/net-firewall/iptables-1.4.16.2
index a0254a58b37b..c8fa87f16819 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.4.16.2
+++ b/metadata/md5-cache/net-firewall/iptables-1.4.16.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=netlink? ( net-libs/libnfnetlink )
 SLOT=0
 SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.16.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f8b19a56bada0d42314122f14ef08b67
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.16.3 b/metadata/md5-cache/net-firewall/iptables-1.4.16.3
index 9d71d2e2076e..c85acce038e4 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.4.16.3
+++ b/metadata/md5-cache/net-firewall/iptables-1.4.16.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=netlink? ( net-libs/libnfnetlink )
 SLOT=0
 SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.16.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4dd0836cb978001d6dfe67a7dd78a562
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.17 b/metadata/md5-cache/net-firewall/iptables-1.4.17
index f2485edecada..2678603eebbd 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.4.17
+++ b/metadata/md5-cache/net-firewall/iptables-1.4.17
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=netlink? ( net-libs/libnfnetlink )
 SLOT=0
 SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.17.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c97371270a23ab4ea0d4ef6b6cc5c3ac
diff --git a/metadata/md5-cache/net-firewall/nufw-2.2.21 b/metadata/md5-cache/net-firewall/nufw-2.2.21
index 0a579c637fd1..add79673ead2 100644
--- a/metadata/md5-cache/net-firewall/nufw-2.2.21
+++ b/metadata/md5-cache/net-firewall/nufw-2.2.21
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst test unpack
-DEPEND=>=dev-libs/glib-2 dev-libs/libgcrypt >=dev-libs/cyrus-sasl-2 net-firewall/iptables >=net-libs/gnutls-1.1 ldap? ( >=net-nds/openldap-2 ) mysql? ( virtual/mysql ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql-server ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) nfconntrack? ( net-libs/libnetfilter_conntrack ) prelude? ( dev-libs/libprelude ) dev-python/ipy || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
+DEPEND=>=dev-libs/glib-2 dev-libs/libgcrypt >=dev-libs/cyrus-sasl-2 net-firewall/iptables >=net-libs/gnutls-1.1 ldap? ( >=net-nds/openldap-2 ) mysql? ( virtual/mysql ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql-server ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) nfconntrack? ( net-libs/libnetfilter_conntrack ) prelude? ( dev-libs/libprelude ) dev-python/ipy || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
 DESCRIPTION=An enterprise grade authenticating firewall based on netfilter
 HOMEPAGE=http://www.nufw.org/
 IUSE=debug ldap mysql pam pam_nuauth plaintext postgres prelude unicode nfqueue nfconntrack static syslog test ssl
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 dev-libs/libgcrypt >=dev-libs/cyrus-sasl-2 net-firewall/iptables >=net-libs/gnutls-1.1 ldap? ( >=net-nds/openldap-2 ) mysql? ( virtual/mysql ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql-server ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) nfconntrack? ( net-libs/libnetfilter_conntrack ) prelude? ( dev-libs/libprelude ) dev-python/ipy
 SLOT=0
 SRC_URI=http://www.nufw.org/download/nufw/nufw-2.2.21.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e63a65ab4e1f1f5b2f4dfe0642a3895f
diff --git a/metadata/md5-cache/net-fs/autofs-4.1.4-r1 b/metadata/md5-cache/net-fs/autofs-4.1.4-r1
index 16738c94a70f..d6b9c77b382b 100644
--- a/metadata/md5-cache/net-fs/autofs-4.1.4-r1
+++ b/metadata/md5-cache/net-fs/autofs-4.1.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Kernel based automounter
 EAPI=4
 HOMEPAGE=http://www.linux-consulting.com/Amd_AutoFS/autofs.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 )
 SLOT=0
 SRC_URI=mirror://kernel/linux/daemons/autofs/v4/autofs-4.1.4.tar.bz2 mirror://gentoo/autofs-4.1.4-patches-1.tar.lzma
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9d9fe1a822d87290ec6ad2374e141238
diff --git a/metadata/md5-cache/net-fs/autofs-5.0.4-r5 b/metadata/md5-cache/net-fs/autofs-5.0.4-r5
index 2de5a6875387..6718155aaf66 100644
--- a/metadata/md5-cache/net-fs/autofs-5.0.4-r5
+++ b/metadata/md5-cache/net-fs/autofs-5.0.4-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl virtual/krb5 dev-libs/libxml2 ) ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl virtual/krb5 dev-libs/libxml2 ) ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Kernel based automounter
 HOMEPAGE=http://www.linux-consulting.com/Amd_AutoFS/autofs.html
 IUSE=ldap sasl
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl virtual/krb5 dev-libs/libxml2 ) )
 SLOT=0
 SRC_URI=mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4.tar.bz2 mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-fix-dumb-libxml2-check.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-expire-specific-submount-only.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-fix-negative-cache-non-existent-key.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-fix-ldap-detection.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-use-CLOEXEC-flag.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-fix-select-fd-limit.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-make-hash-table-scale-to-thousands-of-entries.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-fix-quoted-mess.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-use-CLOEXEC-flag-setmntent.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-fix-hosts-map-use-after-free.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-uris-list-locking-fix.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-renew-sasl-creds-upon-reconnect-fail.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-library-reload-fix-update.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-force-unlink-umount.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-always-read-file-maps.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-code-analysis-corrections.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-make-MAX_ERR_BUF-and-PARSE_MAX_BUF-use-easier-to-audit.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-easy-alloca-replacements.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-configure-libtirpc.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-ipv6-name-and-address-support.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-ipv6-parse.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-add-missing-changelog-entries.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-use-CLOEXEC-flag-setmntent-include-fix.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-easy-alloca-replacements-fix.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-libxml2-workaround-fix.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-configure-libtirpc-fix.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-add-nfs-mount-proto-default-conf-option.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-fix-bad-token-declare.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-fix-return-start-status-on-fail.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-fix-double-free-in-expire_proc.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-another-easy-alloca-replacements-fix.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-add-lsb-init-script-parameter-block.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-always-read-file-maps-fix.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-use-misc-device.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-fix-restorecon.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-clear-rpc-client-on-lookup-fail.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-fix-lsb-init-script-header.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-fix-memory-leak-reading-ldap-master.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-fix-st_remove_tasks-locking.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-reset-flex-scanner-when-setting-buffer.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-zero-s_magic-is-valid.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-use-percent-hack-for-master.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-use-intr-as-hosts-mount-default.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-fix-kernel-includes.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-dont-umount-existing-direct-mount-on-reread.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-library-reload-fix-update-fix.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-improve-manual-umount-recovery.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-dont-fail-on-ipv6-address-adding-host.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-always-read-file-maps-multi-map-fix.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-always-read-file-maps-key-lookup-fixes.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-use-srv-query-for-domain-dn.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-fix-incorrect-dclist-free.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-srv-lookup-handle-endian.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-library-reload-fix-update-fix-2.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-fix-notify-mount-message-path.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-remount-we-created-mount-point-fix.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-fix-double-free-in-do_sasl_bind.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-manual-umount-recovery-fixes.patch mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-fix-map-type-info-parse-error.patch
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=72217f8269ee4ee037a8973ab7fcd4f6
diff --git a/metadata/md5-cache/net-fs/autofs-5.0.6-r3 b/metadata/md5-cache/net-fs/autofs-5.0.6-r3
index 04a7d336a073..1c6fcccb617c 100644
--- a/metadata/md5-cache/net-fs/autofs-5.0.6-r3
+++ b/metadata/md5-cache/net-fs/autofs-5.0.6-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Kernel based automounter
 EAPI=4
 HOMEPAGE=http://www.linux-consulting.com/Amd_AutoFS/autofs.html
@@ -10,5 +10,5 @@ RDEPEND=hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-li
 REQUIRED_USE=sasl? ( ldap )
 SLOT=0
 SRC_URI=mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1cf0e5609a499674a9b7fa126686642c
diff --git a/metadata/md5-cache/net-fs/autofs-5.0.6-r4 b/metadata/md5-cache/net-fs/autofs-5.0.6-r4
index e3cb6df8b91c..3c7ebbbc930a 100644
--- a/metadata/md5-cache/net-fs/autofs-5.0.6-r4
+++ b/metadata/md5-cache/net-fs/autofs-5.0.6-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Kernel based automounter
 EAPI=4
 HOMEPAGE=http://www.linux-consulting.com/Amd_AutoFS/autofs.html
@@ -10,5 +10,5 @@ RDEPEND=hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-li
 REQUIRED_USE=sasl? ( ldap )
 SLOT=0
 SRC_URI=mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e5e9f456167f9d266abc2f036b8566c6
diff --git a/metadata/md5-cache/net-fs/autofs-5.0.6-r5 b/metadata/md5-cache/net-fs/autofs-5.0.6-r5
index 5d2b343a3e62..6305f7c3fe25 100644
--- a/metadata/md5-cache/net-fs/autofs-5.0.6-r5
+++ b/metadata/md5-cache/net-fs/autofs-5.0.6-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Kernel based automounter
 EAPI=4
 HOMEPAGE=http://www.linux-consulting.com/Amd_AutoFS/autofs.html
@@ -10,5 +10,5 @@ RDEPEND=hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-li
 REQUIRED_USE=sasl? ( ldap )
 SLOT=0
 SRC_URI=mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.6.tar.bz2 mirror://gentoo/autofs-5.0.6-patches-1.tar.lzma
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ca9d362f2c88fea404fea18dd7e055e3
diff --git a/metadata/md5-cache/net-fs/autofs-5.0.7 b/metadata/md5-cache/net-fs/autofs-5.0.7
index 0c4384d568a7..2b4a759d1bdd 100644
--- a/metadata/md5-cache/net-fs/autofs-5.0.7
+++ b/metadata/md5-cache/net-fs/autofs-5.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Kernel based automounter
 EAPI=4
 HOMEPAGE=http://www.linux-consulting.com/Amd_AutoFS/autofs.html
@@ -10,5 +10,5 @@ RDEPEND=hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-li
 REQUIRED_USE=sasl? ( ldap )
 SLOT=0
 SRC_URI=mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.7.tar.bz2 http://dev.gentoo.org/~hwoarang/distfiles/autofs-5.0.7-patches-1.tar.lzma
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=df451fa45bb6d8a174f7192fdd557d9f
diff --git a/metadata/md5-cache/net-fs/curlftpfs-0.9.2-r1 b/metadata/md5-cache/net-fs/curlftpfs-0.9.2-r1
index 30a1973c51c6..1cdb9005d8e3 100644
--- a/metadata/md5-cache/net-fs/curlftpfs-0.9.2-r1
+++ b/metadata/md5-cache/net-fs/curlftpfs-0.9.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=net-misc/curl-7.17.0 >=sys-fs/fuse-2.2 >=dev-libs/glib-2.0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-misc/curl-7.17.0 >=sys-fs/fuse-2.2 >=dev-libs/glib-2.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=File system for accessing ftp hosts based on FUSE
 EAPI=2
 HOMEPAGE=http://curlftpfs.sourceforge.net/
@@ -9,5 +9,5 @@ RDEPEND=>=net-misc/curl-7.17.0 >=sys-fs/fuse-2.2 >=dev-libs/glib-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/curlftpfs/curlftpfs-0.9.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f146a41f75b2a1c04debf4fd86cd3b77
diff --git a/metadata/md5-cache/net-fs/cvmfs-2.0.19 b/metadata/md5-cache/net-fs/cvmfs-2.0.19
index 26c113d5d067..77ab36fa8f30 100644
--- a/metadata/md5-cache/net-fs/cvmfs-2.0.19
+++ b/metadata/md5-cache/net-fs/cvmfs-2.0.19
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
-DEPEND=dev-db/sqlite:3 dev-libs/openssl sys-libs/zlib client? ( dev-libs/jemalloc net-misc/curl sys-fs/fuse ) server? ( >=sys-fs/redirfs-0.10.20120313 ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DEPEND=dev-db/sqlite:3 dev-libs/openssl sys-libs/zlib client? ( dev-libs/jemalloc net-misc/curl sys-fs/fuse ) server? ( >=sys-fs/redirfs-0.10.20120313 ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=HTTP read-only file system for distributing software
 EAPI=4
 HOMEPAGE=http://cernvm.cern.ch/portal/filesystem
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/openssl sys-libs/zlib client? ( dev-libs/jemall
 REQUIRED_USE=^^ ( client server )
 SLOT=0
 SRC_URI=https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.0.19/cvmfs-2.0.19.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=67812726373e615c298559c2a166ab64
diff --git a/metadata/md5-cache/net-fs/davfs2-1.4.5-r1 b/metadata/md5-cache/net-fs/davfs2-1.4.5-r1
index 5db2ca393e3e..385b1ffa1e8e 100644
--- a/metadata/md5-cache/net-fs/davfs2-1.4.5-r1
+++ b/metadata/md5-cache/net-fs/davfs2-1.4.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/libxml2 net-libs/neon sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DEPEND=dev-libs/libxml2 net-libs/neon sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=Linux FUSE (or coda) driver that allows you to mount a WebDAV resource.
 EAPI=2
 HOMEPAGE=http://savannah.nongnu.org/projects/davfs2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2 net-libs/neon sys-libs/zlib kernel_linux? ( virtual/mod
 RESTRICT=test
 SLOT=0
 SRC_URI=http://mirror.lihnidos.org/GNU/savannah/davfs2/davfs2-1.4.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=abc5bd550708c887fcafb11ca695327c
diff --git a/metadata/md5-cache/net-fs/davfs2-1.4.7 b/metadata/md5-cache/net-fs/davfs2-1.4.7
index f7f7c346f742..7d2e113ac1b7 100644
--- a/metadata/md5-cache/net-fs/davfs2-1.4.7
+++ b/metadata/md5-cache/net-fs/davfs2-1.4.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/libxml2 net-libs/neon sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DEPEND=dev-libs/libxml2 net-libs/neon sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=Linux FUSE (or coda) driver that allows you to mount a WebDAV resource.
 EAPI=4
 HOMEPAGE=http://savannah.nongnu.org/projects/davfs2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2 net-libs/neon sys-libs/zlib kernel_linux? ( virtual/mod
 RESTRICT=test
 SLOT=0
 SRC_URI=http://mirror.lihnidos.org/GNU/savannah/davfs2/davfs2-1.4.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a35c76dac9c526e32ef21adddfbe0fe0
diff --git a/metadata/md5-cache/net-fs/libnfs-1.3.0 b/metadata/md5-cache/net-fs/libnfs-1.3.0
index 2ef50903e8e2..adab7f3049c7 100644
--- a/metadata/md5-cache/net-fs/libnfs-1.3.0
+++ b/metadata/md5-cache/net-fs/libnfs-1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=net-libs/libtirpc virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-libs/libtirpc virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=client library for accessing NFS shares over a network
 EAPI=4
 HOMEPAGE=https://github.com/sahlberg/libnfs
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-3
 RDEPEND=net-libs/libtirpc
 SLOT=0
 SRC_URI=https://github.com/sahlberg/libnfs/tarball/libnfs-1.3.0 -> libnfs-1.3.0.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=790070862ffe4a0445b9decf3c80ba7f
diff --git a/metadata/md5-cache/net-fs/libnfs-9999 b/metadata/md5-cache/net-fs/libnfs-9999
index 70ba8486b43d..629c4d26f913 100644
--- a/metadata/md5-cache/net-fs/libnfs-9999
+++ b/metadata/md5-cache/net-fs/libnfs-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=virtual/pkgconfig dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=client library for accessing NFS shares over a network
 EAPI=4
 HOMEPAGE=https://github.com/sahlberg/libnfs
 IUSE=static-libs
 LICENSE=LGPL-2.1 GPL-3
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=08338024b92674f7939c8e851ffae71d
diff --git a/metadata/md5-cache/net-fs/netatalk-2.2.1-r3 b/metadata/md5-cache/net-fs/netatalk-2.2.1-r3
index 410e29d78f72..152cf9e80ccd 100644
--- a/metadata/md5-cache/net-fs/netatalk-2.2.1-r3
+++ b/metadata/md5-cache/net-fs/netatalk-2.2.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=!app-editors/yudit dev-libs/libgcrypt sys-apps/coreutils >=sys-libs/db-4.2.52 acl? ( sys-apps/attr sys-apps/acl ) appletalk? ( cups? ( net-print/cups ) ) avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) slp? ( net-libs/openslp ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!app-editors/yudit dev-libs/libgcrypt sys-apps/coreutils >=sys-libs/db-4.2.52 acl? ( sys-apps/attr sys-apps/acl ) appletalk? ( cups? ( net-print/cups ) ) avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) slp? ( net-libs/openslp ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open Source AFP server and other AppleTalk-related utilities
 EAPI=4
 HOMEPAGE=http://netatalk.sourceforge.net/
@@ -12,5 +12,5 @@ REQUIRED_USE=ldap? ( acl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/netatalk/netatalk-2.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d80027c810eec8b3eb8d5d35e0dfee2b
diff --git a/metadata/md5-cache/net-fs/netatalk-2.2.3 b/metadata/md5-cache/net-fs/netatalk-2.2.3
index 0dd6eaab7952..81a239732294 100644
--- a/metadata/md5-cache/net-fs/netatalk-2.2.3
+++ b/metadata/md5-cache/net-fs/netatalk-2.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=!app-editors/yudit dev-libs/libgcrypt sys-apps/coreutils >=sys-libs/db-4.2.52 acl? ( sys-apps/attr sys-apps/acl ) appletalk? ( cups? ( net-print/cups ) ) avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) slp? ( net-libs/openslp ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!app-editors/yudit dev-libs/libgcrypt sys-apps/coreutils >=sys-libs/db-4.2.52 acl? ( sys-apps/attr sys-apps/acl ) appletalk? ( cups? ( net-print/cups ) ) avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) slp? ( net-libs/openslp ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open Source AFP server and other AppleTalk-related utilities
 EAPI=4
 HOMEPAGE=http://netatalk.sourceforge.net/
@@ -12,5 +12,5 @@ REQUIRED_USE=ldap? ( acl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/netatalk/2.2.3/netatalk-2.2.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b0af500e9efbaa0cb4680a9b266bb7ee
diff --git a/metadata/md5-cache/net-fs/netatalk-3.0 b/metadata/md5-cache/net-fs/netatalk-3.0
index baca016746ae..e4d53e8443c8 100644
--- a/metadata/md5-cache/net-fs/netatalk-3.0
+++ b/metadata/md5-cache/net-fs/netatalk-3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=!app-editors/yudit dev-libs/libevent dev-libs/libgcrypt sys-apps/coreutils >=sys-libs/db-4.2.52 acl? ( sys-apps/attr sys-apps/acl ) avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!app-editors/yudit dev-libs/libevent dev-libs/libgcrypt sys-apps/coreutils >=sys-libs/db-4.2.52 acl? ( sys-apps/attr sys-apps/acl ) avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open Source AFP server
 EAPI=4
 HOMEPAGE=http://netatalk.sourceforge.net/
@@ -12,5 +12,5 @@ REQUIRED_USE=ldap? ( acl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/netatalk/3.0/netatalk-3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6ded41f4ecd6411561b5aa82a57f4e28
diff --git a/metadata/md5-cache/net-fs/netatalk-3.0.1 b/metadata/md5-cache/net-fs/netatalk-3.0.1
index 2186a0084fcf..e667cfdf1318 100644
--- a/metadata/md5-cache/net-fs/netatalk-3.0.1
+++ b/metadata/md5-cache/net-fs/netatalk-3.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=!app-editors/yudit dev-libs/libevent dev-libs/libgcrypt sys-apps/coreutils >=sys-libs/db-4.2.52 acl? ( sys-apps/attr sys-apps/acl ) avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!app-editors/yudit dev-libs/libevent dev-libs/libgcrypt sys-apps/coreutils >=sys-libs/db-4.2.52 acl? ( sys-apps/attr sys-apps/acl ) avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open Source AFP server
 EAPI=4
 HOMEPAGE=http://netatalk.sourceforge.net/
@@ -12,5 +12,5 @@ REQUIRED_USE=ldap? ( acl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/netatalk/netatalk/3.0.1/netatalk-3.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e749999ad2ff19e2a2a6f4b46f2fbdef
diff --git a/metadata/md5-cache/net-fs/netatalk-3.0.2 b/metadata/md5-cache/net-fs/netatalk-3.0.2
index 846f462df140..1cf11f4bf637 100644
--- a/metadata/md5-cache/net-fs/netatalk-3.0.2
+++ b/metadata/md5-cache/net-fs/netatalk-3.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=!app-editors/yudit dev-libs/libevent dev-libs/libgcrypt sys-apps/coreutils >=sys-libs/db-4.2.52 acl? ( sys-apps/attr sys-apps/acl ) avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!app-editors/yudit dev-libs/libevent dev-libs/libgcrypt sys-apps/coreutils >=sys-libs/db-4.2.52 acl? ( sys-apps/attr sys-apps/acl ) avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open Source AFP server
 EAPI=4
 HOMEPAGE=http://netatalk.sourceforge.net/
@@ -12,5 +12,5 @@ REQUIRED_USE=ldap? ( acl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/netatalk/netatalk/3.0.2/netatalk-3.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=78a8fe2d537c25c5145273517e342ae1
diff --git a/metadata/md5-cache/net-fs/netatalk-3.0.2-r2 b/metadata/md5-cache/net-fs/netatalk-3.0.2-r2
index 7c0611a89933..1620434bb4cf 100644
--- a/metadata/md5-cache/net-fs/netatalk-3.0.2-r2
+++ b/metadata/md5-cache/net-fs/netatalk-3.0.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=!app-editors/yudit dev-libs/libevent dev-libs/libgcrypt sys-apps/coreutils >=sys-libs/db-4.2.52 acl? ( sys-apps/attr sys-apps/acl ) avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=!app-editors/yudit dev-libs/libevent dev-libs/libgcrypt sys-apps/coreutils >=sys-libs/db-4.2.52 acl? ( sys-apps/attr sys-apps/acl ) avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Open Source AFP server
 EAPI=4
 HOMEPAGE=http://netatalk.sourceforge.net/
@@ -12,5 +12,5 @@ REQUIRED_USE=ldap? ( acl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/netatalk/netatalk/3.0.2/netatalk-3.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=529de6396102202ca468f02b85c0ff00
diff --git a/metadata/md5-cache/net-fs/netatalk-3.0.2-r3 b/metadata/md5-cache/net-fs/netatalk-3.0.2-r3
index ec7fe02e0c18..a674c06987b4 100644
--- a/metadata/md5-cache/net-fs/netatalk-3.0.2-r3
+++ b/metadata/md5-cache/net-fs/netatalk-3.0.2-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=!app-editors/yudit dev-libs/libevent dev-libs/libgcrypt sys-apps/coreutils >=sys-libs/db-4.2.52 acl? ( sys-apps/attr sys-apps/acl ) avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=!app-editors/yudit dev-libs/libevent dev-libs/libgcrypt sys-apps/coreutils >=sys-libs/db-4.2.52 acl? ( sys-apps/attr sys-apps/acl ) avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Open Source AFP server
 EAPI=4
 HOMEPAGE=http://netatalk.sourceforge.net/
@@ -12,5 +12,5 @@ REQUIRED_USE=ldap? ( acl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/netatalk/netatalk/3.0.2/netatalk-3.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b74416418a47c3fbd0d280c796440b56
diff --git a/metadata/md5-cache/net-fs/netatalk-3.0.3 b/metadata/md5-cache/net-fs/netatalk-3.0.3
index a1918eb05c55..54c7561f2373 100644
--- a/metadata/md5-cache/net-fs/netatalk-3.0.3
+++ b/metadata/md5-cache/net-fs/netatalk-3.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=!app-editors/yudit dev-libs/libevent dev-libs/libgcrypt sys-apps/coreutils >=sys-libs/db-4.2.52 acl? ( sys-apps/attr sys-apps/acl ) avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=!app-editors/yudit dev-libs/libevent dev-libs/libgcrypt sys-apps/coreutils >=sys-libs/db-4.2.52 acl? ( sys-apps/attr sys-apps/acl ) avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Open Source AFP server
 EAPI=5
 HOMEPAGE=http://netatalk.sourceforge.net/
@@ -12,5 +12,5 @@ REQUIRED_USE=ldap? ( acl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/netatalk/netatalk/3.0.3/netatalk-3.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=75f78b8c91c3f51cef332fa520cc4c70
diff --git a/metadata/md5-cache/net-fs/nfs-utils-1.2.2-r2 b/metadata/md5-cache/net-fs/nfs-utils-1.2.2-r2
index 039229fef840..5e44372444b7 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-1.2.2-r2
+++ b/metadata/md5-cache/net-fs/nfs-utils-1.2.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NFS client and server daemons
 EAPI=2
 HOMEPAGE=http://linux-nfs.org/
@@ -10,5 +10,5 @@ RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsp
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a23cf5969ff9f769aaf9e6574361dd0b
diff --git a/metadata/md5-cache/net-fs/nfs-utils-1.2.4 b/metadata/md5-cache/net-fs/nfs-utils-1.2.4
index 5a73314d3f19..2c37bbac425f 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-1.2.4
+++ b/metadata/md5-cache/net-fs/nfs-utils-1.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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 ) virtual/pkgconfig !<sys-apps/util-linux-2.12r-r7 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig !<sys-apps/util-linux-2.12r-r7 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NFS client and server daemons
 EAPI=2
 HOMEPAGE=http://linux-nfs.org/
@@ -10,5 +10,5 @@ RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsp
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.2.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=685dca1f8fb1b96d296e5efe94513004
diff --git a/metadata/md5-cache/net-fs/nfs-utils-1.2.5 b/metadata/md5-cache/net-fs/nfs-utils-1.2.5
index ef47c8ec6082..76d53516c1b1 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-1.2.5
+++ b/metadata/md5-cache/net-fs/nfs-utils-1.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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 ) virtual/pkgconfig !<sys-apps/util-linux-2.12r-r7 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig !<sys-apps/util-linux-2.12r-r7 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NFS client and server daemons
 EAPI=4
 HOMEPAGE=http://linux-nfs.org/
@@ -10,5 +10,5 @@ RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsp
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.2.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3ac55531572610e0f199511a3014cfc2
diff --git a/metadata/md5-cache/net-fs/nfs-utils-1.2.6 b/metadata/md5-cache/net-fs/nfs-utils-1.2.6
index 1e3abb9397d0..b38f975d1abf 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-1.2.6
+++ b/metadata/md5-cache/net-fs/nfs-utils-1.2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsdcld? ( >=dev-db/sqlite-3.3 ) 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 ) virtual/pkgconfig !<sys-apps/util-linux-2.12r-r7 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsdcld? ( >=dev-db/sqlite-3.3 ) 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 ) virtual/pkgconfig !<sys-apps/util-linux-2.12r-r7 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NFS client and server daemons
 EAPI=4
 HOMEPAGE=http://linux-nfs.org/
@@ -10,5 +10,5 @@ RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsp
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.2.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=42bf54374ec212c3843b50cf89d418e4
diff --git a/metadata/md5-cache/net-fs/nfs-utils-1.2.7 b/metadata/md5-cache/net-fs/nfs-utils-1.2.7
index 26632d8c8278..419f6e0cb669 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-1.2.7
+++ b/metadata/md5-cache/net-fs/nfs-utils-1.2.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsdcld? ( >=dev-db/sqlite-3.3 ) 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 ) uuid? ( sys-apps/util-linux ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsdcld? ( >=dev-db/sqlite-3.3 ) 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 ) uuid? ( sys-apps/util-linux ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NFS client and server daemons
 EAPI=4
 HOMEPAGE=http://linux-nfs.org/
@@ -10,5 +10,5 @@ RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsp
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.2.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0eec99763dee85ed697337ca83a5b054
diff --git a/metadata/md5-cache/net-fs/openafs-1.6.2 b/metadata/md5-cache/net-fs/openafs-1.6.2
index f301c70cb17a..0143de89c3b5 100644
--- a/metadata/md5-cache/net-fs/openafs-1.6.2
+++ b/metadata/md5-cache/net-fs/openafs-1.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The OpenAFS distributed file system
 EAPI=4
 HOMEPAGE=http://www.openafs.org/
@@ -9,5 +9,5 @@ LICENSE=IBM BSD openafs-krb5-a APSL-2
 RDEPEND=~net-fs/openafs-kernel-1.6.2 sys-libs/ncurses pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 )
 SLOT=0
 SRC_URI=http://openafs.org/dl/openafs/1.6.2/openafs-1.6.2-src.tar.bz2 http://openafs.org/dl/openafs/1.6.2/openafs-1.6.2-doc.tar.bz2 mirror://gentoo/openafs-1.6.2-patches-1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4fcd59441281df99c8800f2a206c6e6b
diff --git a/metadata/md5-cache/net-fs/openafs-kernel-1.6.2 b/metadata/md5-cache/net-fs/openafs-kernel-1.6.2
index 34c517d391eb..aeda21f17260 100644
--- a/metadata/md5-cache/net-fs/openafs-kernel-1.6.2
+++ b/metadata/md5-cache/net-fs/openafs-kernel-1.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=The OpenAFS distributed file system kernel module
 EAPI=4
 HOMEPAGE=http://www.openafs.org/
@@ -9,5 +9,5 @@ LICENSE=IBM BSD openafs-krb5-a APSL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://openafs.org/dl/openafs/1.6.2/openafs-1.6.2-src.tar.bz2 mirror://gentoo/openafs-1.6.2-patches-1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=631212826889bc144b734e5f4537a664
diff --git a/metadata/md5-cache/net-fs/smbnetfs-0.5.3 b/metadata/md5-cache/net-fs/smbnetfs-0.5.3
index 2f33a19b6d36..6d9cc212c277 100644
--- a/metadata/md5-cache/net-fs/smbnetfs-0.5.3
+++ b/metadata/md5-cache/net-fs/smbnetfs-0.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=sys-fs/fuse-2.3 >=net-fs/samba-3.2[smbclient] gnome? ( gnome-base/gnome-keyring ) virtual/pkgconfig sys-devel/make || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-fs/fuse-2.3 >=net-fs/samba-3.2[smbclient] gnome? ( gnome-base/gnome-keyring ) virtual/pkgconfig sys-devel/make || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=FUSE filesystem for SMB shares
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/smbnetfs
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-fs/fuse-2.3 >=net-fs/samba-3.2[smbclient] gnome? ( gnome-base/gnome-keyring )
 SLOT=0
 SRC_URI=mirror://sourceforge/smbnetfs/smbnetfs-0.5.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1a50d9c0abf9f938afe5c80140150a37
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.5.3 b/metadata/md5-cache/net-ftp/filezilla-3.5.3
index e14917c06da3..15441eddc9ae 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.5.3
+++ b/metadata/md5-cache/net-ftp/filezilla-3.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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 ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=FTP client with lots of useful features and an intuitive interface
 EAPI=2
 HOMEPAGE=http://filezilla-project.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/filezilla/FileZilla_3.5.3_src.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=8009b1c9941232fc40b84936830243bf
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.6.0 b/metadata/md5-cache/net-ftp/filezilla-3.6.0
index 74e170510cd4..2f63f6b3b118 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.6.0
+++ b/metadata/md5-cache/net-ftp/filezilla-3.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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-3.1 >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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-3.1 >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=FTP client with lots of useful features and an intuitive interface
 EAPI=2
 HOMEPAGE=http://filezilla-project.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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-3.1 >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=mirror://sourceforge/filezilla/FileZilla_3.6.0_src.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=0573de5a9ce57466bfdd29364f2d214f
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.6.0.1 b/metadata/md5-cache/net-ftp/filezilla-3.6.0.1
index c669b0c03a6d..daba7116a24e 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.6.0.1
+++ b/metadata/md5-cache/net-ftp/filezilla-3.6.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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-3.1 >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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-3.1 >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=FTP client with lots of useful features and an intuitive interface
 EAPI=5
 HOMEPAGE=http://filezilla-project.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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-3.1 >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=mirror://sourceforge/filezilla/FileZilla_3.6.0.1_src.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=66642431e4be23966d6928b98bc66c7d
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.6.0.2 b/metadata/md5-cache/net-ftp/filezilla-3.6.0.2
index 751f91a118c1..a39d70da4f24 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.6.0.2
+++ b/metadata/md5-cache/net-ftp/filezilla-3.6.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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-3.1 >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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-3.1 >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=FTP client with lots of useful features and an intuitive interface
 EAPI=5
 HOMEPAGE=http://filezilla-project.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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-3.1 >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=mirror://sourceforge/filezilla/FileZilla_3.6.0.2_src.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=dca155778e3d9501dd37d2b1d6d14463
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.6.0.2-r1 b/metadata/md5-cache/net-ftp/filezilla-3.6.0.2-r1
index 21be5a8f1098..f88d1f4e6328 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.6.0.2-r1
+++ b/metadata/md5-cache/net-ftp/filezilla-3.6.0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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-3.1 aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[aqua] ) !aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils ) dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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-3.1 aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[aqua] ) !aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils ) dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=FTP client with lots of useful features and an intuitive interface
 EAPI=5
 HOMEPAGE=http://filezilla-project.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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-3.1 aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[aqua] ) !aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils ) dbus? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=mirror://sourceforge/filezilla/FileZilla_3.6.0.2_src.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=0fbbcdff111b7b62f8058655fdc4d647
diff --git a/metadata/md5-cache/net-ftp/frox-0.7.18-r4 b/metadata/md5-cache/net-ftp/frox-0.7.18-r4
index 4c4522a8a7df..2b1acbfda74a 100644
--- a/metadata/md5-cache/net-ftp/frox-0.7.18-r4
+++ b/metadata/md5-cache/net-ftp/frox-0.7.18-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=clamav? ( >=app-antivirus/clamav-0.80 ) ssl? ( dev-libs/openssl ) kernel_linux? ( >=sys-kernel/linux-headers-2.6 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=clamav? ( >=app-antivirus/clamav-0.80 ) ssl? ( dev-libs/openssl ) kernel_linux? ( >=sys-kernel/linux-headers-2.6 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A transparent ftp proxy
 EAPI=4
 HOMEPAGE=http://frox.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=clamav? ( >=app-antivirus/clamav-0.80 ) ssl? ( dev-libs/openssl ) kernel_linux? ( >=sys-kernel/linux-headers-2.6 )
 SLOT=0
 SRC_URI=http://frox.sourceforge.net/download/frox-0.7.18.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=96df3a0a74e60af7428a2e8875983ffe
diff --git a/metadata/md5-cache/net-ftp/gftp-9999 b/metadata/md5-cache/net-ftp/gftp-9999
index 353c21975a1e..8a86fe47d250 100644
--- a/metadata/md5-cache/net-ftp/gftp-9999
+++ b/metadata/md5-cache/net-ftp/gftp-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst unpack
-DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
+DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
 DESCRIPTION=Gnome based FTP Client
 EAPI=1
 HOMEPAGE=http://www.gftp.org
@@ -7,5 +7,5 @@ IUSE=gtk ssl
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 sys-libs/ncurses sys-libs/readline gtk? ( x11-libs/gtk+:2 ) ssl? ( dev-libs/openssl )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=353514a76743c521b27413ee4ce9b9e1
diff --git a/metadata/md5-cache/net-ftp/lftp-4.4.5 b/metadata/md5-cache/net-ftp/lftp-4.4.5
index 97b6fa9564c4..dcaad9788916 100644
--- a/metadata/md5-cache/net-ftp/lftp-4.4.5
+++ b/metadata/md5-cache/net-ftp/lftp-4.4.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=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 nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer program
 EAPI=5
 HOMEPAGE=http://lftp.yar.ru/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=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
 SLOT=0
 SRC_URI=ftp://ftp.yars.free.net/pub/source/lftp/lftp-4.4.5.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7758b68922f406b148e739ffb1fbee9d
diff --git a/metadata/md5-cache/net-ftp/lftp-4.4.5-r1 b/metadata/md5-cache/net-ftp/lftp-4.4.5-r1
index 37e465823ddb..bfebf7b96cfa 100644
--- a/metadata/md5-cache/net-ftp/lftp-4.4.5-r1
+++ b/metadata/md5-cache/net-ftp/lftp-4.4.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=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 ) openssl? ( >=dev-libs/openssl-0.9.6 ) ) >=sys-libs/readline-5.1 =sys-devel/libtool-2* app-arch/xz-utils dev-lang/perl nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) openssl? ( >=dev-libs/openssl-0.9.6 ) ) >=sys-libs/readline-5.1 =sys-devel/libtool-2* app-arch/xz-utils dev-lang/perl nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer program
 EAPI=5
 HOMEPAGE=http://lftp.yar.ru/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat >=sys-libs/ncurses-5.1 socks5? ( >=net-proxy/dante-1.1.12
 REQUIRED_USE=ssl? ( ^^ ( openssl gnutls ) )
 SLOT=0
 SRC_URI=ftp://ftp.yars.free.net/pub/source/lftp/lftp-4.4.5.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2ec64434e99af0be6ef457634d7d94bd
diff --git a/metadata/md5-cache/net-ftp/ncftp-3.2.5-r2 b/metadata/md5-cache/net-ftp/ncftp-3.2.5-r2
index 9c38ec4fd531..df37d43b1723 100644
--- a/metadata/md5-cache/net-ftp/ncftp-3.2.5-r2
+++ b/metadata/md5-cache/net-ftp/ncftp-3.2.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An extremely configurable ftp client
 EAPI=5
 HOMEPAGE=http://www.ncftp.com/
@@ -9,5 +9,5 @@ LICENSE=Clarified-Artistic
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=ftp://ftp.ncftp.com/ncftp/ncftp-3.2.5-src.tar.bz2 -> ncftp-3.2.5.474.tar.bz2 mirror://openbsd/distfiles/ncftp-325-v6.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=602216ec94bf18a610e2b86ce345d71d
diff --git a/metadata/md5-cache/net-ftp/oftpd-0.3.7-r7 b/metadata/md5-cache/net-ftp/oftpd-0.3.7-r7
index 983b2536067f..b1e10f019963 100644
--- a/metadata/md5-cache/net-ftp/oftpd-0.3.7-r7
+++ b/metadata/md5-cache/net-ftp/oftpd-0.3.7-r7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=net-ftp/ftpbase || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-ftp/ftpbase || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Secure, small, anonymous only ftpd
 EAPI=2
 HOMEPAGE=http://www.time-travellers.org/oftpd
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=net-ftp/ftpbase
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ec175a4a7b7ef93cb046ccb73bc9ccac
diff --git a/metadata/md5-cache/net-ftp/oftpd-0.3.7-r8 b/metadata/md5-cache/net-ftp/oftpd-0.3.7-r8
index f3611d74cea0..be78778c7871 100644
--- a/metadata/md5-cache/net-ftp/oftpd-0.3.7-r8
+++ b/metadata/md5-cache/net-ftp/oftpd-0.3.7-r8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=net-ftp/ftpbase || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-ftp/ftpbase || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Secure, small, anonymous only ftpd
 EAPI=4
 HOMEPAGE=http://www.time-travellers.org/oftpd
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=net-ftp/ftpbase
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b622a9e2eeadd30087b89afcff4f993b
diff --git a/metadata/md5-cache/net-ftp/proftpd-1.3.3g b/metadata/md5-cache/net-ftp/proftpd-1.3.3g
index 04889fccdb14..70d8bab47cb4 100644
--- a/metadata/md5-cache/net-ftp/proftpd-1.3.3g
+++ b/metadata/md5-cache/net-ftp/proftpd-1.3.3g
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An advanced and very configurable FTP server.
 EAPI=2
 HOMEPAGE=http://www.proftpd.org/ http://www.castaglia.org/proftpd/ http://www.thrallingpenguin.com/resources/mod_clamav.htm http://gssmod.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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-ftp )
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a19d20be9ff10a655c3c8981e614ec42
diff --git a/metadata/md5-cache/net-ftp/proftpd-1.3.4a b/metadata/md5-cache/net-ftp/proftpd-1.3.4a
index 0e515329a1f4..1046438a2203 100644
--- a/metadata/md5-cache/net-ftp/proftpd-1.3.4a
+++ b/metadata/md5-cache/net-ftp/proftpd-1.3.4a
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An advanced and very configurable FTP server.
 EAPI=4
 HOMEPAGE=http://www.proftpd.org/ http://www.castaglia.org/proftpd/ http://www.thrallingpenguin.com/resources/mod_clamav.htm http://gssmod.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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-ftp )
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e32dcfe72cf2a43209eb2bf28904b64
diff --git a/metadata/md5-cache/net-ftp/proftpd-1.3.4c b/metadata/md5-cache/net-ftp/proftpd-1.3.4c
index ebf5032daaa7..418b663aba88 100644
--- a/metadata/md5-cache/net-ftp/proftpd-1.3.4c
+++ b/metadata/md5-cache/net-ftp/proftpd-1.3.4c
@@ -4,11 +4,11 @@ DESCRIPTION=An advanced and very configurable FTP server.
 EAPI=4
 HOMEPAGE=http://www.proftpd.org/ http://www.castaglia.org/proftpd/ http://www.thrallingpenguin.com/resources/mod_clamav.htm http://gssmod.sourceforge.net/
 IUSE=acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso exec ifsession ifversion ident ipv6 kerberos ldap linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR linguas_ru_RU linguas_zh_CN linguas_zh_TW memcache mysql ncurses nls openssl pam +pcre postgres qos radius ratio readme rewrite selinux sftp shaper sitemisc softquota sqlite ssl tcpd test trace vroot xinetd
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=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 ) openssl? ( dev-libs/openssl ) pam? ( virtual/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) xinetd? ( virtual/inetd ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
 REQUIRED_USE=ban? ( ctrls ) sftp? ( openssl ) shaper? ( ctrls ) ssl? ( openssl )
 SLOT=0
 SRC_URI=ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.4c.tar.gz 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 )
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f8245b3997d1f1ba8c092fd50d22f621
+_md5_=9deebedc69f684a23c687905f737b8a1
diff --git a/metadata/md5-cache/net-im/amsn-0.98.4-r1 b/metadata/md5-cache/net-im/amsn-0.98.4-r1
index b1b3fb18fb4f..03ba86fb4e31 100644
--- a/metadata/md5-cache/net-im/amsn-0.98.4-r1
+++ b/metadata/md5-cache/net-im/amsn-0.98.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=aMSN Messenger client
 EAPI=4
 HOMEPAGE=http://www.amsn-project.net
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/tcl-8.4 >=dev-lang/tk-8.4 virtual/jpeg media-libs/libpng >=de
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/amsn/amsn/0.98.4/amsn-0.98.4-src.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b397ecd4f553316b7873a976fdd1e499
diff --git a/metadata/md5-cache/net-im/amsn-0.98.9 b/metadata/md5-cache/net-im/amsn-0.98.9
index 1a0aaf8dd854..83dd7253a9d0 100644
--- a/metadata/md5-cache/net-im/amsn-0.98.9
+++ b/metadata/md5-cache/net-im/amsn-0.98.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=aMSN Messenger client
 EAPI=4
 HOMEPAGE=http://www.amsn-project.net
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/tcl-8.4 >=dev-lang/tk-8.4 virtual/jpeg media-libs/libpng >=de
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/amsn/amsn/0.98.9/amsn-0.98.9-src.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=98ec8c1ad27e16c5f395299d98a86621
diff --git a/metadata/md5-cache/net-im/ayttm-0.6.3 b/metadata/md5-cache/net-im/ayttm-0.6.3
index 6c4cd2ae2aa9..67214d64f928 100644
--- a/metadata/md5-cache/net-im/ayttm-0.6.3
+++ b/metadata/md5-cache/net-im/ayttm-0.6.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A multi-protocol instant messaging client
 EAPI=4
 HOMEPAGE=http://ayttm.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ayttm/0.6.3/ayttm-0.6.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bb8b28eb64df57b3a55d6f7d3ff619c5
diff --git a/metadata/md5-cache/net-im/climm-0.7 b/metadata/md5-cache/net-im/climm-0.7
index 8e85256250c4..1dd8468f58eb 100644
--- a/metadata/md5-cache/net-im/climm-0.7
+++ b/metadata/md5-cache/net-im/climm-0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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? ( virtual/pkgconfig ) !gnutls? ( jabber? ( virtual/pkgconfig ) ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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? ( virtual/pkgconfig ) !gnutls? ( jabber? ( virtual/pkgconfig ) ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ICQ text-mode client with many features
 EAPI=2
 HOMEPAGE=http://www.climm.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://www.climm.org/source/climm-0.7.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d2f88c89bf6137e4d31c094d8b3ce40c
diff --git a/metadata/md5-cache/net-im/ekg-1.7 b/metadata/md5-cache/net-im/ekg-1.7
index 58692a46e8a6..b9ff042b3ca8 100644
--- a/metadata/md5-cache/net-im/ekg-1.7
+++ b/metadata/md5-cache/net-im/ekg-1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=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 ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=EKG (Eksperymentalny Klient Gadu-Gadu) - a text client for Polish instant messaging system Gadu-Gadu
 HOMEPAGE=http://ekg.chmurka.net/
 IUSE=ssl ncurses readline zlib python spell threads gif jpeg
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://ekg.chmurka.net/ekg-1.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=19449dc4be1388ecdf22c706414d16d4
diff --git a/metadata/md5-cache/net-im/ekg-1.8_rc1 b/metadata/md5-cache/net-im/ekg-1.8_rc1
index d13a234d7bbe..49156a55c839 100644
--- a/metadata/md5-cache/net-im/ekg-1.8_rc1
+++ b/metadata/md5-cache/net-im/ekg-1.8_rc1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=EKG (Eksperymentalny Klient Gadu-Gadu) - a text client for Polish instant messaging system Gadu-Gadu
 EAPI=2
 HOMEPAGE=http://ekg.chmurka.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://ekg.chmurka.net/ekg-1.8rc1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d4895dd5dd2d923e093b250cab32b6d8
diff --git a/metadata/md5-cache/net-im/ekg-1.8_rc1-r1 b/metadata/md5-cache/net-im/ekg-1.8_rc1-r1
index e679ba17a640..b70bfe5595a7 100644
--- a/metadata/md5-cache/net-im/ekg-1.8_rc1-r1
+++ b/metadata/md5-cache/net-im/ekg-1.8_rc1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=EKG (Eksperymentalny Klient Gadu-Gadu) - a text client for Polish instant messaging system Gadu-Gadu
 EAPI=2
 HOMEPAGE=http://ekg.chmurka.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://ekg.chmurka.net/ekg-1.8rc1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c32113f19112b9d7ec25def5625814eb
diff --git a/metadata/md5-cache/net-im/ekg2-0.3.1-r1 b/metadata/md5-cache/net-im/ekg2-0.3.1-r1
index 8662a2518f77..644c9295908e 100644
--- a/metadata/md5-cache/net-im/ekg2-0.3.1-r1
+++ b/metadata/md5-cache/net-im/ekg2-0.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gpg? ( app-crypt/gpgme ) gsm? ( media-sound/gsm ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) nls? ( virtual/libintl ) oracle? ( dev-db/oracle-instantclient-basic ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline ) ssl? ( dev-libs/openssl ) xosd? ( x11-libs/xosd ) zlib? ( sys-libs/zlib ) gadu? ( net-libs/libgadu gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) ) ncurses? ( sys-libs/ncurses[unicode?] gpm? ( sys-libs/gpm ) spell? ( app-text/aspell ) ) rss? ( dev-libs/expat ) sqlite3? ( dev-db/sqlite:3 ) !sqlite3? ( sqlite? ( dev-db/sqlite:0 ) ) xmpp? ( dev-libs/expat gnutls? ( net-libs/gnutls ) )
 SLOT=0
 SRC_URI=http://pl.ekg2.org/ekg2-0.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=31ec0fd5b5b6a7c319c53adf32c769d1
diff --git a/metadata/md5-cache/net-im/ekg2-9999 b/metadata/md5-cache/net-im/ekg2-9999
index a762dee40b6f..b3ece0fd5b10 100644
--- a/metadata/md5-cache/net-im/ekg2-9999
+++ b/metadata/md5-cache/net-im/ekg2-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=dev-libs/glib:2 gadu? ( net-libs/libgadu ) gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) openssl? ( dev-libs/openssl ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline ) rss? ( dev-libs/expat ) ssl? ( net-libs/gnutls ) xmpp? ( dev-libs/expat ) zlib? ( sys-libs/zlib ) ncurses? ( sys-libs/ncurses[unicode=] gpm? ( sys-libs/gpm ) spell? ( app-text/aspell ) ) sqlite? ( !sqlite2? ( dev-db/sqlite:3 ) sqlite2? ( dev-db/sqlite:0 ) ) sys-devel/gettext dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 gadu? ( net-libs/libgadu ) gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) openssl? ( dev-libs/openssl ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline ) rss? ( dev-libs/expat ) ssl? ( net-libs/gnutls ) xmpp? ( dev-libs/expat ) zlib? ( sys-libs/zlib ) ncurses? ( sys-libs/ncurses[unicode=] gpm? ( sys-libs/gpm ) spell? ( app-text/aspell ) ) sqlite? ( !sqlite2? ( dev-db/sqlite:3 ) sqlite2? ( dev-db/sqlite:0 ) ) sys-devel/gettext dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Text-based, multi-protocol instant messenger
 EAPI=5
 HOMEPAGE=http://www.ekg2.org
@@ -7,5 +7,5 @@ IUSE=gadu gpm gpg gtk minimal ncurses nls nntp openssl perl python readline rss
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gadu? ( net-libs/libgadu ) gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) openssl? ( dev-libs/openssl ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline ) rss? ( dev-libs/expat ) ssl? ( net-libs/gnutls ) xmpp? ( dev-libs/expat ) zlib? ( sys-libs/zlib ) ncurses? ( sys-libs/ncurses[unicode=] gpm? ( sys-libs/gpm ) spell? ( app-text/aspell ) ) sqlite? ( !sqlite2? ( dev-db/sqlite:3 ) sqlite2? ( dev-db/sqlite:0 ) )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=635f615d72afcd5bb3de780121e97d9f
diff --git a/metadata/md5-cache/net-im/gajim-0.15.2-r3 b/metadata/md5-cache/net-im/gajim-0.15.2-r3
deleted file mode 100644
index 129ed61a095a..000000000000
--- a/metadata/md5-cache/net-im/gajim-0.15.2-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=dev-python/pygtk:2 x11-libs/gtk+:2 >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* =dev-lang/python-2*[sqlite,xml]
-DESCRIPTION=Jabber client written in PyGTK
-EAPI=4
-HOMEPAGE=http://www.gajim.org/
-IUSE=avahi crypt dbus gnome kde idle jingle libnotify networkmanager nls spell +srv X xhtml
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=dev-python/pygtk:2 x11-libs/gtk+:2 dev-python/pyasn1 dev-python/pyopenssl crypt? ( app-crypt/gnupg dev-python/pycrypto ) dbus? ( dev-python/dbus-python dev-libs/dbus-glib libnotify? ( dev-python/notify-python ) avahi? ( net-dns/avahi[dbus,gtk,python] ) ) gnome? ( dev-python/libgnome-python dev-python/gnome-keyring-python dev-python/egg-python ) idle? ( x11-libs/libXScrnSaver ) jingle? ( net-libs/farstream:0.1[python] ) kde? ( kde-base/kwallet ) networkmanager? ( dev-python/dbus-python net-misc/networkmanager ) spell? ( app-text/gtkspell:2 ) srv? ( || ( dev-python/libasyncns-python net-dns/bind-tools ) ) xhtml? ( dev-python/docutils ) =dev-lang/python-2* =dev-lang/python-2*[sqlite,xml]
-REQUIRED_USE=libnotify? ( dbus ) avahi? ( dbus )
-SLOT=0
-SRC_URI=http://www.gajim.org/downloads/0.15/gajim-0.15.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2bc0ae9443ae2ae631eaa568d0c7dfad
diff --git a/metadata/md5-cache/net-im/gajim-0.15.2-r4 b/metadata/md5-cache/net-im/gajim-0.15.2-r4
deleted file mode 100644
index c3b9fe63c4e4..000000000000
--- a/metadata/md5-cache/net-im/gajim-0.15.2-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] x11-libs/gtk+:2 >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Jabber client written in PyGTK
-EAPI=5
-HOMEPAGE=http://www.gajim.org/
-IUSE=avahi crypt dbus gnome kde idle jingle libnotify networkmanager nls spell +srv test X xhtml python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] x11-libs/gtk+:2 dev-python/pyasn1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] crypt? ( app-crypt/gnupg dev-python/pycrypto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/dbus-glib libnotify? ( dev-python/notify-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) avahi? ( net-dns/avahi[dbus,gtk,python] ) ) gnome? ( dev-python/libgnome-python dev-python/gnome-keyring-python dev-python/egg-python ) idle? ( x11-libs/libXScrnSaver ) jingle? ( net-libs/farstream:0.1[python] ) kde? ( kde-base/kwallet ) networkmanager? ( dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] net-misc/networkmanager ) spell? ( app-text/gtkspell:2 ) srv? ( || ( dev-python/libasyncns-python net-dns/bind-tools ) ) xhtml? ( dev-python/docutils )
-REQUIRED_USE=libnotify? ( dbus ) avahi? ( dbus )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.gajim.org/downloads/0.15/gajim-0.15.2.tar.bz2 test? ( http://dev.gentoo.org/~jlec/distfiles/gajim-tests-0.15.2.tar.xz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=64187019eb167ffc50b470c43e104f5d
diff --git a/metadata/md5-cache/net-im/gajim-0.15.3 b/metadata/md5-cache/net-im/gajim-0.15.3
deleted file mode 100644
index 4a1514435552..000000000000
--- a/metadata/md5-cache/net-im/gajim-0.15.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] x11-libs/gtk+:2 >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Jabber client written in PyGTK
-EAPI=5
-HOMEPAGE=http://www.gajim.org/
-IUSE=avahi crypt dbus gnome kde idle jingle libnotify networkmanager nls spell +srv test X xhtml python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] x11-libs/gtk+:2 dev-python/pyasn1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] crypt? ( app-crypt/gnupg dev-python/pycrypto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/dbus-glib libnotify? ( dev-python/notify-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) avahi? ( net-dns/avahi[dbus,gtk,python] ) ) gnome? ( dev-python/libgnome-python dev-python/gnome-keyring-python dev-python/egg-python ) idle? ( x11-libs/libXScrnSaver ) jingle? ( net-libs/farstream:0.1[python] ) kde? ( kde-base/kwallet ) networkmanager? ( dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] net-misc/networkmanager ) spell? ( app-text/gtkspell:2 ) srv? ( || ( dev-python/libasyncns-python net-dns/bind-tools ) ) xhtml? ( dev-python/docutils )
-REQUIRED_USE=libnotify? ( dbus ) avahi? ( dbus )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.gajim.org/downloads/0.15/gajim-0.15.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a701c4017e80e0e85ca13f533fec02cb
diff --git a/metadata/md5-cache/net-im/gajim-0.15.3-r1 b/metadata/md5-cache/net-im/gajim-0.15.3-r1
index e184312a3ea2..4d9cf30839b0 100644
--- a/metadata/md5-cache/net-im/gajim-0.15.3-r1
+++ b/metadata/md5-cache/net-im/gajim-0.15.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] x11-libs/gtk+:2 >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] x11-libs/gtk+:2 >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Jabber client written in PyGTK
 EAPI=5
 HOMEPAGE=http://www.gajim.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=libnotify? ( dbus ) avahi? ( dbus )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.gajim.org/downloads/0.15/gajim-0.15.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ccff68632d2b85ac5a2a1a4a26188409
diff --git a/metadata/md5-cache/net-im/linpopup-2.0.4-r1 b/metadata/md5-cache/net-im/linpopup-2.0.4-r1
index 48c6027deb2a..e557556d8612 100644
--- a/metadata/md5-cache/net-im/linpopup-2.0.4-r1
+++ b/metadata/md5-cache/net-im/linpopup-2.0.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/gtk+:2 virtual/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/gtk+:2 virtual/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=GTK+ port of the LinPopUp messaging client for Samba (including Samba 3)
 EAPI=2
 HOMEPAGE=http://linpopup2.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/linpopup2/linpopup-2.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8df6c598b62cb9b5f3f96317e06fa07c
diff --git a/metadata/md5-cache/net-im/linpopup-2.1.0 b/metadata/md5-cache/net-im/linpopup-2.1.0
index 23a34386588a..b4d781c78842 100644
--- a/metadata/md5-cache/net-im/linpopup-2.1.0
+++ b/metadata/md5-cache/net-im/linpopup-2.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/gtk+:2 virtual/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/gtk+:2 virtual/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK+ port of the LinPopUp messaging client for Samba (including Samba 3)
 EAPI=2
 HOMEPAGE=http://linpopup2.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/linpopup2/linpopup-2.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4ddebb150003595c747cd6bfe7eb787d
diff --git a/metadata/md5-cache/net-im/mcabber-0.10.2 b/metadata/md5-cache/net-im/mcabber-0.10.2
index 87d944799514..0f52e706204f 100644
--- a/metadata/md5-cache/net-im/mcabber-0.10.2
+++ b/metadata/md5-cache/net-im/mcabber-0.10.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) aspell? ( app-text/aspell ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) idn? ( net-dns/libidn ) spell? ( app-text/enchant ) dev-libs/glib:2 sys-libs/ncurses >=net-libs/loudmouth-1.4.3-r1[ssl?] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) aspell? ( app-text/aspell ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) idn? ( net-dns/libidn ) spell? ( app-text/enchant ) dev-libs/glib:2 sys-libs/ncurses >=net-libs/loudmouth-1.4.3-r1[ssl?] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A small Jabber console client with various features, like MUC, SSL, PGP
 EAPI=4
 HOMEPAGE=http://mcabber.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) aspell? ( app-text/aspell ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) idn? ( net-dns/libidn ) spell? ( app-text/enchant ) dev-libs/glib:2 sys-libs/ncurses >=net-libs/loudmouth-1.4.3-r1[ssl?]
 SLOT=0
 SRC_URI=http://mcabber.com/files/mcabber-0.10.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2e06ca45d4bfb90b9ff2abe7d4a242c6
diff --git a/metadata/md5-cache/net-im/pidgin-2.10.7-r1 b/metadata/md5-cache/net-im/pidgin-2.10.7-r1
index 4fb88dc99682..cfdea872566f 100644
--- a/metadata/md5-cache/net-im/pidgin-2.10.7-r1
+++ b/metadata/md5-cache/net-im/pidgin-2.10.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( sys-libs/ncurses[unicode] dbus? ( <dev-lang/python-3 ) python? ( <dev-lang/python-3 ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( gnome-extra/evolution-data-server ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-good-0.10* || ( net-libs/farstream:0.1 net-libs/farsight2 ) media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-gconf:0.10 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 dev-python/dbus-python ) perl? ( >=dev-lang/perl-5.8.2-r1[-build] ) gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls] >=net-libs/libgadu-1.11.0[-ssl] ) ) gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/nss-3.11 ) meanwhile? ( net-libs/meanwhile ) silc? ( >=net-im/silc-toolkit-1.0.1 ) tcl? ( dev-lang/tcl ) tk? ( dev-lang/tk ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn ) !<x11-plugins/pidgin-facebookchat-1.69-r1 dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig gtk? ( x11-proto/scrnsaverproto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( <dev-lang/python-3 ) doc? ( app-doc/doxygen ) !gtk? ( nls? ( >=dev-util/intltool-0.41.1 sys-devel/gettext ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( sys-libs/ncurses[unicode] dbus? ( <dev-lang/python-3 ) python? ( <dev-lang/python-3 ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( gnome-extra/evolution-data-server ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-good-0.10* || ( net-libs/farstream:0.1 net-libs/farsight2 ) media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-gconf:0.10 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 dev-python/dbus-python ) perl? ( >=dev-lang/perl-5.8.2-r1[-build] ) gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls] >=net-libs/libgadu-1.11.0[-ssl] ) ) gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/nss-3.11 ) meanwhile? ( net-libs/meanwhile ) silc? ( >=net-im/silc-toolkit-1.0.1 ) tcl? ( dev-lang/tcl ) tk? ( dev-lang/tk ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn ) !<x11-plugins/pidgin-facebookchat-1.69-r1 dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig gtk? ( x11-proto/scrnsaverproto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( <dev-lang/python-3 ) doc? ( app-doc/doxygen ) !gtk? ( nls? ( >=dev-util/intltool-0.41.1 sys-devel/gettext ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GTK Instant Messenger client
 EAPI=4
 HOMEPAGE=http://pidgin.im/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( sys-libs/ncurses[unicode] dbus? ( <dev-lang/python-3 ) python? ( <dev-lang/python-3 ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( gnome-extra/evolution-data-server ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-good-0.10* || ( net-libs/farstream:0.1 net-libs/farsight2 ) media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-gconf:0.10 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 dev-python/dbus-python ) perl? ( >=dev-lang/perl-5.8.2-r1[-build] ) gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls] >=net-libs/libgadu-1.11.0[-ssl] ) ) gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/nss-3.11 ) meanwhile? ( net-libs/meanwhile ) silc? ( >=net-im/silc-toolkit-1.0.1 ) tcl? ( dev-lang/tcl ) tk? ( dev-lang/tk ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn ) !<x11-plugins/pidgin-facebookchat-1.69-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/pidgin/pidgin-2.10.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=30e38bb2bc6e593a031050ad6f520aa8
diff --git a/metadata/md5-cache/net-im/silc-server-1.1.11 b/metadata/md5-cache/net-im/silc-server-1.1.11
index 54de2949bacc..83366fbe65dc 100644
--- a/metadata/md5-cache/net-im/silc-server-1.1.11
+++ b/metadata/md5-cache/net-im/silc-server-1.1.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Server for Secure Internet Live Conferencing
 HOMEPAGE=http://silcnet.org/
 IUSE=ipv6 debug
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<=net-im/silc-toolkit-0.9.12-r1 !<=net-im/silc-client-1.0.1
 SLOT=0
 SRC_URI=http://www.silcnet.org/download/server/sources/silc-server-1.1.11.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=739c86d8b24774baffb1b60e7bf39117
diff --git a/metadata/md5-cache/net-im/silc-server-1.1.14 b/metadata/md5-cache/net-im/silc-server-1.1.14
index 9a7a5bf59985..d9cc8964b636 100644
--- a/metadata/md5-cache/net-im/silc-server-1.1.14
+++ b/metadata/md5-cache/net-im/silc-server-1.1.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Server for Secure Internet Live Conferencing
 HOMEPAGE=http://silcnet.org/
 IUSE=ipv6 debug
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<=net-im/silc-toolkit-0.9.12-r1 !<=net-im/silc-client-1.0.1
 SLOT=0
 SRC_URI=http://www.silcnet.org/download/server/sources/silc-server-1.1.14.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3cceaa16b0a1102bb7123389882a0018
diff --git a/metadata/md5-cache/net-im/silc-server-1.1.2 b/metadata/md5-cache/net-im/silc-server-1.1.2
index 50028ded521d..a85fea4b7944 100644
--- a/metadata/md5-cache/net-im/silc-server-1.1.2
+++ b/metadata/md5-cache/net-im/silc-server-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=!<=net-im/silc-toolkit-0.9.12-r1 !<=net-im/silc-client-1.0.1 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!<=net-im/silc-toolkit-0.9.12-r1 !<=net-im/silc-client-1.0.1 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Server for Secure Internet Live Conferencing
 HOMEPAGE=http://silcnet.org/
 IUSE=ipv6 debug
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<=net-im/silc-toolkit-0.9.12-r1 !<=net-im/silc-client-1.0.1
 SLOT=0
 SRC_URI=http://www.silcnet.org/download/server/sources/silc-server-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8ebd43ced2a9e2df28ea0983d82018b1
diff --git a/metadata/md5-cache/net-im/silc-server-1.1.6 b/metadata/md5-cache/net-im/silc-server-1.1.6
index 585c5e3368c2..f3c567cd7bd6 100644
--- a/metadata/md5-cache/net-im/silc-server-1.1.6
+++ b/metadata/md5-cache/net-im/silc-server-1.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=!<=net-im/silc-toolkit-0.9.12-r1 !<=net-im/silc-client-1.0.1 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!<=net-im/silc-toolkit-0.9.12-r1 !<=net-im/silc-client-1.0.1 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Server for Secure Internet Live Conferencing
 HOMEPAGE=http://silcnet.org/
 IUSE=ipv6 debug
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<=net-im/silc-toolkit-0.9.12-r1 !<=net-im/silc-client-1.0.1
 SLOT=0
 SRC_URI=http://www.silcnet.org/download/server/sources/silc-server-1.1.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2c3b252f1d3056c8cb135e6bf52a2382
diff --git a/metadata/md5-cache/net-im/silc-server-1.1.8 b/metadata/md5-cache/net-im/silc-server-1.1.8
index 66c40f658dec..83146525aa90 100644
--- a/metadata/md5-cache/net-im/silc-server-1.1.8
+++ b/metadata/md5-cache/net-im/silc-server-1.1.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Server for Secure Internet Live Conferencing
 HOMEPAGE=http://silcnet.org/
 IUSE=ipv6 debug
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<=net-im/silc-toolkit-0.9.12-r1 !<=net-im/silc-client-1.0.1
 SLOT=0
 SRC_URI=http://www.silcnet.org/download/server/sources/silc-server-1.1.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=411fb8fe7221001008cc817dc23fd4fd
diff --git a/metadata/md5-cache/net-irc/anope-1.8.7-r1 b/metadata/md5-cache/net-irc/anope-1.8.7-r1
index def38476bcc5..f4051a31d91d 100644
--- a/metadata/md5-cache/net-irc/anope-1.8.7-r1
+++ b/metadata/md5-cache/net-irc/anope-1.8.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare pretend setup
-DEPEND=mysql? ( virtual/mysql ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mysql? ( virtual/mysql ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Anope IRC Services
 EAPI=4
 HOMEPAGE=http://www.anope.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql )
 SLOT=0
 SRC_URI=mirror://sourceforge/anope/anope-1.8.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f8e833f8255b47cb1f4e392034f4bd93
diff --git a/metadata/md5-cache/net-irc/atheme-services-6.0.11 b/metadata/md5-cache/net-irc/atheme-services-6.0.11
index 607baf34f3b1..b5789b569dfe 100644
--- a/metadata/md5-cache/net-irc/atheme-services-6.0.11
+++ b/metadata/md5-cache/net-irc/atheme-services-6.0.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/libmowgli:0 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+DEPEND=dev-libs/libmowgli:0 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 DESCRIPTION=A portable and secure set of open-source and modular IRC services
 EAPI=4
 HOMEPAGE=http://atheme.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=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]
 SLOT=0
 SRC_URI=http://atheme.net/downloads/atheme-services-6.0.11.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a3833c00818b911258586bae0c3f9006
diff --git a/metadata/md5-cache/net-irc/bip-0.8.8-r1 b/metadata/md5-cache/net-irc/bip-0.8.8-r1
index f88f1dc1c9a1..ece90744f55a 100644
--- a/metadata/md5-cache/net-irc/bip-0.8.8-r1
+++ b/metadata/md5-cache/net-irc/bip-0.8.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=sys-devel/flex virtual/yacc ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-devel/flex virtual/yacc ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Multiuser IRC proxy with SSL support
 EAPI=2
 HOMEPAGE=http://bip.milkypond.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/flex virtual/yacc ssl? ( dev-libs/openssl ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) oidentd? ( >=net-misc/oidentd-2.0 )
 SLOT=0
 SRC_URI=ftp://ftp.duckcorp.org/bip/bip-0.8.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2f167bd2f23015c57606dc77e6ed6d2a
diff --git a/metadata/md5-cache/net-irc/bitchx-1.2 b/metadata/md5-cache/net-irc/bitchx-1.2
index d48fcf419033..b3670c8da5ac 100644
--- a/metadata/md5-cache/net-irc/bitchx-1.2
+++ b/metadata/md5-cache/net-irc/bitchx-1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An IRC Client
 EAPI=4
 HOMEPAGE=http://www.bitchx.ca/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=http://bitchx.ca/BitchX-1.2-final.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cac12cb34696cd3ac4e1d3db07359faf
diff --git a/metadata/md5-cache/net-irc/bobotpp-2.2.2 b/metadata/md5-cache/net-irc/bobotpp-2.2.2
index e4f0b3b39962..05275385ad61 100644
--- a/metadata/md5-cache/net-irc/bobotpp-2.2.2
+++ b/metadata/md5-cache/net-irc/bobotpp-2.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=guile? ( dev-scheme/guile ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=guile? ( dev-scheme/guile ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A flexible IRC bot scriptable in scheme
 HOMEPAGE=http://unknownlamer.org/code/bobot.html
 IUSE=guile
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=guile? ( dev-scheme/guile )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/bobotpp/bobotpp-2.2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=838095ec998d0c29aaf4cd6bcd310c31
diff --git a/metadata/md5-cache/net-irc/bobotpp-2.2.3 b/metadata/md5-cache/net-irc/bobotpp-2.2.3
index cf9d8c7522af..233e1859c571 100644
--- a/metadata/md5-cache/net-irc/bobotpp-2.2.3
+++ b/metadata/md5-cache/net-irc/bobotpp-2.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=guile? ( dev-scheme/guile ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=guile? ( dev-scheme/guile ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A flexible IRC bot scriptable in scheme
 EAPI=4
 HOMEPAGE=http://unknownlamer.org/code/bobot.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=guile? ( dev-scheme/guile )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/bobotpp/bobotpp-2.2.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b4a04b676c960e6c5352f846878b86c0
diff --git a/metadata/md5-cache/net-irc/charybdis-3.3.0 b/metadata/md5-cache/net-irc/charybdis-3.3.0
index 950d85bc27ad..a88ad87d703f 100644
--- a/metadata/md5-cache/net-irc/charybdis-3.3.0
+++ b/metadata/md5-cache/net-irc/charybdis-3.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib ) virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib ) virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The atheme project's IRCd based on ratbox
 EAPI=4
 HOMEPAGE=http://atheme.org/project/charybdis http://www.stack.nl/~jilles/irc/#charybdis
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=25308f0a79118133d8567a51cb541017
diff --git a/metadata/md5-cache/net-irc/eiwic-1.1.4 b/metadata/md5-cache/net-irc/eiwic-1.1.4
index 2b948e9cde34..95a4744e37af 100644
--- a/metadata/md5-cache/net-irc/eiwic-1.1.4
+++ b/metadata/md5-cache/net-irc/eiwic-1.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A modular IRC bot written in C
 EAPI=4
 HOMEPAGE=https://github.com/lordi/Eiwic
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/eiwic-1.1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bc1197e4c079a0e3d353ebf5fd5cc143
diff --git a/metadata/md5-cache/net-irc/epic4-2.10.1 b/metadata/md5-cache/net-irc/epic4-2.10.1
index 87741c91d971..146ad908e73c 100644
--- a/metadata/md5-cache/net-irc/epic4-2.10.1
+++ b/metadata/md5-cache/net-irc/epic4-2.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=sys-libs/ncurses-5.2 perl? ( dev-lang/perl ) ssl? ( >=dev-libs/openssl-0.9.5 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.2 perl? ( dev-lang/perl ) ssl? ( >=dev-libs/openssl-0.9.5 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Epic4 IRC Client
 EAPI=4
 HOMEPAGE=http://epicsol.org/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.2 perl? ( dev-lang/perl ) ssl? ( >=dev-libs/openssl-0.9.5 )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e43e97e31d0d6bd6caabc39cc66614dc
diff --git a/metadata/md5-cache/net-irc/epic5-1.1.2 b/metadata/md5-cache/net-irc/epic5-1.1.2
index 16e8c4c0b9bd..d7fa9f88b473 100644
--- a/metadata/md5-cache/net-irc/epic5-1.1.2
+++ b/metadata/md5-cache/net-irc/epic5-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Epic5 IRC Client
 EAPI=4
 HOMEPAGE=http://epicsol.org/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=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 )
 SLOT=0
 SRC_URI=ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7905296a195925d9a2838c65d534c076
diff --git a/metadata/md5-cache/net-irc/hexchat-2.9.4-r2 b/metadata/md5-cache/net-irc/hexchat-2.9.4-r2
index a4cc35762c5f..68305be3b1eb 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.9.4-r2
+++ b/metadata/md5-cache/net-irc/hexchat-2.9.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/glib:2 dbus? ( >=dev-libs/dbus-glib-0.98 ) fastscroll? ( x11-libs/libXft ) gtk? ( x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) perl? ( >=dev-lang/perl-5.8.0 ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) spell? ( dev-libs/libxml2 ) ssl? ( >=dev-libs/openssl-0.9.8u ) theme-manager? ( dev-lang/mono ) virtual/pkgconfig nls? ( sys-devel/gettext ) theme-manager? ( dev-util/monodevelop ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-libs/glib:2 dbus? ( >=dev-libs/dbus-glib-0.98 ) fastscroll? ( x11-libs/libXft ) gtk? ( x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) perl? ( >=dev-lang/perl-5.8.0 ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) spell? ( dev-libs/libxml2 ) ssl? ( >=dev-libs/openssl-0.9.8u ) theme-manager? ( dev-lang/mono ) virtual/pkgconfig nls? ( sys-devel/gettext ) theme-manager? ( dev-util/monodevelop ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Graphical IRC client based on XChat
 EAPI=5
 HOMEPAGE=http://www.hexchat.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dbus? ( >=dev-libs/dbus-glib-0.98 ) fastscroll? ( x11-li
 REQUIRED_USE=plugin-checksum? ( plugins ) plugin-doat? ( plugins ) plugin-fishlim? ( plugins ) plugin-sysinfo? ( plugins )
 SLOT=0
 SRC_URI=mirror://github/hexchat/hexchat/hexchat-2.9.4.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d54f930213f39dbd748f83dfe334de2a
diff --git a/metadata/md5-cache/net-irc/hexchat-2.9.5 b/metadata/md5-cache/net-irc/hexchat-2.9.5
index 62e8ce220cb6..56aeef43e416 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.9.5
+++ b/metadata/md5-cache/net-irc/hexchat-2.9.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/glib:2 dbus? ( >=dev-libs/dbus-glib-0.98 ) fastscroll? ( x11-libs/libXft ) gtk? ( x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) perl? ( >=dev-lang/perl-5.8.0 ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) spell? ( dev-libs/libxml2 ) ssl? ( >=dev-libs/openssl-0.9.8u ) theme-manager? ( dev-lang/mono ) virtual/pkgconfig nls? ( sys-devel/gettext ) theme-manager? ( dev-util/monodevelop ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-libs/glib:2 dbus? ( >=dev-libs/dbus-glib-0.98 ) fastscroll? ( x11-libs/libXft ) gtk? ( x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) perl? ( >=dev-lang/perl-5.8.0 ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) spell? ( dev-libs/libxml2 ) ssl? ( >=dev-libs/openssl-0.9.8u ) theme-manager? ( dev-lang/mono ) virtual/pkgconfig nls? ( sys-devel/gettext ) theme-manager? ( dev-util/monodevelop ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Graphical IRC client based on XChat
 EAPI=5
 HOMEPAGE=http://www.hexchat.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dbus? ( >=dev-libs/dbus-glib-0.98 ) fastscroll? ( x11-li
 REQUIRED_USE=plugin-checksum? ( plugins ) plugin-doat? ( plugins ) plugin-fishlim? ( plugins ) plugin-sysinfo? ( plugins )
 SLOT=0
 SRC_URI=mirror://github/hexchat/hexchat/hexchat-2.9.5.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=41e2007d2c539595a6998335d8aa427d
diff --git a/metadata/md5-cache/net-irc/irssi-9999 b/metadata/md5-cache/net-irc/irssi-9999
index 5e4c72bac0ce..618b80b6e1cc 100644
--- a/metadata/md5-cache/net-irc/irssi-9999
+++ b/metadata/md5-cache/net-irc/irssi-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare test unpack
-DEPEND=sys-libs/ncurses >=dev-libs/glib-2.6.0 ssl? ( dev-libs/openssl ) perl? ( dev-lang/perl ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig >=sys-devel/autoconf-2.58 dev-lang/perl www-client/lynx || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=sys-libs/ncurses >=dev-libs/glib-2.6.0 ssl? ( dev-libs/openssl ) perl? ( dev-lang/perl ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig >=sys-devel/autoconf-2.58 dev-lang/perl www-client/lynx || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=A modular textUI IRC client with IPv6 support
 EAPI=4
 HOMEPAGE=http://irssi.org/
@@ -7,5 +7,5 @@ IUSE=ipv6 +perl ssl socks5
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses >=dev-libs/glib-2.6.0 ssl? ( dev-libs/openssl ) perl? ( dev-lang/perl ) socks5? ( >=net-proxy/dante-1.1.18 ) perl? ( !net-im/silc-client ) dev-lang/perl[-build]
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=495ce04b4b39cdf555e2150a7fb831bd
diff --git a/metadata/md5-cache/net-irc/ngircd-17.1 b/metadata/md5-cache/net-irc/ngircd-17.1
index f74ce7507118..8ef83bb30fa6 100644
--- a/metadata/md5-cache/net-irc/ngircd-17.1
+++ b/metadata/md5-cache/net-irc/ngircd-17.1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/sed-4 virtual/libc ident? ( net-libs/libident ) ssl? ( gnutls
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.berlios.de/pub/ngircd/ngircd-17.1.tar.gz ftp://ngircd.barton.de/pub/ngircd/ngircd-17.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c4eec12462cb24fb96865e862680d1f7
diff --git a/metadata/md5-cache/net-irc/ngircd-18 b/metadata/md5-cache/net-irc/ngircd-18
index 194c6df85686..c626eb8f51c6 100644
--- a/metadata/md5-cache/net-irc/ngircd-18
+++ b/metadata/md5-cache/net-irc/ngircd-18
@@ -10,5 +10,5 @@ RDEPEND=ident? ( net-libs/libident ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls?
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.berlios.de/pub/ngircd/ngircd-18.tar.gz ftp://ngircd.barton.de/pub/ngircd/ngircd-18.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e7e9215afbd5d407ea4aefbe7e01679
diff --git a/metadata/md5-cache/net-irc/telepathy-idle-0.1.12 b/metadata/md5-cache/net-irc/telepathy-idle-0.1.12
index 5c7753a4bd26..754650c4154b 100644
--- a/metadata/md5-cache/net-irc/telepathy-idle-0.1.12
+++ b/metadata/md5-cache/net-irc/telepathy-idle-0.1.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare setup
-DEPEND=>=dev-libs/dbus-glib-0.51 >=dev-libs/glib-2.30.0:2 >=dev-libs/openssl-0.9.7 >=net-libs/telepathy-glib-0.15.9 sys-apps/dbus virtual/pkgconfig test? ( dev-python/twisted-words ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=>=dev-libs/dbus-glib-0.51 >=dev-libs/glib-2.30.0:2 >=dev-libs/openssl-0.9.7 >=net-libs/telepathy-glib-0.15.9 sys-apps/dbus virtual/pkgconfig test? ( dev-python/twisted-words ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=Full-featured IRC connection manager for Telepathy.
 EAPI=4
 HOMEPAGE=http://telepathy.freedesktop.org/wiki/Components
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/dbus-glib-0.51 >=dev-libs/glib-2.30.0:2 >=dev-libs/openssl-0.9.7 >=net-libs/telepathy-glib-0.15.9 sys-apps/dbus =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-idle/telepathy-idle-0.1.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=599871e68dfe3739047baa9e34427470
diff --git a/metadata/md5-cache/net-irc/ultimate-3.0.2-r2 b/metadata/md5-cache/net-irc/ultimate-3.0.2-r2
index 88d1bd938d7f..ead5606f6ab4 100644
--- a/metadata/md5-cache/net-irc/ultimate-3.0.2-r2
+++ b/metadata/md5-cache/net-irc/ultimate-3.0.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=sys-libs/zlib ssl? ( dev-libs/openssl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 ssl? ( dev-libs/openssl )
+DEPEND=sys-libs/zlib ssl? ( dev-libs/openssl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 ssl? ( dev-libs/openssl )
 DESCRIPTION=An IRCd server based on DALnet's DreamForge IRCd
 EAPI=4
 HOMEPAGE=http://www.shadow-realm.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/ultimate/Ultimate3.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fded49c1ed72c5697bc43a87dcc54fad
diff --git a/metadata/md5-cache/net-irc/xchat-2.8.8-r2 b/metadata/md5-cache/net-irc/xchat-2.8.8-r2
index 097b63f8363a..40b63dca6588 100644
--- a/metadata/md5-cache/net-irc/xchat-2.8.8-r2
+++ b/metadata/md5-cache/net-irc/xchat-2.8.8-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Graphical IRC client
 EAPI=3
 HOMEPAGE=http://www.xchat.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 hires-icons? ( GPL-3 )
 RDEPEND=>=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
 SLOT=2
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6320ab0927a9592f47dae1b46f2a95c6
diff --git a/metadata/md5-cache/net-irc/xchat-gnome-0.26.1-r2 b/metadata/md5-cache/net-irc/xchat-gnome-0.26.1-r2
index a4e94c0a2b05..8178c2e0722a 100644
--- a/metadata/md5-cache/net-irc/xchat-gnome-0.26.1-r2
+++ b/metadata/md5-cache/net-irc/xchat-gnome-0.26.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 ) virtual/pkgconfig >=app-text/gnome-doc-utils-0.3.2 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( =dev-lang/python-2* )
+DEPEND=>=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 ) virtual/pkgconfig >=app-text/gnome-doc-utils-0.3.2 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( =dev-lang/python-2* )
 DESCRIPTION=GNOME frontend for the popular X-Chat IRC client
 EAPI=4
 HOMEPAGE=http://live.gnome.org/Xchat-Gnome
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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* )
 SLOT=0
 SRC_URI=mirror://gnome/sources/xchat-gnome/0.26/xchat-gnome-0.26.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=913ad895fdd1d2c81a74fc909cdce2ed
diff --git a/metadata/md5-cache/net-libs/courier-authlib-0.65.0-r1 b/metadata/md5-cache/net-libs/courier-authlib-0.65.0-r1
index 7988a230f65b..fc88ef6ea7fd 100644
--- a/metadata/md5-cache/net-libs/courier-authlib-0.65.0-r1
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.65.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db ) >=dev-libs/openssl-0.9.6 ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( >=dev-db/postgresql-base-8.4 ) sqlite? ( dev-db/sqlite:3 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db ) >=dev-libs/openssl-0.9.6 ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( >=dev-db/postgresql-base-8.4 ) sqlite? ( dev-db/sqlite:3 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Courier authentication library.
 EAPI=4
 HOMEPAGE=http://www.courier-mta.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=( !vpopmail ) sqlite? ( mysql )
 RESTRICT=userpriv !berkdb? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-authlib-0.65.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d5c92673c78a9e21d46f9e99ff564b52
diff --git a/metadata/md5-cache/net-libs/courier-authlib-0.65.0-r2 b/metadata/md5-cache/net-libs/courier-authlib-0.65.0-r2
index 192152735713..3401019d81a8 100644
--- a/metadata/md5-cache/net-libs/courier-authlib-0.65.0-r2
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.65.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db ) >=dev-libs/openssl-0.9.6 ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( >=dev-db/postgresql-base-8.4 ) sqlite? ( dev-db/sqlite:3 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db ) >=dev-libs/openssl-0.9.6 ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( >=dev-db/postgresql-base-8.4 ) sqlite? ( dev-db/sqlite:3 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Courier authentication library.
 EAPI=4
 HOMEPAGE=http://www.courier-mta.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=( !vpopmail )
 RESTRICT=userpriv !berkdb? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-authlib-0.65.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=541419f88990f3ef88f540303aaf6c9c
diff --git a/metadata/md5-cache/net-libs/courier-authlib-0.65.0-r3 b/metadata/md5-cache/net-libs/courier-authlib-0.65.0-r3
index 7e2449373c29..bfbc5b9759a5 100644
--- a/metadata/md5-cache/net-libs/courier-authlib-0.65.0-r3
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.65.0-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db ) >=dev-libs/openssl-0.9.6 ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( >=dev-db/postgresql-base-8.4 ) sqlite? ( dev-db/sqlite:3 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db ) >=dev-libs/openssl-0.9.6 ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( >=dev-db/postgresql-base-8.4 ) sqlite? ( dev-db/sqlite:3 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Courier authentication library.
 EAPI=4
 HOMEPAGE=http://www.courier-mta.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=( !vpopmail )
 RESTRICT=userpriv !berkdb? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-authlib-0.65.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2b5d3d0b77ee8346b9faa2022fb1ebfb
diff --git a/metadata/md5-cache/net-libs/cyassl-2.4.6 b/metadata/md5-cache/net-libs/cyassl-2.4.6
index 6577724ae96b..aff4dfadf43a 100644
--- a/metadata/md5-cache/net-libs/cyassl-2.4.6
+++ b/metadata/md5-cache/net-libs/cyassl-2.4.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Lightweight SSL/TLS library targeted at embedded and RTOS environments
 EAPI=4
 HOMEPAGE=http://www.yassl.com/yaSSL/Home.html
@@ -10,5 +10,5 @@ RDEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=^^ ( small big huge ) test? ( !dtls )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/cyassl/cyassl-2.4.6.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=096100641db6052edef577e02d2a9c9e
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.30.2 b/metadata/md5-cache/net-libs/glib-networking-2.30.2
deleted file mode 100644
index 9d3c830bc9b1..000000000000
--- a/metadata/md5-cache/net-libs/glib-networking-2.30.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 dev-libs/libgcrypt >=net-libs/gnutls-2.1.7 ) >=dev-util/intltool-0.35.0 virtual/pkgconfig sys-devel/gettext app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=Network-related giomodules for glib
-EAPI=4
-HOMEPAGE=http://git.gnome.org/browse/glib-networking/
-IUSE=+gnome +libproxy +ssl
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2+
-RDEPEND=>=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 dev-libs/libgcrypt >=net-libs/gnutls-2.1.7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/glib-networking/2.30/glib-networking-2.30.2.tar.xz
-_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e32ab96e2bcc3cc752f83104fdfc8fc0
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.36.1 b/metadata/md5-cache/net-libs/glib-networking-2.36.1
new file mode 100644
index 000000000000..3c5b56a6cc3d
--- /dev/null
+++ b/metadata/md5-cache/net-libs/glib-networking-2.36.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=dev-libs/glib-2.35.8:2 gnome? ( gnome-base/gsettings-desktop-schemas ) libproxy? ( >=net-libs/libproxy-0.4.6-r3:= ) smartcard? ( >=app-crypt/p11-kit-0.8 >=net-libs/gnutls-2.12.8:=[pkcs11] ) ssl? ( app-misc/ca-certificates >=net-libs/gnutls-2.11.0:= ) >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus[X] ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Network-related giomodules for glib
+EAPI=5
+HOMEPAGE=http://git.gnome.org/browse/glib-networking/
+IUSE=+gnome +libproxy smartcard +ssl test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.35.8:2 gnome? ( gnome-base/gsettings-desktop-schemas ) libproxy? ( >=net-libs/libproxy-0.4.6-r3:= ) smartcard? ( >=app-crypt/p11-kit-0.8 >=net-libs/gnutls-2.12.8:=[pkcs11] ) ssl? ( app-misc/ca-certificates >=net-libs/gnutls-2.11.0:= )
+SLOT=0
+SRC_URI=mirror://gnome/sources/glib-networking/2.36/glib-networking-2.36.1.tar.xz
+_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=59b0cd4f598b9cfc53f6b73b4986639a
diff --git a/metadata/md5-cache/net-libs/gloox-0.9.9.5 b/metadata/md5-cache/net-libs/gloox-0.9.9.5
index 402a5a00e83f..ee6cf5879ea8 100644
--- a/metadata/md5-cache/net-libs/gloox-0.9.9.5
+++ b/metadata/md5-cache/net-libs/gloox-0.9.9.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A portable high-level Jabber/XMPP library for C++
 EAPI=2
 HOMEPAGE=http://camaya.net/gloox
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://camaya.net/download/gloox-0.9.9.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a1b00764af7d6158e1cff47c2afb89fc
diff --git a/metadata/md5-cache/net-libs/gnet-2.0.8-r1 b/metadata/md5-cache/net-libs/gnet-2.0.8-r1
index 9b927905c1d3..3b21e57b8902 100644
--- a/metadata/md5-cache/net-libs/gnet-2.0.8-r1
+++ b/metadata/md5-cache/net-libs/gnet-2.0.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.6:2 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.2 ) >=dev-libs/check-0.9.7 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.6:2 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.2 ) >=dev-libs/check-0.9.7 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A simple network library.
 EAPI=2
 HOMEPAGE=http://live.gnome.org/GNetLibrary
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.6:2
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnet/2.0/gnet-2.0.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e53c9fc3aaaab7e22b7d5ed09588fa24
diff --git a/metadata/md5-cache/net-libs/gnutls-2.12.20 b/metadata/md5-cache/net-libs/gnutls-2.12.20
index dbf200cfd876..098bff2a79e8 100644
--- a/metadata/md5-cache/net-libs/gnutls-2.12.20
+++ b/metadata/md5-cache/net-libs/gnutls-2.12.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=>=dev-libs/libtasn1-0.3.4 <dev-libs/libtasn1-3 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-0.11 ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) !bindist? ( lzo? ( >=dev-libs/lzo-2 ) ) virtual/pkgconfig sys-devel/libtool doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libtasn1-0.3.4 <dev-libs/libtasn1-3 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-0.11 ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) !bindist? ( lzo? ( >=dev-libs/lzo-2 ) ) virtual/pkgconfig sys-devel/libtool doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
 EAPI=4
 HOMEPAGE=http://www.gnutls.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-2.1
 RDEPEND=>=dev-libs/libtasn1-0.3.4 <dev-libs/libtasn1-3 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-0.11 ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )
 SLOT=0
 SRC_URI=mirror://gnu/gnutls/gnutls-2.12.20.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=051ca8c0e8f7315725e5617fd72d40e6
diff --git a/metadata/md5-cache/net-libs/gnutls-2.12.23 b/metadata/md5-cache/net-libs/gnutls-2.12.23
index f0308b90d40c..aa4aac32978f 100644
--- a/metadata/md5-cache/net-libs/gnutls-2.12.23
+++ b/metadata/md5-cache/net-libs/gnutls-2.12.23
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=>=dev-libs/libtasn1-0.3.4 <dev-libs/libtasn1-3 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-0.11 ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) !bindist? ( lzo? ( >=dev-libs/lzo-2 ) ) virtual/pkgconfig sys-devel/libtool doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libtasn1-0.3.4 <dev-libs/libtasn1-3 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-0.11 ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) !bindist? ( lzo? ( >=dev-libs/lzo-2 ) ) virtual/pkgconfig sys-devel/libtool doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
 EAPI=4
 HOMEPAGE=http://www.gnutls.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-2.1
 RDEPEND=>=dev-libs/libtasn1-0.3.4 <dev-libs/libtasn1-3 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-0.11 ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )
 SLOT=0
 SRC_URI=ftp://ftp.gnutls.org/gcrypt/gnutls/v2.12/gnutls-2.12.23.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=89d29403625896473d251102c7db5bb0
diff --git a/metadata/md5-cache/net-libs/gnutls-3.1.10 b/metadata/md5-cache/net-libs/gnutls-3.1.10
index 824eac3f3d81..1d2857e14e48 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.1.10
+++ b/metadata/md5-cache/net-libs/gnutls-3.1.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libtasn1-2.14 >=dev-libs/nettle-2.5[gmp] sys-devel/autogen dane? ( net-dns/unbound ) 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/automake-1.11.6 virtual/pkgconfig doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libtasn1-2.14 >=dev-libs/nettle-2.5[gmp] sys-devel/autogen dane? ( net-dns/unbound ) 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/automake-1.11.6 virtual/pkgconfig doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
 EAPI=5
 HOMEPAGE=http://www.gnutls.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/libtasn1-2.14 >=dev-libs/nettle-2.5[gmp] sys-devel/autogen dane? ( net-dns/unbound ) 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 )
 SLOT=0
 SRC_URI=ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/gnutls-3.1.10.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e03c99a29c429eff63ce772fb3a6cc5f
diff --git a/metadata/md5-cache/net-libs/gnutls-3.1.8 b/metadata/md5-cache/net-libs/gnutls-3.1.8
index 93d32c5c5c12..58dc1a87f42d 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.1.8
+++ b/metadata/md5-cache/net-libs/gnutls-3.1.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libtasn1-2.14 >=dev-libs/nettle-2.5[gmp] sys-devel/autogen dane? ( net-dns/unbound ) 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/automake-1.11.6 virtual/pkgconfig doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libtasn1-2.14 >=dev-libs/nettle-2.5[gmp] sys-devel/autogen dane? ( net-dns/unbound ) 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/automake-1.11.6 virtual/pkgconfig doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
 EAPI=5
 HOMEPAGE=http://www.gnutls.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/libtasn1-2.14 >=dev-libs/nettle-2.5[gmp] sys-devel/autogen dane? ( net-dns/unbound ) 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 )
 SLOT=0
 SRC_URI=ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/gnutls-3.1.8.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=58eeb2b3212356c3b1136097cd2f84af
diff --git a/metadata/md5-cache/net-libs/gnutls-3.1.9-r1 b/metadata/md5-cache/net-libs/gnutls-3.1.9-r1
index 30647f58c2c6..cdfbbbd4c807 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.1.9-r1
+++ b/metadata/md5-cache/net-libs/gnutls-3.1.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libtasn1-2.14 >=dev-libs/nettle-2.5[gmp] sys-devel/autogen dane? ( net-dns/unbound ) 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/automake-1.11.6 virtual/pkgconfig doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libtasn1-2.14 >=dev-libs/nettle-2.5[gmp] sys-devel/autogen dane? ( net-dns/unbound ) 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/automake-1.11.6 virtual/pkgconfig doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
 EAPI=5
 HOMEPAGE=http://www.gnutls.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/libtasn1-2.14 >=dev-libs/nettle-2.5[gmp] sys-devel/autogen dane? ( net-dns/unbound ) 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 )
 SLOT=0
 SRC_URI=ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/gnutls-3.1.9.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4582150d6fe9360a0953c74858958c6b
diff --git a/metadata/md5-cache/net-libs/gsnmp-0.3.0 b/metadata/md5-cache/net-libs/gsnmp-0.3.0
index 776af25af601..a0a79de08ecd 100644
--- a/metadata/md5-cache/net-libs/gsnmp-0.3.0
+++ b/metadata/md5-cache/net-libs/gsnmp-0.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 net-libs/gnet
 SLOT=0
 SRC_URI=ftp://ftp.ibr.cs.tu-bs.de/pub/local/gsnmp/gsnmp-0.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d23952854019d04e09f0d11937f3809d
diff --git a/metadata/md5-cache/net-libs/gsoap-2.7.17 b/metadata/md5-cache/net-libs/gsoap-2.7.17
index 17d6212fb3ef..0f9df0ce0d4a 100644
--- a/metadata/md5-cache/net-libs/gsoap-2.7.17
+++ b/metadata/md5-cache/net-libs/gsoap-2.7.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services
 EAPI=2
 HOMEPAGE=http://gsoap2.sourceforge.net
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2 gSOAP
 SLOT=0
 SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.7.17.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ba3989f51e7704cfe7ef29e0b055e061
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.10 b/metadata/md5-cache/net-libs/gsoap-2.8.10
index af07117c101d..334b9d7c34e9 100644
--- a/metadata/md5-cache/net-libs/gsoap-2.8.10
+++ b/metadata/md5-cache/net-libs/gsoap-2.8.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services
 EAPI=4
 HOMEPAGE=http://gsoap2.sourceforge.net
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 gSOAP
 SLOT=0
 SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.10.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=37e0e6aa4853d1b25efc2231a86f9cfe
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.11 b/metadata/md5-cache/net-libs/gsoap-2.8.11
index 01094190822a..45e50b3aa1d9 100644
--- a/metadata/md5-cache/net-libs/gsoap-2.8.11
+++ b/metadata/md5-cache/net-libs/gsoap-2.8.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services
 EAPI=4
 HOMEPAGE=http://gsoap2.sourceforge.net
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 gSOAP
 SLOT=0
 SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.11.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9cf9a6b6dc6e1aa794c5361dc45bffd1
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.12 b/metadata/md5-cache/net-libs/gsoap-2.8.12
index 8a3b18a776ae..530ea103cada 100644
--- a/metadata/md5-cache/net-libs/gsoap-2.8.12
+++ b/metadata/md5-cache/net-libs/gsoap-2.8.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services
 EAPI=4
 HOMEPAGE=http://gsoap2.sourceforge.net
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 gSOAP
 SLOT=0
 SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.12.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=07dbed29075e6016106482c221713d22
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.13 b/metadata/md5-cache/net-libs/gsoap-2.8.13
index ddc38d6e734b..3641b0a2e3a3 100644
--- a/metadata/md5-cache/net-libs/gsoap-2.8.13
+++ b/metadata/md5-cache/net-libs/gsoap-2.8.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services
 EAPI=4
 HOMEPAGE=http://gsoap2.sourceforge.net
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 gSOAP
 SLOT=0
 SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.13.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1b3a3af1c0d4e6b691efe18bbadeec7d
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.14 b/metadata/md5-cache/net-libs/gsoap-2.8.14
index 7df8c3d762dc..75a640c1afb3 100644
--- a/metadata/md5-cache/net-libs/gsoap-2.8.14
+++ b/metadata/md5-cache/net-libs/gsoap-2.8.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services
 EAPI=4
 HOMEPAGE=http://gsoap2.sourceforge.net
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 gSOAP
 SLOT=0
 SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.14.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e701e4475b2a73e0e3df60b1d6b98127
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.9 b/metadata/md5-cache/net-libs/gsoap-2.8.9
index 94da84f2577e..b63953c1bc41 100644
--- a/metadata/md5-cache/net-libs/gsoap-2.8.9
+++ b/metadata/md5-cache/net-libs/gsoap-2.8.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services
 EAPI=4
 HOMEPAGE=http://gsoap2.sourceforge.net
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 gSOAP
 SLOT=0
 SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.9.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=265df1e324c421bdc0587a69ae26b2d5
diff --git a/metadata/md5-cache/net-libs/gtk-vnc-0.5.0-r1 b/metadata/md5-cache/net-libs/gtk-vnc-0.5.0-r1
index 0cadc6c37e9f..fd70850a4370 100644
--- a/metadata/md5-cache/net-libs/gtk-vnc-0.5.0-r1
+++ b/metadata/md5-cache/net-libs/gtk-vnc-0.5.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2 dev-libs/libgpg-error >=net-libs/gnutls-1.4 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 gtk3? ( >=x11-libs/gtk+-2.91.3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9.4 ) pulseaudio? ( media-sound/pulseaudio ) python? ( >=dev-python/pygtk-2:2 ) sasl? ( dev-libs/cyrus-sasl ) >=dev-lang/perl-5 virtual/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40 gnome-base/gnome-common vala? ( dev-lang/vala:0.14[vapigen] >=dev-libs/gobject-introspection-0.9.4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils python? ( =dev-lang/python-2* )
+DEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2 dev-libs/libgpg-error >=net-libs/gnutls-1.4 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 gtk3? ( >=x11-libs/gtk+-2.91.3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9.4 ) pulseaudio? ( media-sound/pulseaudio ) python? ( >=dev-python/pygtk-2:2 ) sasl? ( dev-libs/cyrus-sasl ) >=dev-lang/perl-5 virtual/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40 gnome-base/gnome-common vala? ( dev-lang/vala:0.14[vapigen] >=dev-libs/gobject-introspection-0.9.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils python? ( =dev-lang/python-2* )
 DESCRIPTION=VNC viewer widget for GTK
 EAPI=4
 HOMEPAGE=http://live.gnome.org/gtk-vnc
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2 dev-libs/libgpg-error >=net-libs/gnutls-1.4 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 gtk3? ( >=x11-libs/gtk+-2.91.3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9.4 ) pulseaudio? ( media-sound/pulseaudio ) python? ( >=dev-python/pygtk-2:2 ) sasl? ( dev-libs/cyrus-sasl ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-vnc/0.5/gtk-vnc-0.5.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dfc55b481c554813202c230d42f53d44
diff --git a/metadata/md5-cache/net-libs/gupnp-igd-0.1.11 b/metadata/md5-cache/net-libs/gupnp-igd-0.1.11
index e0f8915d4c15..b8b60b5840c4 100644
--- a/metadata/md5-cache/net-libs/gupnp-igd-0.1.11
+++ b/metadata/md5-cache/net-libs/gupnp-igd-0.1.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=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 ) virtual/pkgconfig sys-devel/gettext dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+DEPEND=>=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 ) virtual/pkgconfig sys-devel/gettext dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 DESCRIPTION=This is a library to handle UPnP IGD port mapping for GUPnP.
 EAPI=3
 HOMEPAGE=http://gupnp.org
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/gupnp-0.13.2 !>=net-libs/gupnp-0.17 >=dev-libs/glib-2.16:2 in
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.gupnp.org/sites/all/files/sources/gupnp-igd-0.1.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=481ef93c80a8c1fd1244f4dbf2db88cd
diff --git a/metadata/md5-cache/net-libs/gupnp-igd-0.1.7 b/metadata/md5-cache/net-libs/gupnp-igd-0.1.7
index 9a03c7913a55..c9fb86a5ae79 100644
--- a/metadata/md5-cache/net-libs/gupnp-igd-0.1.7
+++ b/metadata/md5-cache/net-libs/gupnp-igd-0.1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=net-libs/gupnp-0.13.2 !>=net-libs/gupnp-0.17 >=dev-libs/glib-2.16:2 python? ( >=dev-python/pygobject-2.16:2 ) virtual/pkgconfig sys-devel/gettext dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+DEPEND=>=net-libs/gupnp-0.13.2 !>=net-libs/gupnp-0.17 >=dev-libs/glib-2.16:2 python? ( >=dev-python/pygobject-2.16:2 ) virtual/pkgconfig sys-devel/gettext dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 DESCRIPTION=This is a library to handle UPnP IGD port mapping for GUPnP.
 EAPI=3
 HOMEPAGE=http://gupnp.org
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=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* ) )
 SLOT=0
 SRC_URI=http://www.gupnp.org/sites/all/files/sources/gupnp-igd-0.1.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a2b2b531896f37a3e4bfcf43dc5b7415
diff --git a/metadata/md5-cache/net-libs/gupnp-igd-0.2.1 b/metadata/md5-cache/net-libs/gupnp-igd-0.2.1
index 85a184541bb8..f85b6fa9438c 100644
--- a/metadata/md5-cache/net-libs/gupnp-igd-0.2.1
+++ b/metadata/md5-cache/net-libs/gupnp-igd-0.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=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 ) virtual/pkgconfig sys-devel/gettext dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+DEPEND=>=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 ) virtual/pkgconfig sys-devel/gettext dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 DESCRIPTION=This is a library to handle UPnP IGD port mapping for GUPnP.
 EAPI=3
 HOMEPAGE=http://gupnp.org
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/gupnp-0.18 >=dev-libs/glib-2.16:2 introspection? ( >=dev-libs
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.gupnp.org/sites/all/files/sources/gupnp-igd-0.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a952dbc27219981704742e6747b38734
diff --git a/metadata/md5-cache/net-libs/gupnp-igd-0.2.2 b/metadata/md5-cache/net-libs/gupnp-igd-0.2.2
index d34dfac16a78..2897520e0194 100644
--- a/metadata/md5-cache/net-libs/gupnp-igd-0.2.2
+++ b/metadata/md5-cache/net-libs/gupnp-igd-0.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=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/gtk-doc-am sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+DEPEND=>=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/gtk-doc-am sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 DESCRIPTION=This is a library to handle UPnP IGD port mapping for GUPnP.
 EAPI=5
 HOMEPAGE=http://gupnp.org
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/gupnp-0.18 >=dev-libs/glib-2.16:2 introspection? ( >=dev-libs
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gupnp-igd/0.2/gupnp-igd-0.2.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2ea0bf0dcb82549f9898b43c5d3d5482
diff --git a/metadata/md5-cache/net-libs/ldns-1.6.12 b/metadata/md5-cache/net-libs/ldns-1.6.12
index 81628495f081..1cff4aacebe7 100644
--- a/metadata/md5-cache/net-libs/ldns-1.6.12
+++ b/metadata/md5-cache/net-libs/ldns-1.6.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=ssl? ( >=dev-libs/openssl-0.9.7 ) gost? ( >=dev-libs/openssl-1 ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+DEPEND=ssl? ( >=dev-libs/openssl-0.9.7 ) gost? ( >=dev-libs/openssl-1 ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 DESCRIPTION=ldns is a library with the aim to simplify DNS programing in C
 EAPI=3
 HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.7 ) gost? ( >=dev-libs/openssl-1 ) python?
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=78b8a93aab3f608f51e0e500b9742175
diff --git a/metadata/md5-cache/net-libs/libbt-1.05 b/metadata/md5-cache/net-libs/libbt-1.05
index c4e20d401227..2a0f8f022dd9 100644
--- a/metadata/md5-cache/net-libs/libbt-1.05
+++ b/metadata/md5-cache/net-libs/libbt-1.05
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=dev-libs/openssl net-misc/curl >=sys-apps/util-linux-2.16.2 !x11-wm/blackbox || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl net-misc/curl >=sys-apps/util-linux-2.16.2 !x11-wm/blackbox || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=implementation of the BitTorrent core protocols in C
 HOMEPAGE=http://libbt.sourceforge.net/
 KEYWORDS=~amd64 ~ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl net-misc/curl >=sys-apps/util-linux-2.16.2 !x11-wm/blackbox
 SLOT=0
 SRC_URI=mirror://sourceforge/libbt/libbt-1.05.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8a812cb1255ab1ab8b3e3258866e7739
diff --git a/metadata/md5-cache/net-libs/libbt-1.06 b/metadata/md5-cache/net-libs/libbt-1.06
index ead33779b970..56f844532771 100644
--- a/metadata/md5-cache/net-libs/libbt-1.06
+++ b/metadata/md5-cache/net-libs/libbt-1.06
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/openssl net-misc/curl >=sys-apps/util-linux-2.16.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl net-misc/curl >=sys-apps/util-linux-2.16.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=implementation of the BitTorrent core protocols in C
 EAPI=2
 HOMEPAGE=http://libbt.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/openssl net-misc/curl >=sys-apps/util-linux-2.16.2
 SLOT=0
 SRC_URI=mirror://sourceforge/libbt/libbt-1.06.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=36ac942b4d1afdaaf1bc257d0c73a83b
diff --git a/metadata/md5-cache/net-libs/libcapi-3.0.7 b/metadata/md5-cache/net-libs/libcapi-3.0.7
index 59e3cc2954e4..ce04428476c8 100644
--- a/metadata/md5-cache/net-libs/libcapi-3.0.7
+++ b/metadata/md5-cache/net-libs/libcapi-3.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=CAPI library used by AVM products
 EAPI=5
 HOMEPAGE=http://www.tabos.org/ffgtk
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2
 SLOT=0
 SRC_URI=http://www.tabos.org/ffgtk/download/libcapi20-3.0.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=421141bc2356245211960eb5b534ecf1
diff --git a/metadata/md5-cache/net-libs/libcapsinetwork-0.3.0 b/metadata/md5-cache/net-libs/libcapsinetwork-0.3.0
index 12544ebef022..1363d3115d5e 100644
--- a/metadata/md5-cache/net-libs/libcapsinetwork-0.3.0
+++ b/metadata/md5-cache/net-libs/libcapsinetwork-0.3.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C++ network library to allow fast development of server daemon processes
 HOMEPAGE=http://unixcode.org/libcapsinetwork
 KEYWORDS=~amd64 ppc sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://unixcode.org/downloads/libcapsinetwork/libcapsinetwork-0.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=319747778298736a95b904807026ec5a
diff --git a/metadata/md5-cache/net-libs/libdmapsharing-2.1.13 b/metadata/md5-cache/net-libs/libdmapsharing-2.1.13
index bb500e0b4dbd..18a3c2911850 100644
--- a/metadata/md5-cache/net-libs/libdmapsharing-2.1.13
+++ b/metadata/md5-cache/net-libs/libdmapsharing-2.1.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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 ) virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library that implements the DMAP family of protocols
 EAPI=3
 HOMEPAGE=http://www.flyn.org/projects/libdmapsharing
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=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 )
 SLOT=2.2
 SRC_URI=http://www.flyn.org/projects/libdmapsharing/libdmapsharing-2.1.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6c32147faa1773ee185742265dc7d48a
diff --git a/metadata/md5-cache/net-libs/libecap-0.0.3 b/metadata/md5-cache/net-libs/libecap-0.0.3
index 7564ea07a438..3ac86b091e72 100644
--- a/metadata/md5-cache/net-libs/libecap-0.0.3
+++ b/metadata/md5-cache/net-libs/libecap-0.0.3
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=!net-libs/libecap:2
 SLOT=0
 SRC_URI=http://www.measurement-factory.com/tmp/ecap/libecap-0.0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ae39793861fb35c0d6dfab69b4f93b79
diff --git a/metadata/md5-cache/net-libs/libecap-0.2.0 b/metadata/md5-cache/net-libs/libecap-0.2.0
index e611bb3931c4..16c9d21ed001 100644
--- a/metadata/md5-cache/net-libs/libecap-0.2.0
+++ b/metadata/md5-cache/net-libs/libecap-0.2.0
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=!net-libs/libecap:0
 SLOT=2
 SRC_URI=http://www.measurement-factory.com/tmp/ecap/libecap-0.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=781efbefa8277cb055d5c5047f3a5465
diff --git a/metadata/md5-cache/net-libs/libetpan-1.0 b/metadata/md5-cache/net-libs/libetpan-1.0
index b92dff4cdc5e..8f4221cf5096 100644
--- a/metadata/md5-cache/net-libs/libetpan-1.0
+++ b/metadata/md5-cache/net-libs/libetpan-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A portable, efficient middleware for different kinds of mail access.
 EAPI=2
 HOMEPAGE=http://libetpan.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=berkdb? ( sys-libs/db ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) sasl? ( dev-libs/cyrus-sasl ) liblockfile? ( net-libs/liblockfile )
 SLOT=0
 SRC_URI=mirror://sourceforge/libetpan/libetpan-1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bf6e5a3b6e293edc527233085a61f49b
diff --git a/metadata/md5-cache/net-libs/libetpan-1.1 b/metadata/md5-cache/net-libs/libetpan-1.1
index 42bbe53745b9..40a8c6b7e47d 100644
--- a/metadata/md5-cache/net-libs/libetpan-1.1
+++ b/metadata/md5-cache/net-libs/libetpan-1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A portable, efficient middleware for different kinds of mail access.
 EAPI=4
 HOMEPAGE=http://libetpan.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=berkdb? ( sys-libs/db ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) sasl? ( dev-libs/cyrus-sasl ) liblockfile? ( net-libs/liblockfile )
 SLOT=0
 SRC_URI=mirror://sourceforge/libetpan/libetpan-1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5c42e5cfe030fb3ef187702c35eb3863
diff --git a/metadata/md5-cache/net-libs/libflowmanager-2.0.4 b/metadata/md5-cache/net-libs/libflowmanager-2.0.4
index 6f434dc6d89c..8b9eea0fcbea 100644
--- a/metadata/md5-cache/net-libs/libflowmanager-2.0.4
+++ b/metadata/md5-cache/net-libs/libflowmanager-2.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libtrace-3.0.6
 SLOT=0/2
 SRC_URI=http://research.wand.net.nz/software/libflowmanager/libflowmanager-2.0.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4d2fef7f705122934a7135a28de14cf8
diff --git a/metadata/md5-cache/net-libs/libgadu-1.11.0 b/metadata/md5-cache/net-libs/libgadu-1.11.0
index f541117620fa..5868ba662011 100644
--- a/metadata/md5-cache/net-libs/libgadu-1.11.0
+++ b/metadata/md5-cache/net-libs/libgadu-1.11.0
@@ -11,5 +11,5 @@ REQUIRED_USE=gnutls? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://toxygen.net/libgadu/files/libgadu-1.11.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9e6ca92a12e73c6b90e3ae3cf75e33ce
diff --git a/metadata/md5-cache/net-libs/libgadu-1.11.1 b/metadata/md5-cache/net-libs/libgadu-1.11.1
index aab6d11c1b68..9bd28b1adb88 100644
--- a/metadata/md5-cache/net-libs/libgadu-1.11.1
+++ b/metadata/md5-cache/net-libs/libgadu-1.11.1
@@ -11,5 +11,5 @@ REQUIRED_USE=gnutls? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://toxygen.net/libgadu/files/libgadu-1.11.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b47bc154ee79024699bf63c74a3f0d9c
diff --git a/metadata/md5-cache/net-libs/libgadu-1.11.2 b/metadata/md5-cache/net-libs/libgadu-1.11.2
index 8dceac0cd61b..ddde2923401c 100644
--- a/metadata/md5-cache/net-libs/libgadu-1.11.2
+++ b/metadata/md5-cache/net-libs/libgadu-1.11.2
@@ -11,5 +11,5 @@ REQUIRED_USE=gnutls? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://toxygen.net/libgadu/files/libgadu-1.11.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3918360391b6fdad22cc53b20c978e78
diff --git a/metadata/md5-cache/net-libs/libgrss-0.3.0 b/metadata/md5-cache/net-libs/libgrss-0.3.0
index adde7fcd04dc..fee960016e14 100644
--- a/metadata/md5-cache/net-libs/libgrss-0.3.0
+++ b/metadata/md5-cache/net-libs/libgrss-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.22.2:2 >=dev-libs/libxml2-2.7.4:2 >=net-libs/libsoup-2.28.1:2.4 app-text/gnome-doc-utils >=dev-util/gtk-doc-am-1.10 dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.22.2:2 >=dev-libs/libxml2-2.7.4:2 >=net-libs/libsoup-2.28.1:2.4 app-text/gnome-doc-utils >=dev-util/gtk-doc-am-1.10 dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=LibGRSS is a library for easy management of RSS/Atom/Pie feeds
 EAPI=5
 HOMEPAGE=http://live.gnome.org/Libgrss
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-libs/glib-2.22.2:2 >=dev-libs/libxml2-2.7.4:2 >=net-libs/libsoup-2.28.1:2.4
 SLOT=0
 SRC_URI=http://gtk.mplat.es/libgrss/tarballs/libgrss-0.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5314db042a71b0a7074a12f36b78247b
diff --git a/metadata/md5-cache/net-libs/libgrss-0.5.0 b/metadata/md5-cache/net-libs/libgrss-0.5.0
index a149c4232be3..d71ddecbe9d9 100644
--- a/metadata/md5-cache/net-libs/libgrss-0.5.0
+++ b/metadata/md5-cache/net-libs/libgrss-0.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/libxml2-2.7.8:2 >=net-libs/libsoup-2.36.1:2.4 app-text/gnome-doc-utils >=dev-util/gtk-doc-am-1.10 dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/libxml2-2.7.8:2 >=net-libs/libsoup-2.36.1:2.4 app-text/gnome-doc-utils >=dev-util/gtk-doc-am-1.10 dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=LibGRSS is a library for easy management of RSS/Atom/Pie feeds
 EAPI=5
 HOMEPAGE=http://live.gnome.org/Libgrss
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/libxml2-2.7.8:2 >=net-libs/libsoup-2.36.1:2.4
 SLOT=0.5
 SRC_URI=http://gtk.mplat.es/libgrss/tarballs/libgrss-0.5.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=47bf5bb6ff7903dd04dd7444f975c834
diff --git a/metadata/md5-cache/net-libs/libgsasl-1.8.0-r1 b/metadata/md5-cache/net-libs/libgsasl-1.8.0-r1
index 3d55b4246fd3..03d5bff23043 100644
--- a/metadata/md5-cache/net-libs/libgsasl-1.8.0-r1
+++ b/metadata/md5-cache/net-libs/libgsasl-1.8.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The GNU SASL library
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/gsasl/
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm ) !net-misc/gsasl
 SLOT=0
 SRC_URI=mirror://gnu/gsasl/libgsasl-1.8.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e8136cc32146b71cdb09514b744da657
diff --git a/metadata/md5-cache/net-libs/libinfinity-0.5.2 b/metadata/md5-cache/net-libs/libinfinity-0.5.2
index cf6027e57276..a233e5711a64 100644
--- a/metadata/md5-cache/net-libs/libinfinity-0.5.2
+++ b/metadata/md5-cache/net-libs/libinfinity-0.5.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2 net-libs/gnutls sys-libs/pam virtual/gsasl avahi? ( net-dns/avahi ) gtk? ( x11-libs/gtk+:3 )
 SLOT=0
 SRC_URI=http://releases.0x539.de/libinfinity/libinfinity-0.5.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5e138b6e6c26d967e9c418cb7b17c96a
diff --git a/metadata/md5-cache/net-libs/libinfinity-0.5.3 b/metadata/md5-cache/net-libs/libinfinity-0.5.3
index 398579f3538b..930bc1ac789b 100644
--- a/metadata/md5-cache/net-libs/libinfinity-0.5.3
+++ b/metadata/md5-cache/net-libs/libinfinity-0.5.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2 net-libs/gnutls sys-libs/pam virtual/gsasl avahi? ( net-dns/avahi ) gtk? ( x11-libs/gtk+:3 )
 SLOT=0
 SRC_URI=http://releases.0x539.de/libinfinity/libinfinity-0.5.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=12c780ac18b38c710498fee5587476fe
diff --git a/metadata/md5-cache/net-libs/libircclient-1.6-r1 b/metadata/md5-cache/net-libs/libircclient-1.6-r1
index dfb7de2b8075..66b1594771f5 100644
--- a/metadata/md5-cache/net-libs/libircclient-1.6-r1
+++ b/metadata/md5-cache/net-libs/libircclient-1.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Small but powerful library implementing the client-server IRC protocol
 EAPI=4
 HOMEPAGE=http://www.ulduzsoft.com/libircclient/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/libircclient/libircclient-1.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=298cd165c644006ed733bf297cc26e36
diff --git a/metadata/md5-cache/net-libs/libiscsi-1.9.0 b/metadata/md5-cache/net-libs/libiscsi-1.9.0
index ad86b6e1907a..3292fce3dd7b 100644
--- a/metadata/md5-cache/net-libs/libiscsi-1.9.0
+++ b/metadata/md5-cache/net-libs/libiscsi-1.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=iscsi client library and utilities
 EAPI=5
 HOMEPAGE=https://github.com/sahlberg/libiscsi
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2
 SLOT=0
 SRC_URI=https://github.com/sahlberg/libiscsi/archive/1.9.0.tar.gz -> libiscsi-1.9.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=613fb7c6c17bcdd2684ce1da6d13c72f
diff --git a/metadata/md5-cache/net-libs/libiscsi-9999 b/metadata/md5-cache/net-libs/libiscsi-9999
index 38bc8666f090..a8801d47f074 100644
--- a/metadata/md5-cache/net-libs/libiscsi-9999
+++ b/metadata/md5-cache/net-libs/libiscsi-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=iscsi client library and utilities
 EAPI=5
 HOMEPAGE=https://github.com/sahlberg/libiscsi
 LICENSE=GPL-2 LGPL-2
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0960f0e8040cdb2d0d2388bdd82387a8
diff --git a/metadata/md5-cache/net-libs/libisds-9999 b/metadata/md5-cache/net-libs/libisds-9999
index ca97574dddd0..e8421c39b02d 100644
--- a/metadata/md5-cache/net-libs/libisds-9999
+++ b/metadata/md5-cache/net-libs/libisds-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-crypt/gpgme dev-libs/expat dev-libs/libgcrypt dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) virtual/pkgconfig nls? ( sys-devel/gettext ) dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-crypt/gpgme dev-libs/expat dev-libs/libgcrypt dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) virtual/pkgconfig nls? ( sys-devel/gettext ) dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Client library for accessing ISDS Soap services
 EAPI=5
 HOMEPAGE=http://xpisar.wz.cz/libisds/
@@ -7,5 +7,5 @@ IUSE=+curl debug nls static-libs test
 LICENSE=LGPL-3
 RDEPEND=app-crypt/gpgme dev-libs/expat dev-libs/libgcrypt dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) >=app-crypt/gnupg-2
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=49345e58ab877a7cd59cb61c306c48d7
diff --git a/metadata/md5-cache/net-libs/liblockfile-1.08 b/metadata/md5-cache/net-libs/liblockfile-1.08
index 63a1769d4c74..509093788049 100644
--- a/metadata/md5-cache/net-libs/liblockfile-1.08
+++ b/metadata/md5-cache/net-libs/liblockfile-1.08
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Implements functions designed to lock the standard mailboxes
 EAPI=2
 HOMEPAGE=http://www.debian.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libl/liblockfile/liblockfile_1.08.orig.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f84b135f20cd66ab2f07cc99348f0e4c
diff --git a/metadata/md5-cache/net-libs/liblockfile-1.09 b/metadata/md5-cache/net-libs/liblockfile-1.09
index c2a647846357..e4071115131c 100644
--- a/metadata/md5-cache/net-libs/liblockfile-1.09
+++ b/metadata/md5-cache/net-libs/liblockfile-1.09
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Implements functions designed to lock the standard mailboxes
 EAPI=4
 HOMEPAGE=http://www.debian.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libl/liblockfile/liblockfile_1.09.orig.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5703addadd7fae3b9eeefa617c56ee26
diff --git a/metadata/md5-cache/net-libs/libmapi-1.0 b/metadata/md5-cache/net-libs/libmapi-1.0
index e51461203c1a..6f392962e331 100644
--- a/metadata/md5-cache/net-libs/libmapi-1.0
+++ b/metadata/md5-cache/net-libs/libmapi-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=net-fs/samba-4.0.0_rc2 dev-libs/boost python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( dev-lang/python )
+DEPEND=>=net-fs/samba-4.0.0_rc2 dev-libs/boost python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( dev-lang/python )
 DESCRIPTION=Portable open-source implementations of Exchange protocols.
 EAPI=4
 HOMEPAGE=http://www.openchange.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=net-fs/samba-4.0.0_rc2 dev-libs/boost python? ( dev-lang/python ) python? ( dev-lang/python )
 SLOT=0
 SRC_URI=http://tracker.openchange.org/attachments/download/180/openchange-1.0-BORG.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=62abb0780edaad3c0894ad9a5247c7f4
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.26 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.26
index 9a9aa34fe35a..ba0a921a2e51 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.26
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.26
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=ssl? ( dev-libs/libgcrypt net-libs/gnutls ) test? ( ssl? ( >=net-misc/curl-7.25.0-r1[ssl] ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ssl? ( dev-libs/libgcrypt net-libs/gnutls ) test? ( ssl? ( >=net-misc/curl-7.25.0-r1[ssl] ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A small C library that makes it easy to run an HTTP server as part of another application.
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/libmicrohttpd/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=ssl? ( dev-libs/libgcrypt net-libs/gnutls )
 SLOT=0
 SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.26.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=755706fd16bb03942d92986304cc317f
diff --git a/metadata/md5-cache/net-libs/libnet-1.0.2a-r5 b/metadata/md5-cache/net-libs/libnet-1.0.2a-r5
index 800e88834ae3..0b162d4e4b79 100644
--- a/metadata/md5-cache/net-libs/libnet-1.0.2a-r5
+++ b/metadata/md5-cache/net-libs/libnet-1.0.2a-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=library to provide an API for commonly used low-level network functions (mainly packet injection)
 EAPI=4
 HOMEPAGE=http://www.packetfactory.net/libnet/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=BSD BSD-2 HPND
 SLOT=1.0
 SRC_URI=http://www.packetfactory.net/libnet/dist/deprecated/libnet-1.0.2a.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e0705fccef00561e1cc44f1171335cc2
diff --git a/metadata/md5-cache/net-libs/libnet-1.2_rc2 b/metadata/md5-cache/net-libs/libnet-1.2_rc2
index 911e887bc833..55ce8d4344d2 100644
--- a/metadata/md5-cache/net-libs/libnet-1.2_rc2
+++ b/metadata/md5-cache/net-libs/libnet-1.2_rc2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-devel/autoconf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-devel/autoconf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=library to provide an API for commonly used low-level network functions (mainly packet injection)
 EAPI=5
 HOMEPAGE=http://libnet-dev.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=BSD BSD-2 HPND
 SLOT=1.1
 SRC_URI=mirror://sourceforge/project/libnet-dev/libnet-1.2-rc2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ae33172bbd6af4f9222a6cf58219090a
diff --git a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2 b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2
index bc49a692f522..a78bf13ef7b1 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2
+++ b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=Userspace library providing interface to extended accounting infrast
 EAPI=5
 HOMEPAGE=http://netfilter.org/projects/libnetfilter_acct
 IUSE=examples
-KEYWORDS=amd64 ~arm ~ia64 ~ppc x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~ia64 ppc x86 ~amd64-linux
 LICENSE=LGPL-2.1
 RDEPEND=net-libs/libmnl
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/libnetfilter_acct/files/libnetfilter_acct-1.0.2.tar.bz2
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=694a067de81b55cbb23c12ab31044aec
+_md5_=ddfc3110a5edc0013f7afb05320bc234
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.0 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.0
index a0da6dc1cae7..0d4174af2ce4 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.0
+++ b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=493d517bbb63fe21598dc2d34be3abe2
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.1 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.1
index 65a87ca3bbe9..31ba96dbe40d 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.1
+++ b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c24d2f0f21bdb3bec0a47e07fbcda962
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.2 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.2
index f29ba987bd90..b528a96915ff 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.2
+++ b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=713c000175a333d63662dff29c6e7d01
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0 b/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0
index ede3d097c287..9a168842ac0d 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0
+++ b/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libmnl
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-1.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0a6f33f9cbd5dc8bce65ffa17cd7fc16
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0 b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0
index 8ec70e4fabc2..edaf13718f5b 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0
+++ b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libmnl
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-1.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2719b7aee5ad423c3b9a596a090f1a4f
diff --git a/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1 b/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
index 5bcab989deb4..eb8f31517dd4 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
+++ b/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=interface to packets that have been logged by the kernel packet filt
 EAPI=5
 HOMEPAGE=http://www.netfilter.org/projects/libnetfilter_log/
 IUSE=static-libs
-KEYWORDS=amd64 ~ia64 ~ppc ~sparc x86
+KEYWORDS=amd64 ~ia64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-1.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=67b7b04cb0368788c981f4bad8a44e0a
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=699d5c8dbc462dcdcbdf207410909c86
diff --git a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.1 b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.1
index 440d88074f65..802d91a8de82 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.1
+++ b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libnfnetlink-0.0.41
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=29041b11574ba692f90146908757c37b
diff --git a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.2 b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.2
index 700acb37d304..12336d782a0b 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.2
+++ b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-0.0.41
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f965155d47745c02637cf5d5b66c1057
diff --git a/metadata/md5-cache/net-libs/libnfsidmap-0.21-r1 b/metadata/md5-cache/net-libs/libnfsidmap-0.21-r1
index d462b4aaf0a8..358d41b4958a 100644
--- a/metadata/md5-cache/net-libs/libnfsidmap-0.21-r1
+++ b/metadata/md5-cache/net-libs/libnfsidmap-0.21-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=ldap? ( net-nds/openldap ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ldap? ( net-nds/openldap ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NFSv4 ID <-> name mapping library
 HOMEPAGE=http://www.citi.umich.edu/projects/nfsv4/linux/
 IUSE=ldap
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=ldap? ( net-nds/openldap ) !<net-fs/nfs-utils-1.1.4 !net-fs/idmapd
 SLOT=0
 SRC_URI=http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-0.21.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fc8cbe09f3d847be489381055840f824
diff --git a/metadata/md5-cache/net-libs/libnfsidmap-0.23-r1 b/metadata/md5-cache/net-libs/libnfsidmap-0.23-r1
index 4d5103595caf..f489af343fad 100644
--- a/metadata/md5-cache/net-libs/libnfsidmap-0.23-r1
+++ b/metadata/md5-cache/net-libs/libnfsidmap-0.23-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=ldap? ( net-nds/openldap ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ldap? ( net-nds/openldap ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NFSv4 ID <-> name mapping library
 EAPI=2
 HOMEPAGE=http://www.citi.umich.edu/projects/nfsv4/linux/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ldap? ( net-nds/openldap ) !<net-fs/nfs-utils-1.2.2 !net-fs/idmapd
 SLOT=0
 SRC_URI=http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-0.23.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=28d896778b7934a99ae8a36b8dcd7c2b
diff --git a/metadata/md5-cache/net-libs/libnfsidmap-0.24 b/metadata/md5-cache/net-libs/libnfsidmap-0.24
index 2b2daa330832..79b38dd52195 100644
--- a/metadata/md5-cache/net-libs/libnfsidmap-0.24
+++ b/metadata/md5-cache/net-libs/libnfsidmap-0.24
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=ldap? ( net-nds/openldap ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ldap? ( net-nds/openldap ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NFSv4 ID <-> name mapping library
 EAPI=2
 HOMEPAGE=http://www.citi.umich.edu/projects/nfsv4/linux/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ldap? ( net-nds/openldap ) !<net-fs/nfs-utils-1.2.2 !net-fs/idmapd
 SLOT=0
 SRC_URI=http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-0.24.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=accc06ffb8606bb01973f5652b2d92b0
diff --git a/metadata/md5-cache/net-libs/liboauth-1.0.1 b/metadata/md5-cache/net-libs/liboauth-1.0.1
index 4ca14758f525..3f59613467c9 100644
--- a/metadata/md5-cache/net-libs/liboauth-1.0.1
+++ b/metadata/md5-cache/net-libs/liboauth-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=nss? ( dev-libs/nss curl? ( || ( net-misc/curl[ssl,curl_ssl_nss] net-mis
 REQUIRED_USE=bindist? ( nss )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/liboauth/liboauth-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2c620b803d4fc6995ba842f509711349
diff --git a/metadata/md5-cache/net-libs/liboping-1.6.1 b/metadata/md5-cache/net-libs/liboping-1.6.1
index 6d7130cadccd..367745866f1f 100644
--- a/metadata/md5-cache/net-libs/liboping-1.6.1
+++ b/metadata/md5-cache/net-libs/liboping-1.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=sys-libs/ncurses perl? ( dev-lang/perl sys-devel/libperl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses perl? ( dev-lang/perl sys-devel/libperl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C library and ncurses based program to generate ICMP echo requests and ping multiple hosts at once
 EAPI=4
 HOMEPAGE=http://verplant.org/liboping
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=sys-libs/ncurses perl? ( dev-lang/perl sys-devel/libperl )
 SLOT=0
 SRC_URI=http://verplant.org/liboping/files/liboping-1.6.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=14c60438ec2afbc1dcfd980f255f93be
diff --git a/metadata/md5-cache/net-libs/liboping-1.6.2 b/metadata/md5-cache/net-libs/liboping-1.6.2
index 013678e27258..7dc4ece361a5 100644
--- a/metadata/md5-cache/net-libs/liboping-1.6.2
+++ b/metadata/md5-cache/net-libs/liboping-1.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=sys-libs/ncurses perl? ( dev-lang/perl sys-devel/libperl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses perl? ( dev-lang/perl sys-devel/libperl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C library and ncurses based program to generate ICMP echo requests and ping multiple hosts at once
 EAPI=4
 HOMEPAGE=http://verplant.org/liboping
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=sys-libs/ncurses perl? ( dev-lang/perl sys-devel/libperl )
 SLOT=0
 SRC_URI=http://verplant.org/liboping/files/liboping-1.6.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=25113114d01dca550a57ca54cfa24d68
diff --git a/metadata/md5-cache/net-libs/libosip-3.5.0 b/metadata/md5-cache/net-libs/libosip-3.5.0
index 3bee52811d91..288c29bfe985 100644
--- a/metadata/md5-cache/net-libs/libosip-3.5.0
+++ b/metadata/md5-cache/net-libs/libosip-3.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a simple way to support the Session Initiation Protocol
 EAPI=2
 HOMEPAGE=http://www.gnu.org/software/osip/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ~sparc x86 ~ppc-macos ~x86-macos
 LICENSE=LGPL-2
 SLOT=2
 SRC_URI=mirror://gnu/osip/libosip2-3.5.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a2389010037d1524c72dd4b629a58b35
diff --git a/metadata/md5-cache/net-libs/libosip-3.6.0 b/metadata/md5-cache/net-libs/libosip-3.6.0
index e0451aad699d..65832a04ba83 100644
--- a/metadata/md5-cache/net-libs/libosip-3.6.0
+++ b/metadata/md5-cache/net-libs/libosip-3.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a simple way to support the Session Initiation Protocol
 EAPI=2
 HOMEPAGE=http://www.gnu.org/software/osip/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ~sparc x86 ~ppc-macos ~x86-macos
 LICENSE=LGPL-2
 SLOT=2
 SRC_URI=mirror://gnu/osip/libosip2-3.6.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b9a8c243a211a1552c05288e2e936360
diff --git a/metadata/md5-cache/net-libs/libosip-4.0.0 b/metadata/md5-cache/net-libs/libosip-4.0.0
index 2230e7289e37..8c089e26a597 100644
--- a/metadata/md5-cache/net-libs/libosip-4.0.0
+++ b/metadata/md5-cache/net-libs/libosip-4.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a simple way to support the Session Initiation Protocol
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/osip/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~ppc-macos ~x86-macos
 LICENSE=LGPL-2
 SLOT=2/4.0
 SRC_URI=mirror://gnu/osip/libosip2-4.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aa666e6c51db0eb4928ca96d095f9d81
diff --git a/metadata/md5-cache/net-libs/libosmocore-0.5.3 b/metadata/md5-cache/net-libs/libosmocore-0.5.3
index cbfef1ceb01c..e81235c8ab10 100644
--- a/metadata/md5-cache/net-libs/libosmocore-0.5.3
+++ b/metadata/md5-cache/net-libs/libosmocore-0.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=app-doc/doxygen || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-doc/doxygen || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utility functions for OsmocomBB, OpenBSC and related projects
 EAPI=4
 HOMEPAGE=http://bb.osmocom.org/trac/wiki/libosmocore
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-3
 SLOT=0
 SRC_URI=http://cgit.osmocom.org/cgit/libosmocore/snapshot/libosmocore-0.5.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2c20ce825f4d5e5095578e0159c7a211
diff --git a/metadata/md5-cache/net-libs/libosmocore-9999 b/metadata/md5-cache/net-libs/libosmocore-9999
index c7bbeb8fba17..36f7e81879c6 100644
--- a/metadata/md5-cache/net-libs/libosmocore-9999
+++ b/metadata/md5-cache/net-libs/libosmocore-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=app-doc/doxygen || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=app-doc/doxygen || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Utility functions for OsmocomBB, OpenBSC and related projects
 EAPI=4
 HOMEPAGE=http://bb.osmocom.org/trac/wiki/libosmocore
 IUSE=embedded
 LICENSE=GPL-2 LGPL-3
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=aaa559faaa00f079c9f75c0aed2c10ad
diff --git a/metadata/md5-cache/net-libs/libpcap-1.1.1-r1 b/metadata/md5-cache/net-libs/libpcap-1.1.1-r1
index d535075357dd..c86b8ddc4af3 100644
--- a/metadata/md5-cache/net-libs/libpcap-1.1.1-r1
+++ b/metadata/md5-cache/net-libs/libpcap-1.1.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=bluetooth? ( net-wireless/bluez ) netlink? ( dev-libs/libnl:1.1 ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=bluetooth? ( net-wireless/bluez ) netlink? ( dev-libs/libnl:1.1 ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A system-independent library for user-level network packet capture
 EAPI=4
 HOMEPAGE=http://www.tcpdump.org/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=bluetooth? ( net-wireless/bluez ) netlink? ( dev-libs/libnl:1.1 )
 SLOT=0
 SRC_URI=http://www.tcpdump.org/release/libpcap-1.1.1.tar.gz http://www.jp.tcpdump.org/release/libpcap-1.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=62b9df1270291a7f5ab174788fbb687c
diff --git a/metadata/md5-cache/net-libs/libpcap-1.3.0-r1 b/metadata/md5-cache/net-libs/libpcap-1.3.0-r1
index d90ed5873c2c..b35fb27478e9 100644
--- a/metadata/md5-cache/net-libs/libpcap-1.3.0-r1
+++ b/metadata/md5-cache/net-libs/libpcap-1.3.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=bluetooth? ( net-wireless/bluez ) netlink? ( dev-libs/libnl:1.1 ) canusb? ( virtual/libusb ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=bluetooth? ( net-wireless/bluez ) netlink? ( dev-libs/libnl:1.1 ) canusb? ( virtual/libusb ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A system-independent library for user-level network packet capture
 EAPI=4
 HOMEPAGE=http://www.tcpdump.org/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=bluetooth? ( net-wireless/bluez ) netlink? ( dev-libs/libnl:1.1 ) canusb? ( virtual/libusb )
 SLOT=0
 SRC_URI=http://www.tcpdump.org/release/libpcap-1.3.0.tar.gz http://www.jp.tcpdump.org/release/libpcap-1.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=72c216bb974be222e1b26742fa3e8ce8
diff --git a/metadata/md5-cache/net-libs/libprotoident-2.0.6 b/metadata/md5-cache/net-libs/libprotoident-2.0.6
index edb2e4a4a65c..1fe0adcedf30 100644
--- a/metadata/md5-cache/net-libs/libprotoident-2.0.6
+++ b/metadata/md5-cache/net-libs/libprotoident-2.0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libtrace-3.0.7 tools? ( net-libs/libflowmanager )
 SLOT=0/2
 SRC_URI=http://research.wand.net.nz/software/libprotoident/libprotoident-2.0.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cfc81d259c97ac2339292c39e5e8d717
diff --git a/metadata/md5-cache/net-libs/libqmi-1.0.0 b/metadata/md5-cache/net-libs/libqmi-1.0.0
index 3f8432cc34ad..47a0e56170d5 100644
--- a/metadata/md5-cache/net-libs/libqmi-1.0.0
+++ b/metadata/md5-cache/net-libs/libqmi-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.32 doc? ( dev-util/gtk-doc ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.32 doc? ( dev-util/gtk-doc ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=QMI modem protocol helper library
 EAPI=4
 HOMEPAGE=http://cgit.freedesktop.org/libqmi/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.32
 SLOT=0
 SRC_URI=http://cgit.freedesktop.org/libqmi/snapshot/libqmi-1.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=1d190329af7fdbaafb4c51e5a8408b40
diff --git a/metadata/md5-cache/net-libs/libqmi-9999 b/metadata/md5-cache/net-libs/libqmi-9999
index 0c5433e213b0..008b91d063e2 100644
--- a/metadata/md5-cache/net-libs/libqmi-9999
+++ b/metadata/md5-cache/net-libs/libqmi-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=dev-libs/glib-2.32 doc? ( dev-util/gtk-doc ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=dev-libs/glib-2.32 doc? ( dev-util/gtk-doc ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=QMI modem protocol helper library
 EAPI=4
 HOMEPAGE=http://cgit.freedesktop.org/libqmi/
@@ -7,5 +7,5 @@ IUSE=doc static-libs test
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.32
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=b29450c1a41df9741a2da6beac7f07ad
diff --git a/metadata/md5-cache/net-libs/librouteros-1.1.2 b/metadata/md5-cache/net-libs/librouteros-1.1.2
index bc2134eaa806..d57d8069598f 100644
--- a/metadata/md5-cache/net-libs/librouteros-1.1.2
+++ b/metadata/md5-cache/net-libs/librouteros-1.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libgcrypt
 SLOT=0
 SRC_URI=http://verplant.org/librouteros/files/librouteros-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0074138ef02c4fd09b7bcf7d51aeb0cd
diff --git a/metadata/md5-cache/net-libs/librsync-0.9.7-r2 b/metadata/md5-cache/net-libs/librsync-0.9.7-r2
index 2073a61dc53d..911db8f0be99 100644
--- a/metadata/md5-cache/net-libs/librsync-0.9.7-r2
+++ b/metadata/md5-cache/net-libs/librsync-0.9.7-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Flexible remote checksum-based differencing
 EAPI=3
 HOMEPAGE=http://librsync.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/popt
 SLOT=0
 SRC_URI=mirror://sourceforge/librsync/librsync-0.9.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a4d8342336cc01d90d073619e64c4b2c
diff --git a/metadata/md5-cache/net-libs/libsocialweb-0.25.21 b/metadata/md5-cache/net-libs/libsocialweb-0.25.21
index fa351ea2d682..335a06b05ee4 100644
--- a/metadata/md5-cache/net-libs/libsocialweb-0.25.21
+++ b/metadata/md5-cache/net-libs/libsocialweb-0.25.21
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.14:2 >=net-libs/rest-0.7.10 gnome-base/gconf:2 gnome-base/libgnome-keyring dev-libs/dbus-glib dev-libs/json-glib net-libs/libsoup:2.4 gnome? ( || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.25.1:2.4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) networkmanager? ( net-misc/networkmanager ) !networkmanager? ( connman? ( net-misc/connman ) ) >=dev-util/gtk-doc-am-1.15 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] dev-lang/vala:0.12[vapigen] ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2*
+DEPEND=>=dev-libs/glib-2.14:2 >=net-libs/rest-0.7.10 gnome-base/gconf:2 gnome-base/libgnome-keyring dev-libs/dbus-glib dev-libs/json-glib net-libs/libsoup:2.4 gnome? ( || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.25.1:2.4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) networkmanager? ( net-misc/networkmanager ) !networkmanager? ( connman? ( net-misc/connman ) ) >=dev-util/gtk-doc-am-1.15 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] dev-lang/vala:0.14[vapigen] dev-lang/vala:0.12[vapigen] ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2*
 DESCRIPTION=Social web services integration framework
 EAPI=4
 HOMEPAGE=http://git.gnome.org/browse/libsocialweb
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.14:2 >=net-libs/rest-0.7.10 gnome-base/gconf:2 gnome-b
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsocialweb/0.25/libsocialweb-0.25.21.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=30aa22de7eff1e996d5e76669ccf4709
diff --git a/metadata/md5-cache/net-libs/libsoup-gnome-2.38.1 b/metadata/md5-cache/net-libs/libsoup-gnome-2.38.1
index 83753f961cd7..37d544a1cc26 100644
--- a/metadata/md5-cache/net-libs/libsoup-gnome-2.38.1
+++ b/metadata/md5-cache/net-libs/libsoup-gnome-2.38.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=~net-libs/libsoup-2.38.1[introspection?] || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) dev-db/sqlite:3 introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) virtual/pkgconfig >=dev-util/gtk-doc-am-1.10 !>=net-libs/libsoup-2.42 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=~net-libs/libsoup-2.38.1[introspection?] || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) dev-db/sqlite:3 introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) virtual/pkgconfig >=dev-util/gtk-doc-am-1.10 !>=net-libs/libsoup-2.42 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GNOME plugin for libsoup
 EAPI=4
 HOMEPAGE=http://live.gnome.org/LibSoup
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=~net-libs/libsoup-2.38.1[introspection?] || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) dev-db/sqlite:3 introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.38/libsoup-2.38.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a3af96ad4ad5b2e6c6c7d3eea8521c1b
diff --git a/metadata/md5-cache/net-libs/libsoup-gnome-2.40.3 b/metadata/md5-cache/net-libs/libsoup-gnome-2.40.3
index cf250117edb3..7fc42ccf7d9f 100644
--- a/metadata/md5-cache/net-libs/libsoup-gnome-2.40.3
+++ b/metadata/md5-cache/net-libs/libsoup-gnome-2.40.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=~net-libs/libsoup-2.40.3[introspection?] || ( 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/gtk-doc-am-1.10 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig !>=net-libs/libsoup-2.42 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=~net-libs/libsoup-2.40.3[introspection?] || ( 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/gtk-doc-am-1.10 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig !>=net-libs/libsoup-2.42 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GNOME plugin for libsoup
 EAPI=5
 HOMEPAGE=http://live.gnome.org/LibSoup
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=~net-libs/libsoup-2.40.3[introspection?] || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) dev-db/sqlite:3= introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.40/libsoup-2.40.3.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1aef06a85ab73293895aac82e0ada612
diff --git a/metadata/md5-cache/net-libs/libssh2-1.4.2 b/metadata/md5-cache/net-libs/libssh2-1.4.2
index 8ac791cbca29..f2e99fb1a5b2 100644
--- a/metadata/md5-cache/net-libs/libssh2-1.4.2
+++ b/metadata/md5-cache/net-libs/libssh2-1.4.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!gcrypt? ( dev-libs/openssl ) gcrypt? ( dev-libs/libgcrypt ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://www.libssh2.org/download/libssh2-1.4.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4038ab80f2c0787970dce91f20d91b5d
diff --git a/metadata/md5-cache/net-libs/libssh2-1.4.3 b/metadata/md5-cache/net-libs/libssh2-1.4.3
index 01ee5154f216..21ef33322f4e 100644
--- a/metadata/md5-cache/net-libs/libssh2-1.4.3
+++ b/metadata/md5-cache/net-libs/libssh2-1.4.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!gcrypt? ( dev-libs/openssl ) gcrypt? ( dev-libs/libgcrypt ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://www.libssh2.org/download/libssh2-1.4.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=daf33a53b28a386a26ef27afcc7ae039
diff --git a/metadata/md5-cache/net-libs/libtorrent-0.12.9 b/metadata/md5-cache/net-libs/libtorrent-0.12.9
index 71f2795db48c..ab7b4665bfc5 100644
--- a/metadata/md5-cache/net-libs/libtorrent-0.12.9
+++ b/metadata/md5-cache/net-libs/libtorrent-0.12.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libsigc++-2.2.2:2 ssl? ( dev-libs/openssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://libtorrent.rakshasa.no/downloads/libtorrent-0.12.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a52f0a96d68dfa6ae4db954aca0827c3
diff --git a/metadata/md5-cache/net-libs/libtrace-3.0.14 b/metadata/md5-cache/net-libs/libtrace-3.0.14
index a591c6f491ac..d6be8cd67b35 100644
--- a/metadata/md5-cache/net-libs/libtrace-3.0.14
+++ b/metadata/md5-cache/net-libs/libtrace-3.0.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=net-libs/libpcap-0.8 ncurses? ( sys-libs/ncurses ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) lzo? ( dev-libs/lzo ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-libs/libpcap-0.8 ncurses? ( sys-libs/ncurses ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) lzo? ( dev-libs/lzo ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library and tools for trace processing
 EAPI=4
 HOMEPAGE=http://research.wand.net.nz/software/libtrace.php
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libpcap-0.8 ncurses? ( sys-libs/ncurses ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) lzo? ( dev-libs/lzo )
 SLOT=0
 SRC_URI=http://research.wand.net.nz/software/libtrace/libtrace-3.0.14.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=29ad98fbadd9dd6ca1c9b409d65c6d2f
diff --git a/metadata/md5-cache/net-libs/libtrace-3.0.15 b/metadata/md5-cache/net-libs/libtrace-3.0.15
index 5325b1a427a1..82150de27c58 100644
--- a/metadata/md5-cache/net-libs/libtrace-3.0.15
+++ b/metadata/md5-cache/net-libs/libtrace-3.0.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=net-libs/libpcap-0.8 ncurses? ( sys-libs/ncurses ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) lzo? ( dev-libs/lzo ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-libs/libpcap-0.8 ncurses? ( sys-libs/ncurses ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) lzo? ( dev-libs/lzo ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library and tools for trace processing
 EAPI=5
 HOMEPAGE=http://research.wand.net.nz/software/libtrace.php
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libpcap-0.8 ncurses? ( sys-libs/ncurses ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) lzo? ( dev-libs/lzo )
 SLOT=0
 SRC_URI=http://research.wand.net.nz/software/libtrace/libtrace-3.0.15.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=69d3dff71d5e940679c9dfe001b712d3
diff --git a/metadata/md5-cache/net-libs/libtrace-3.0.16 b/metadata/md5-cache/net-libs/libtrace-3.0.16
index f8c5eeb83a0b..409c0431c76b 100644
--- a/metadata/md5-cache/net-libs/libtrace-3.0.16
+++ b/metadata/md5-cache/net-libs/libtrace-3.0.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=net-libs/libpcap-0.8 ncurses? ( sys-libs/ncurses ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) lzo? ( dev-libs/lzo ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-libs/libpcap-0.8 ncurses? ( sys-libs/ncurses ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) lzo? ( dev-libs/lzo ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library and tools for trace processing
 EAPI=5
 HOMEPAGE=http://research.wand.net.nz/software/libtrace.php
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libpcap-0.8 ncurses? ( sys-libs/ncurses ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) lzo? ( dev-libs/lzo )
 SLOT=0
 SRC_URI=http://research.wand.net.nz/software/libtrace/libtrace-3.0.16.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f48d5dbfb64b24168b8d417c88792d2b
diff --git a/metadata/md5-cache/net-libs/libupnp-1.6.17 b/metadata/md5-cache/net-libs/libupnp-1.6.17
index 9a765fe81e04..5e35fbd3c76b 100644
--- a/metadata/md5-cache/net-libs/libupnp-1.6.17
+++ b/metadata/md5-cache/net-libs/libupnp-1.6.17
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-l
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/pupnp/libupnp-1.6.17.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f2523f9bed629cdc569455064436b13b
diff --git a/metadata/md5-cache/net-libs/libupnp-1.6.18 b/metadata/md5-cache/net-libs/libupnp-1.6.18
index 78e2d34bd4e5..e37baae9ca73 100644
--- a/metadata/md5-cache/net-libs/libupnp-1.6.18
+++ b/metadata/md5-cache/net-libs/libupnp-1.6.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An Portable Open Source UPnP Development Kit
 EAPI=4
 HOMEPAGE=http://pupnp.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-l
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/pupnp/libupnp-1.6.18.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=565d152789f6573a5b9369f56d1dbd6a
diff --git a/metadata/md5-cache/net-libs/libyahoo2-1.0.1 b/metadata/md5-cache/net-libs/libyahoo2-1.0.1
index e82f457f5990..25f23541cf5a 100644
--- a/metadata/md5-cache/net-libs/libyahoo2-1.0.1
+++ b/metadata/md5-cache/net-libs/libyahoo2-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=interface to the new Yahoo! Messenger protocol
 EAPI=2
 HOMEPAGE=http://libyahoo2.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/libyahoo2/libyahoo2-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c2e297a9fb091720889fe167df80ad05
diff --git a/metadata/md5-cache/net-libs/loudmouth-1.4.3-r2 b/metadata/md5-cache/net-libs/loudmouth-1.4.3-r2
index 0871d9a8e40d..fd81bdafae66 100644
--- a/metadata/md5-cache/net-libs/loudmouth-1.4.3-r2
+++ b/metadata/md5-cache/net-libs/loudmouth-1.4.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.4 net-dns/libidn ssl? ( >=net-libs/gnutls-1.4.0 ) asyncns? ( net-libs/libasyncns ) test? ( dev-libs/check ) virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) >=dev-util/gtk-doc-am-1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.4 net-dns/libidn ssl? ( >=net-libs/gnutls-1.4.0 ) asyncns? ( net-libs/libasyncns ) test? ( dev-libs/check ) virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) >=dev-util/gtk-doc-am-1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Lightweight C Jabber library
 EAPI=4
 HOMEPAGE=https://github.com/engineyard/loudmouth
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.4 net-dns/libidn ssl? ( >=net-libs/gnutls-1.4.0 ) asyncns? ( net-libs/libasyncns )
 SLOT=0
 SRC_URI=mirror://gnome/sources/loudmouth/1.4/loudmouth-1.4.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a70c5ecd6ebc54e6d3af07ddf73d94f8
diff --git a/metadata/md5-cache/net-libs/neon-0.29.6-r1 b/metadata/md5-cache/net-libs/neon-0.29.6-r1
index 4d7d9eba3069..3345fe28d86d 100644
--- a/metadata/md5-cache/net-libs/neon-0.29.6-r1
+++ b/metadata/md5-cache/net-libs/neon-0.29.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HTTP and WebDAV client library
 EAPI=4
 HOMEPAGE=http://www.webdav.org/neon/
@@ -10,5 +10,5 @@ RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2 ) gnutls? ( app-mis
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.webdav.org/neon/neon-0.29.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=92f41d4705eb3c2e2b7ad93749d5e581
diff --git a/metadata/md5-cache/net-libs/neon-0.29.6-r2 b/metadata/md5-cache/net-libs/neon-0.29.6-r2
index 0e257f7e7c13..a270edd9bf44 100644
--- a/metadata/md5-cache/net-libs/neon-0.29.6-r2
+++ b/metadata/md5-cache/net-libs/neon-0.29.6-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HTTP and WebDAV client library
 EAPI=4
 HOMEPAGE=http://www.webdav.org/neon/
@@ -10,5 +10,5 @@ RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2 ) gnutls? ( app-mis
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.webdav.org/neon/neon-0.29.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0d9b23e0eb74171236092cc4f8a3dba9
diff --git a/metadata/md5-cache/net-libs/neon-0.29.6-r5 b/metadata/md5-cache/net-libs/neon-0.29.6-r5
index d76a1841dda9..6c909780dc36 100644
--- a/metadata/md5-cache/net-libs/neon-0.29.6-r5
+++ b/metadata/md5-cache/net-libs/neon-0.29.6-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HTTP and WebDAV client library
 EAPI=4
 HOMEPAGE=http://www.webdav.org/neon/
@@ -10,5 +10,5 @@ RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2 ) gnutls? ( app-mis
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.webdav.org/neon/neon-0.29.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fac54560aadd11948a447e26245c1c93
diff --git a/metadata/md5-cache/net-libs/nodejs-0.10.1 b/metadata/md5-cache/net-libs/nodejs-0.10.1
deleted file mode 100644
index 3cd67e8132cb..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-0.10.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/openssl virtual/python-json
-DESCRIPTION=Evented IO for V8 Javascript
-EAPI=5
-HOMEPAGE=http://nodejs.org/
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=dev-libs/openssl
-RESTRICT=test
-SLOT=0
-SRC_URI=http://nodejs.org/dist/v0.10.1/node-v0.10.1.tar.gz
-_eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	d727728a240d5f59bf9370a64259fd61	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=7125550340a6d1dd17e66fe8bbf0dd9b
diff --git a/metadata/md5-cache/net-libs/nodejs-0.10.3 b/metadata/md5-cache/net-libs/nodejs-0.10.3
deleted file mode 100644
index 2f1c814df26e..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-0.10.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/openssl virtual/python-json
-DESCRIPTION=Evented IO for V8 Javascript
-EAPI=5
-HOMEPAGE=http://nodejs.org/
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=dev-libs/openssl
-RESTRICT=test
-SLOT=0
-SRC_URI=http://nodejs.org/dist/v0.10.3/node-v0.10.3.tar.gz
-_eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	d727728a240d5f59bf9370a64259fd61	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=22b5d0f058bd4b189446f971a95835b5
diff --git a/metadata/md5-cache/net-libs/nodejs-0.10.2 b/metadata/md5-cache/net-libs/nodejs-0.10.5
similarity index 84%
rename from metadata/md5-cache/net-libs/nodejs-0.10.2
rename to metadata/md5-cache/net-libs/nodejs-0.10.5
index e371f0ebb9fe..3e55fccb62f2 100644
--- a/metadata/md5-cache/net-libs/nodejs-0.10.2
+++ b/metadata/md5-cache/net-libs/nodejs-0.10.5
@@ -8,6 +8,6 @@ LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=dev-libs/openssl
 RESTRICT=test
 SLOT=0
-SRC_URI=http://nodejs.org/dist/v0.10.2/node-v0.10.2.tar.gz
+SRC_URI=http://nodejs.org/dist/v0.10.5/node-v0.10.5.tar.gz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	d727728a240d5f59bf9370a64259fd61	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=61924c28dc560b5b2bae4cb4219b1de9
+_md5_=67da3d165859f4647bd17c9f73cfcd35
diff --git a/metadata/md5-cache/net-libs/opal-3.10.10 b/metadata/md5-cache/net-libs/opal-3.10.10
index bef2a276888e..abdde1fa063f 100644
--- a/metadata/md5-cache/net-libs/opal-3.10.10
+++ b/metadata/md5-cache/net-libs/opal-3.10.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=net-libs/ptlib-2.10.10:=[stun,debug=,audio?,dtmf,http,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] ) virtual/pkgconfig >=sys-devel/gcc-3 java? ( swig? ( dev-lang/swig ) >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=>=net-libs/ptlib-2.10.10:=[stun,debug=,audio?,dtmf,http,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] ) virtual/pkgconfig >=sys-devel/gcc-3 java? ( swig? ( dev-lang/swig ) >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=C++ class library normalising numerous telephony protocols
 EAPI=5
 HOMEPAGE=http://www.opalvoip.org/
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/ptlib-2.10.10:=[stun,debug=,audio?,dtmf,http,ipv6?,ldap?,ssl?
 REQUIRED_USE=x264-static? ( x264 ) h281? ( h224 ) sip? ( sipim )
 SLOT=0
 SRC_URI=mirror://sourceforge/opalvoip/opal-3.10.10.tar.bz2 doc? ( mirror://sourceforge/opalvoip/opal-3.10.10-htmldoc.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=25134dfec90b0d7a6fbff71c530bb3cb
diff --git a/metadata/md5-cache/net-libs/opal-3.10.9 b/metadata/md5-cache/net-libs/opal-3.10.9
index 59224c04f075..5d628936b5a8 100644
--- a/metadata/md5-cache/net-libs/opal-3.10.9
+++ b/metadata/md5-cache/net-libs/opal-3.10.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=net-libs/ptlib-2.10.9[stun,debug=,audio?,dtmf,http,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] ) virtual/pkgconfig >=sys-devel/gcc-3 java? ( swig? ( dev-lang/swig ) >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=>=net-libs/ptlib-2.10.9[stun,debug=,audio?,dtmf,http,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] ) virtual/pkgconfig >=sys-devel/gcc-3 java? ( swig? ( dev-lang/swig ) >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=C++ class library normalising numerous telephony protocols
 EAPI=4
 HOMEPAGE=http://www.opalvoip.org/
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/ptlib-2.10.9[stun,debug=,audio?,dtmf,http,ipv6?,ldap?,ssl?,vi
 REQUIRED_USE=x264-static? ( x264 ) h281? ( h224 ) sip? ( sipim )
 SLOT=0
 SRC_URI=mirror://sourceforge/opalvoip/opal-3.10.9.tar.bz2 doc? ( mirror://sourceforge/opalvoip/opal-3.10.9-htmldoc.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=725f027188054402ad605319937dc892
diff --git a/metadata/md5-cache/net-libs/opal-3.6.8-r2 b/metadata/md5-cache/net-libs/opal-3.6.8-r2
index 8bf78510f179..eb7244f86a86 100644
--- a/metadata/md5-cache/net-libs/opal-3.6.8-r2
+++ b/metadata/md5-cache/net-libs/opal-3.6.8-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=<net-libs/ptlib-2.10.8[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] ) virtual/pkgconfig >=sys-devel/gcc-3 java? ( swig? ( dev-lang/swig ) >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=<net-libs/ptlib-2.10.8[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] ) virtual/pkgconfig >=sys-devel/gcc-3 java? ( swig? ( dev-lang/swig ) >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=C++ class library normalising numerous telephony protocols
 EAPI=4
 HOMEPAGE=http://www.opalvoip.org/
@@ -10,5 +10,5 @@ RDEPEND=<net-libs/ptlib-2.10.8[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?,
 REQUIRED_USE=x264-static? ( x264 ) h281? ( h224 )
 SLOT=0
 SRC_URI=mirror://sourceforge/opalvoip/opal-3.6.8.tar.bz2 doc? ( mirror://sourceforge/opalvoip/opal-3.6.7-htmldoc.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=74f031b83e64e3f5dd2088ca78af8737
diff --git a/metadata/md5-cache/net-libs/openmq-cclient-4.4.1 b/metadata/md5-cache/net-libs/openmq-cclient-4.4.1
index da505b88f056..adab41836a05 100644
--- a/metadata/md5-cache/net-libs/openmq-cclient-4.4.1
+++ b/metadata/md5-cache/net-libs/openmq-cclient-4.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/nss dev-libs/nspr virtual/pkgconfig app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/nss dev-libs/nspr virtual/pkgconfig app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C-Client Library for Open Source Java Message Service (JMS)
 EAPI=2
 HOMEPAGE=https://mq.dev.java.net/
@@ -8,5 +8,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=dev-libs/nss dev-libs/nspr
 SLOT=0
 SRC_URI=http://download.java.net/mq/open-mq/4.4u1/b7-final/openmq4_4-source.zip -> openmq4.4u1b7-final-source.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7a061c4b1419ad29a895502532ca3576
diff --git a/metadata/md5-cache/net-libs/openpgm-5.1.116 b/metadata/md5-cache/net-libs/openpgm-5.1.116
index fe32eb0f25d5..597fb010540a 100644
--- a/metadata/md5-cache/net-libs/openpgm-5.1.116
+++ b/metadata/md5-cache/net-libs/openpgm-5.1.116
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenPGM is an open source implementation of the Pragmatic General Multicast (PGM) specification
 EAPI=3
 HOMEPAGE=http://code.google.com/p/openpgm
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://openpgm.googlecode.com/files/libpgm-5.1.116~dfsg.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=39272470e3d857afb0899d078761dfe2
diff --git a/metadata/md5-cache/net-libs/openpgm-5.1.118 b/metadata/md5-cache/net-libs/openpgm-5.1.118
index d5e41e77eebc..db69fe248692 100644
--- a/metadata/md5-cache/net-libs/openpgm-5.1.118
+++ b/metadata/md5-cache/net-libs/openpgm-5.1.118
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenPGM is an open source implementation of the Pragmatic General Multicast (PGM) specification
 EAPI=3
 HOMEPAGE=http://code.google.com/p/openpgm
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://openpgm.googlecode.com/files/libpgm-5.1.118~dfsg.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=e9bf479e64c20f7ea320bd2a7b214a16
diff --git a/metadata/md5-cache/net-libs/openslp-1.2.1-r1 b/metadata/md5-cache/net-libs/openslp-1.2.1-r1
index de9299fcc576..56ba6df3fc27 100644
--- a/metadata/md5-cache/net-libs/openslp-1.2.1-r1
+++ b/metadata/md5-cache/net-libs/openslp-1.2.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An open-source implementation of Service Location Protocol
 HOMEPAGE=http://www.openslp.org/
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
@@ -8,5 +8,5 @@ RDEPEND=dev-libs/openssl
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openslp/openslp-1.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=68f594993b81f2f32df68f01feb8dfac
diff --git a/metadata/md5-cache/net-libs/openslp-1.2.1-r2 b/metadata/md5-cache/net-libs/openslp-1.2.1-r2
index f26787c3d126..6c0d6649d4a6 100644
--- a/metadata/md5-cache/net-libs/openslp-1.2.1-r2
+++ b/metadata/md5-cache/net-libs/openslp-1.2.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An open-source implementation of Service Location Protocol
 HOMEPAGE=http://www.openslp.org/
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
@@ -8,5 +8,5 @@ RDEPEND=dev-libs/openssl
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openslp/openslp-1.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=50105876283c8b8a0ab5f153a426021d
diff --git a/metadata/md5-cache/net-libs/serf-0.7.2 b/metadata/md5-cache/net-libs/serf-0.7.2
index 9c5c6d80c33f..8fd152422da2 100644
--- a/metadata/md5-cache/net-libs/serf-0.7.2
+++ b/metadata/md5-cache/net-libs/serf-0.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HTTP client library
 EAPI=3
 HOMEPAGE=http://code.google.com/p/serf/
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib
 SLOT=0
 SRC_URI=http://serf.googlecode.com/files/serf-0.7.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1f79e7e864d709358ed3dab5e64662f6
diff --git a/metadata/md5-cache/net-libs/serf-1.0.0 b/metadata/md5-cache/net-libs/serf-1.0.0
index 3e465d10fe3d..ff515972d210 100644
--- a/metadata/md5-cache/net-libs/serf-1.0.0
+++ b/metadata/md5-cache/net-libs/serf-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HTTP client library
 EAPI=4
 HOMEPAGE=http://code.google.com/p/serf/
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib
 SLOT=1
 SRC_URI=http://serf.googlecode.com/files/serf-1.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ec78456c2ca7bf1a1de85d8bc4a6716c
diff --git a/metadata/md5-cache/net-libs/serf-1.0.1 b/metadata/md5-cache/net-libs/serf-1.0.1
index be5133333674..b60305b2d539 100644
--- a/metadata/md5-cache/net-libs/serf-1.0.1
+++ b/metadata/md5-cache/net-libs/serf-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HTTP client library
 EAPI=4
 HOMEPAGE=http://code.google.com/p/serf/
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib
 SLOT=1
 SRC_URI=http://serf.googlecode.com/files/serf-1.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fcfeada5f6563941222ee8145b085969
diff --git a/metadata/md5-cache/net-libs/serf-1.0.3 b/metadata/md5-cache/net-libs/serf-1.0.3
index 3d3ca34f3c27..9a31ffd4365d 100644
--- a/metadata/md5-cache/net-libs/serf-1.0.3
+++ b/metadata/md5-cache/net-libs/serf-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HTTP client library
 EAPI=4
 HOMEPAGE=http://code.google.com/p/serf/
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib
 SLOT=1
 SRC_URI=http://serf.googlecode.com/files/serf-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8ba45f78172f8537a886d107b0a5f820
diff --git a/metadata/md5-cache/net-libs/serf-1.1.0 b/metadata/md5-cache/net-libs/serf-1.1.0
index c1941e08c336..f17b611b9d31 100644
--- a/metadata/md5-cache/net-libs/serf-1.1.0
+++ b/metadata/md5-cache/net-libs/serf-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HTTP client library
 EAPI=4
 HOMEPAGE=http://code.google.com/p/serf/
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib
 SLOT=1
 SRC_URI=http://serf.googlecode.com/files/serf-1.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9f09b45918efa2f1f939b0b36cecb1ef
diff --git a/metadata/md5-cache/net-libs/serf-1.1.1 b/metadata/md5-cache/net-libs/serf-1.1.1
index fe898c9514db..db96a4593a3e 100644
--- a/metadata/md5-cache/net-libs/serf-1.1.1
+++ b/metadata/md5-cache/net-libs/serf-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HTTP client library
 EAPI=4
 HOMEPAGE=http://code.google.com/p/serf/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib
 SLOT=1
 SRC_URI=http://serf.googlecode.com/files/serf-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f365d199484504ec814886ac6298f030
diff --git a/metadata/md5-cache/net-libs/serf-1.2.0 b/metadata/md5-cache/net-libs/serf-1.2.0
index 927a27571a53..1557610c49df 100644
--- a/metadata/md5-cache/net-libs/serf-1.2.0
+++ b/metadata/md5-cache/net-libs/serf-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HTTP client library
 EAPI=5
 HOMEPAGE=http://code.google.com/p/serf/
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib
 SLOT=1
 SRC_URI=http://serf.googlecode.com/files/serf-1.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6d0e5e2829aa125a89d07ddf23d46cfd
diff --git a/metadata/md5-cache/net-libs/socket++-1.12.12-r1 b/metadata/md5-cache/net-libs/socket++-1.12.12-r1
index ea3fd9e1098b..8ea8dd64bcfa 100644
--- a/metadata/md5-cache/net-libs/socket++-1.12.12-r1
+++ b/metadata/md5-cache/net-libs/socket++-1.12.12-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=sys-devel/libtool sys-apps/texinfo || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-devel/libtool sys-apps/texinfo || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C++ Socket Library
 HOMEPAGE=http://www.linuxhacker.at/socketxx/
 IUSE=debug doc
@@ -8,5 +8,5 @@ LICENSE=freedist GPL-2+
 RESTRICT=bindist
 SLOT=0
 SRC_URI=http://www.linuxhacker.at/linux/downloads/src/socket++-1.12.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=09e4256d7c4a3fff44efb2184187767e
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-1.10.2-r300 b/metadata/md5-cache/net-libs/webkit-gtk-1.10.2-r300
index e0ebfdbadeb0..2e50f9a8a9dd 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-1.10.2-r300
+++ b/metadata/md5-cache/net-libs/webkit-gtk-1.10.2-r300
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg:= >=media-libs/libpng-1.4:0= >=x11-libs/cairo-1.10:= >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1:= >=net-libs/libsoup-2.39.2:2.4[introspection?] dev-db/sqlite:3= >=x11-libs/pango-1.21 x11-libs/libXrender >=x11-libs/gtk+-2.13:2 geoloc? ( app-misc/geoclue ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22:= ) webgl? ( virtual/opengl x11-libs/libXcomposite x11-libs/libXdamage ) dev-lang/perl =dev-lang/python-2* || ( virtual/rubygems[ruby_targets_ruby19] virtual/rubygems[ruby_targets_ruby18] ) app-accessibility/at-spi2-core >=dev-util/gtk-doc-am-1.10 dev-util/gperf sys-devel/bison >=sys-devel/flex-2.5.33 sys-devel/gettext >=sys-devel/make-3.82-r4 virtual/pkgconfig introspection? ( jit? ( sys-apps/paxctl ) ) test? ( x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg:= >=media-libs/libpng-1.4:0= >=x11-libs/cairo-1.10:= >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1:= >=net-libs/libsoup-2.39.2:2.4[introspection?] dev-db/sqlite:3= >=x11-libs/pango-1.21 x11-libs/libXrender >=x11-libs/gtk+-2.13:2 geoloc? ( app-misc/geoclue ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22:= ) webgl? ( virtual/opengl x11-libs/libXcomposite x11-libs/libXdamage ) dev-lang/perl =dev-lang/python-2* || ( virtual/rubygems[ruby_targets_ruby19] virtual/rubygems[ruby_targets_ruby18] ) app-accessibility/at-spi2-core >=dev-util/gtk-doc-am-1.10 dev-util/gperf sys-devel/bison >=sys-devel/flex-2.5.33 sys-devel/gettext >=sys-devel/make-3.82-r4 virtual/pkgconfig introspection? ( jit? ( sys-apps/paxctl ) ) test? ( x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Open source web browser engine
 EAPI=5
 HOMEPAGE=http://www.webkitgtk.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg:= >=media-libs/libpng-1
 REQUIRED_USE=introspection? ( geoloc gstreamer )
 SLOT=3
 SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-1.10.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=0a60453eb77ed7f25769b41c05a6223e
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r200 b/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r200
index c43cfd8932d9..4075cb819d43 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r200
+++ b/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r200
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 >=x11-libs/cairo-1.10 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-2.13:2[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.37.92:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.21 x11-libs/libXrender geoloc? ( app-misc/geoclue ) 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 ) dev-lang/perl =dev-lang/python-2* sys-devel/bison >=sys-devel/flex-2.5.33 sys-devel/gettext dev-util/gperf virtual/pkgconfig dev-util/gtk-doc-am introspection? ( jit? ( sys-apps/paxctl ) ) test? ( x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 >=x11-libs/cairo-1.10 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-2.13:2[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.37.92:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.21 x11-libs/libXrender geoloc? ( app-misc/geoclue ) 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 ) dev-lang/perl =dev-lang/python-2* sys-devel/bison >=sys-devel/flex-2.5.33 sys-devel/gettext dev-util/gperf virtual/pkgconfig dev-util/gtk-doc-am introspection? ( jit? ( sys-apps/paxctl ) ) test? ( x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Open source web browser engine
 EAPI=4
 HOMEPAGE=http://www.webkitgtk.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4
 REQUIRED_USE=introspection? ( geoloc gstreamer )
 SLOT=2
 SRC_URI=http://www.webkitgtk.org/releases/webkit-1.8.3.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=e093fc8a4c66772b0b98d57cf6d6ba72
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r201 b/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r201
index 6fd778e181fa..e5c271306b8d 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r201
+++ b/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r201
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0= >=x11-libs/cairo-1.10 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-2.13:2[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.37.92:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.21 x11-libs/libXrender geoloc? ( app-misc/geoclue ) 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 ) dev-lang/perl =dev-lang/python-2* sys-devel/bison >=sys-devel/flex-2.5.33 sys-devel/gettext dev-util/gperf virtual/pkgconfig dev-util/gtk-doc-am introspection? ( jit? ( sys-apps/paxctl ) ) test? ( x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0= >=x11-libs/cairo-1.10 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-2.13:2[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.37.92:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.21 x11-libs/libXrender geoloc? ( app-misc/geoclue ) 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 ) dev-lang/perl =dev-lang/python-2* sys-devel/bison >=sys-devel/flex-2.5.33 sys-devel/gettext dev-util/gperf virtual/pkgconfig dev-util/gtk-doc-am introspection? ( jit? ( sys-apps/paxctl ) ) test? ( x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Open source web browser engine
 EAPI=5
 HOMEPAGE=http://www.webkitgtk.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4
 REQUIRED_USE=introspection? ( geoloc gstreamer )
 SLOT=2
 SRC_URI=http://www.webkitgtk.org/releases/webkit-1.8.3.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=07f09e64298ebe826a6102773c3815a7
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r300 b/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r300
index 194d5892bc00..255feee97f06 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r300
+++ b/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r300
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 >=x11-libs/cairo-1.10 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.37.92:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.21 x11-libs/libXrender geoloc? ( app-misc/geoclue ) 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 ) webkit2? ( >=x11-libs/gtk+-2.13:2 ) dev-lang/perl =dev-lang/python-2* sys-devel/bison >=sys-devel/flex-2.5.33 sys-devel/gettext dev-util/gperf virtual/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.10 ) introspection? ( jit? ( sys-apps/paxctl ) ) test? ( x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) webkit2? ( app-accessibility/at-spi2-core ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 >=x11-libs/cairo-1.10 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.37.92:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.21 x11-libs/libXrender geoloc? ( app-misc/geoclue ) 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 ) webkit2? ( >=x11-libs/gtk+-2.13:2 ) dev-lang/perl =dev-lang/python-2* sys-devel/bison >=sys-devel/flex-2.5.33 sys-devel/gettext dev-util/gperf virtual/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.10 ) introspection? ( jit? ( sys-apps/paxctl ) ) test? ( x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) webkit2? ( app-accessibility/at-spi2-core ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Open source web browser engine
 EAPI=4
 HOMEPAGE=http://www.webkitgtk.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4
 REQUIRED_USE=introspection? ( geoloc gstreamer )
 SLOT=3
 SRC_URI=http://www.webkitgtk.org/releases/webkit-1.8.3.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=755ba8ded7f6563722bc3cff1ec23350
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.0.0 b/metadata/md5-cache/net-libs/webkit-gtk-2.0.0
index 6096644fb250..8eb51fee095f 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.0.0
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=app-crypt/libsecret dev-libs/libxml2:2 dev-libs/libxslt media-libs/harfbuzz media-libs/libwebp virtual/jpeg:= >=media-libs/libpng-1.4:0= >=x11-libs/cairo-1.10:= >=dev-libs/glib-2.36.0:2 >=x11-libs/gtk+-3.6.0:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1:= >=net-libs/libsoup-2.42.0:2.4[introspection?] dev-db/sqlite:3= >=x11-libs/pango-1.32.0 x11-libs/libXrender >=x11-libs/gtk+-2.24.10:2 geoloc? ( app-misc/geoclue ) gstreamer? ( >=media-libs/gstreamer-1.0.3:1.0 >=media-libs/gst-plugins-base-1.0.3:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0 ) spell? ( >=app-text/enchant-0.22:= ) webgl? ( virtual/opengl x11-libs/libXcomposite x11-libs/libXdamage ) dev-lang/perl =dev-lang/python-2* || ( virtual/rubygems[ruby_targets_ruby19] virtual/rubygems[ruby_targets_ruby18] ) >=app-accessibility/at-spi2-core-2.5.3 >=dev-util/gtk-doc-am-1.10 dev-util/gperf sys-devel/bison >=sys-devel/flex-2.5.33 || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.0 ) sys-devel/gettext >=sys-devel/make-3.82-r4 virtual/pkgconfig introspection? ( jit? ( sys-apps/paxctl ) ) test? ( x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-crypt/libsecret dev-libs/libxml2:2 dev-libs/libxslt media-libs/harfbuzz media-libs/libwebp virtual/jpeg:= >=media-libs/libpng-1.4:0= >=x11-libs/cairo-1.10:= >=dev-libs/glib-2.36.0:2 >=x11-libs/gtk+-3.6.0:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1:= >=net-libs/libsoup-2.42.0:2.4[introspection?] dev-db/sqlite:3= >=x11-libs/pango-1.32.0 x11-libs/libXrender >=x11-libs/gtk+-2.24.10:2 geoloc? ( app-misc/geoclue ) gstreamer? ( >=media-libs/gstreamer-1.0.3:1.0 >=media-libs/gst-plugins-base-1.0.3:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0 ) spell? ( >=app-text/enchant-0.22:= ) webgl? ( virtual/opengl x11-libs/libXcomposite x11-libs/libXdamage ) dev-lang/perl =dev-lang/python-2* || ( virtual/rubygems[ruby_targets_ruby19] virtual/rubygems[ruby_targets_ruby18] ) >=app-accessibility/at-spi2-core-2.5.3 >=dev-util/gtk-doc-am-1.10 dev-util/gperf sys-devel/bison >=sys-devel/flex-2.5.33 || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.0 ) sys-devel/gettext >=sys-devel/make-3.82-r4 virtual/pkgconfig introspection? ( jit? ( sys-apps/paxctl ) ) test? ( x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Open source web browser engine
 EAPI=5
 HOMEPAGE=http://www.webkitgtk.org/
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/libsecret dev-libs/libxml2:2 dev-libs/libxslt media-libs/harfb
 REQUIRED_USE=introspection? ( geoloc gstreamer )
 SLOT=3/25
 SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-2.0.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=180da32dda12c1fa7cc982dee26b51cb
diff --git a/metadata/md5-cache/net-libs/wvstreams-4.6.1-r2 b/metadata/md5-cache/net-libs/wvstreams-4.6.1-r2
index 817afde117b6..46432b132d79 100644
--- a/metadata/md5-cache/net-libs/wvstreams-4.6.1-r2
+++ b/metadata/md5-cache/net-libs/wvstreams-4.6.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-libs/readline sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) dev-libs/openssl:0 pam? ( sys-libs/pam ) || ( >=sys-devel/gcc-4.1 >=dev-libs/boost-1.34.0 ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/readline sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) dev-libs/openssl:0 pam? ( sys-libs/pam ) || ( >=sys-devel/gcc-4.1 >=dev-libs/boost-1.34.0 ) virtual/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A network programming library in C++
 EAPI=4
 HOMEPAGE=http://alumnit.ca/wiki/?WvStreams
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/readline sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) dev-lib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://wvstreams.googlecode.com/files/wvstreams-4.6.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=abcf7127c390793beb48f219fba8a986
diff --git a/metadata/md5-cache/net-libs/wvstreams-4.6.1-r3 b/metadata/md5-cache/net-libs/wvstreams-4.6.1-r3
index 227b5dabdbf3..55b04319a1e8 100644
--- a/metadata/md5-cache/net-libs/wvstreams-4.6.1-r3
+++ b/metadata/md5-cache/net-libs/wvstreams-4.6.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=sys-libs/readline sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) dev-libs/openssl:0 pam? ( virtual/pam ) virtual/pkgconfig doc? ( app-doc/doxygen ) boost? ( >=dev-libs/boost-1.34.1:= ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/readline sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) dev-libs/openssl:0 pam? ( virtual/pam ) virtual/pkgconfig doc? ( app-doc/doxygen ) boost? ( >=dev-libs/boost-1.34.1:= ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A network programming library in C++
 EAPI=5
 HOMEPAGE=http://alumnit.ca/wiki/?WvStreams
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/readline sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) dev-lib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://wvstreams.googlecode.com/files/wvstreams-4.6.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=074108418259e80079b126a884f19b59
diff --git a/metadata/md5-cache/net-libs/zeromq-2.1.10 b/metadata/md5-cache/net-libs/zeromq-2.1.10
index d7eeadb88ffd..b4bd4302584a 100644
--- a/metadata/md5-cache/net-libs/zeromq-2.1.10
+++ b/metadata/md5-cache/net-libs/zeromq-2.1.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=pgm? ( virtual/pkgconfig =net-libs/openpgm-5.1.116 ) sys-apps/util-linux || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pgm? ( virtual/pkgconfig =net-libs/openpgm-5.1.116 ) sys-apps/util-linux || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ZeroMQ is a brokerless messaging kernel with extremely high performance.
 EAPI=3
 HOMEPAGE=http://www.zeromq.org
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=http://download.zeromq.org/zeromq-2.1.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=6d7d0687e6b1db17e0cfa898ac64605b
diff --git a/metadata/md5-cache/net-libs/zeromq-2.1.11 b/metadata/md5-cache/net-libs/zeromq-2.1.11
index 9fe972a0de00..97080629fb01 100644
--- a/metadata/md5-cache/net-libs/zeromq-2.1.11
+++ b/metadata/md5-cache/net-libs/zeromq-2.1.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=pgm? ( virtual/pkgconfig =net-libs/openpgm-5.1.118 ) sys-apps/util-linux || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pgm? ( virtual/pkgconfig =net-libs/openpgm-5.1.118 ) sys-apps/util-linux || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ZeroMQ is a brokerless messaging kernel with extremely high performance.
 EAPI=3
 HOMEPAGE=http://www.zeromq.org
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=http://download.zeromq.org/zeromq-2.1.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=0146d3ab0808e0a20ddb692bd8ec9e5a
diff --git a/metadata/md5-cache/net-libs/zeromq-2.1.7 b/metadata/md5-cache/net-libs/zeromq-2.1.7
index 26cffa5da4a5..cb09ba8160f6 100644
--- a/metadata/md5-cache/net-libs/zeromq-2.1.7
+++ b/metadata/md5-cache/net-libs/zeromq-2.1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=pgm? ( virtual/pkgconfig =net-libs/openpgm-5.1.116 ) sys-apps/util-linux || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pgm? ( virtual/pkgconfig =net-libs/openpgm-5.1.116 ) sys-apps/util-linux || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ZeroMQ is a brokerless messaging kernel with extremely high performance.
 EAPI=3
 HOMEPAGE=http://www.zeromq.org
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=http://download.zeromq.org/zeromq-2.1.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=2225a845a24641e8e9b23db4a2cb400b
diff --git a/metadata/md5-cache/net-libs/zeromq-2.1.9 b/metadata/md5-cache/net-libs/zeromq-2.1.9
index 217a70a25b8e..6c7e8a095a52 100644
--- a/metadata/md5-cache/net-libs/zeromq-2.1.9
+++ b/metadata/md5-cache/net-libs/zeromq-2.1.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=pgm? ( virtual/pkgconfig =net-libs/openpgm-5.1.116 ) sys-apps/util-linux || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pgm? ( virtual/pkgconfig =net-libs/openpgm-5.1.116 ) sys-apps/util-linux || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ZeroMQ is a brokerless messaging kernel with extremely high performance.
 EAPI=3
 HOMEPAGE=http://www.zeromq.org
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=http://download.zeromq.org/zeromq-2.1.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=e753e1957d91569e21ace342f2a15cb1
diff --git a/metadata/md5-cache/net-libs/zeromq-2.2.0 b/metadata/md5-cache/net-libs/zeromq-2.2.0
index 77c26ac4ca64..b465942a9497 100644
--- a/metadata/md5-cache/net-libs/zeromq-2.2.0
+++ b/metadata/md5-cache/net-libs/zeromq-2.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=pgm? ( virtual/pkgconfig =net-libs/openpgm-5.1.118 ) || ( sys-apps/util-linux sys-freebsd/freebsd-lib ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pgm? ( virtual/pkgconfig =net-libs/openpgm-5.1.118 ) || ( sys-apps/util-linux sys-freebsd/freebsd-lib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ZeroMQ is a brokerless messaging kernel with extremely high performance.
 EAPI=3
 HOMEPAGE=http://www.zeromq.org
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=http://download.zeromq.org/zeromq-2.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=c23f3ddedb07d41053d06cc204bb24a8
diff --git a/metadata/md5-cache/net-libs/zeromq-3.2.2 b/metadata/md5-cache/net-libs/zeromq-3.2.2
index 2501a9044e35..024a44df076f 100644
--- a/metadata/md5-cache/net-libs/zeromq-3.2.2
+++ b/metadata/md5-cache/net-libs/zeromq-3.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-devel/gcc pgm? ( virtual/pkgconfig =net-libs/openpgm-5.1.118 ) sys-apps/util-linux || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-devel/gcc pgm? ( virtual/pkgconfig =net-libs/openpgm-5.1.118 ) sys-apps/util-linux || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ZeroMQ is a brokerless kernel
 EAPI=5
 HOMEPAGE=http://www.zeromq.org/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=http://download.zeromq.org/zeromq-3.2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=32d1c1e551766aa9ee7a11dc0f733ec7
diff --git a/metadata/md5-cache/net-mail/courier-imap-4.0.6-r3 b/metadata/md5-cache/net-mail/courier-imap-4.0.6-r3
index 4acfa945be75..1a46b6624cdf 100644
--- a/metadata/md5-cache/net-mail/courier-imap-4.0.6-r3
+++ b/metadata/md5-cache/net-mail/courier-imap-4.0.6-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup test unpack
-DEPEND=>=dev-libs/openssl-0.9.6 >=net-libs/courier-authlib-0.57 >=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 ) dev-lang/perl !mail-mta/courier userland_GNU? ( sys-process/procps ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/openssl-0.9.6 >=net-libs/courier-authlib-0.57 >=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 ) dev-lang/perl !mail-mta/courier userland_GNU? ( sys-process/procps ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An IMAP daemon designed specifically for maildirs.
 HOMEPAGE=http://www.courier-mta.org/
 IUSE=berkdb debug fam gdbm ipv6 nls selinux
@@ -9,5 +9,5 @@ RDEPEND=>=dev-libs/openssl-0.9.6 >=net-libs/courier-authlib-0.57 >=net-mail/mail
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-imap-4.0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d2398bd5b852871d258cbf11e9473b20
diff --git a/metadata/md5-cache/net-mail/courier-imap-4.5.0 b/metadata/md5-cache/net-mail/courier-imap-4.5.0
index 670bc69f20d2..20162c9fef48 100644
--- a/metadata/md5-cache/net-mail/courier-imap-4.5.0
+++ b/metadata/md5-cache/net-mail/courier-imap-4.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup test unpack
-DEPEND=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 ) dev-lang/perl !mail-mta/courier userland_GNU? ( sys-process/procps ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) dev-lang/perl !mail-mta/courier userland_GNU? ( sys-process/procps ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An IMAP daemon designed specifically for maildirs.
 HOMEPAGE=http://www.courier-mta.org/
 IUSE=berkdb debug fam gdbm ipv6 nls selinux gnutls
@@ -9,5 +9,5 @@ RDEPEND=gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) >=net-
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-imap-4.5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a4e1a1847cda8db8e9a2f6780274662f
diff --git a/metadata/md5-cache/net-mail/courier-imap-4.6.0 b/metadata/md5-cache/net-mail/courier-imap-4.6.0
index d167257556cc..710e040f87ff 100644
--- a/metadata/md5-cache/net-mail/courier-imap-4.6.0
+++ b/metadata/md5-cache/net-mail/courier-imap-4.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=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 ) dev-lang/perl !mail-mta/courier userland_GNU? ( sys-process/procps ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) dev-lang/perl !mail-mta/courier userland_GNU? ( sys-process/procps ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An IMAP daemon designed specifically for maildirs.
 EAPI=2
 HOMEPAGE=http://www.courier-mta.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=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 ) !mail-mta/courier !net-mail/bincimap !net-mail/cyrus-imapd !net-mail/uw-imap
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-imap-4.6.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=da94e66c3051599d3af942622249ffe1
diff --git a/metadata/md5-cache/net-mail/courier-imap-4.8.0 b/metadata/md5-cache/net-mail/courier-imap-4.8.0
index 3f0e79f2b93b..1284d82c260d 100644
--- a/metadata/md5-cache/net-mail/courier-imap-4.8.0
+++ b/metadata/md5-cache/net-mail/courier-imap-4.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=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 ) dev-lang/perl !mail-mta/courier userland_GNU? ( sys-process/procps ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) dev-lang/perl !mail-mta/courier userland_GNU? ( sys-process/procps ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An IMAP daemon designed specifically for maildirs.
 EAPI=2
 HOMEPAGE=http://www.courier-mta.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=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 ) !mail-mta/courier !net-mail/bincimap !net-mail/cyrus-imapd !net-mail/uw-imap
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-imap-4.8.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=980f0c6edc26a327039d0d0e782b81be
diff --git a/metadata/md5-cache/net-mail/cyrus-imap-admin-2.4.17 b/metadata/md5-cache/net-mail/cyrus-imap-admin-2.4.17
index e7b846c83df1..37d0475aa842 100644
--- a/metadata/md5-cache/net-mail/cyrus-imap-admin-2.4.17
+++ b/metadata/md5-cache/net-mail/cyrus-imap-admin-2.4.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lang/perl-5.6.1 >=dev-libs/cyrus-sasl-2.1.13 dev-perl/Term-ReadLine-Perl dev-perl/TermReadKey berkdb? ( >=sys-libs/db-3.2 ) ssl? ( >=dev-libs/openssl-0.9.6 ) kerberos? ( virtual/krb5 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+DEPEND=>=dev-lang/perl-5.6.1 >=dev-libs/cyrus-sasl-2.1.13 dev-perl/Term-ReadLine-Perl dev-perl/TermReadKey berkdb? ( >=sys-libs/db-3.2 ) ssl? ( >=dev-libs/openssl-0.9.6 ) kerberos? ( virtual/krb5 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 DESCRIPTION=Utilities and Perl modules to administer a Cyrus IMAP server.
 EAPI=4
 HOMEPAGE=http://www.cyrusimap.org/
@@ -9,5 +9,5 @@ LICENSE=BSD-with-attribution
 RDEPEND=>=dev-lang/perl-5.6.1 >=dev-libs/cyrus-sasl-2.1.13 dev-perl/Term-ReadLine-Perl dev-perl/TermReadKey berkdb? ( >=sys-libs/db-3.2 ) ssl? ( >=dev-libs/openssl-0.9.6 ) kerberos? ( virtual/krb5 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.4.17.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f403264c8f84140e7bac31b774b9cfe8
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-2.4.17 b/metadata/md5-cache/net-mail/cyrus-imapd-2.4.17
index 69783465668d..2c1f11ace6dd 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-2.4.17
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-2.4.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2 ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql-base ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite ) ssl? ( >=dev-libs/openssl-0.9.6 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
+DEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2 ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql-base ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite ) ssl? ( >=dev-libs/openssl-0.9.6 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
 DESCRIPTION=The Cyrus IMAP Server.
 EAPI=4
 HOMEPAGE=http://www.cyrusimap.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkd
 REQUIRED_USE=afs? ( kerberos )
 SLOT=0
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.4.17.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7e9046c6861d1a4547eade4dcb1ff373
diff --git a/metadata/md5-cache/net-mail/dovecot-2.1.9 b/metadata/md5-cache/net-mail/dovecot-2.1.9
index cccccebc613e..7bd9bc415a22 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.1.9
+++ b/metadata/md5-cache/net-mail/dovecot-2.1.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) vpopmail? ( net-mail/vpopmail ) virtual/libiconv ssl? ( dev-libs/openssl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) vpopmail? ( net-mail/vpopmail ) virtual/libiconv ssl? ( dev-libs/openssl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=4
 HOMEPAGE=http://www.dovecot.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) vpopmail? ( net-mail/vpopmail ) virtual/libiconv >=net-mail/mailbase-0.00-r8
 SLOT=0
 SRC_URI=http://www.dovecot.org/releases/2.1/dovecot-2.1.9.tar.gz sieve? ( http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-pigeonhole-0.3.1.tar.gz ) managesieve? ( http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-pigeonhole-0.3.1.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=697615292e307aed68dc24f07c845531
diff --git a/metadata/md5-cache/net-mail/gnubiff-2.2.13-r2 b/metadata/md5-cache/net-mail/gnubiff-2.2.13-r2
index 97a73df8ffb1..e565485d3fea 100644
--- a/metadata/md5-cache/net-mail/gnubiff-2.2.13-r2
+++ b/metadata/md5-cache/net-mail/gnubiff-2.2.13-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A mail notification program
 EAPI=4
 HOMEPAGE=http://gnubiff.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://sourceforge/gnubiff/gnubiff-2.2.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f100a04525dc97a2f8902aa9050c951c
diff --git a/metadata/md5-cache/net-mail/gnubiff-2.2.13-r3 b/metadata/md5-cache/net-mail/gnubiff-2.2.13-r3
index 582405d70163..391535fa6b64 100644
--- a/metadata/md5-cache/net-mail/gnubiff-2.2.13-r3
+++ b/metadata/md5-cache/net-mail/gnubiff-2.2.13-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A mail notification program
 EAPI=4
 HOMEPAGE=http://gnubiff.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://sourceforge/gnubiff/gnubiff-2.2.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cddb28372e63d381cb96440bce58c503
diff --git a/metadata/md5-cache/net-mail/gnubiff-2.2.15 b/metadata/md5-cache/net-mail/gnubiff-2.2.15
index 8f8443a0234b..099577210ff3 100644
--- a/metadata/md5-cache/net-mail/gnubiff-2.2.15
+++ b/metadata/md5-cache/net-mail/gnubiff-2.2.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A mail notification program
 EAPI=4
 HOMEPAGE=http://gnubiff.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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
 SLOT=0
 SRC_URI=mirror://sourceforge/gnubiff/gnubiff-2.2.15.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7307704d5fcd33b7c97bbbc5eb0e45a0
diff --git a/metadata/md5-cache/net-mail/libpst-0.6.55 b/metadata/md5-cache/net-mail/libpst-0.6.55
index 38727f0a0af8..5d81b0efcdc2 100644
--- a/metadata/md5-cache/net-mail/libpst-0.6.55
+++ b/metadata/md5-cache/net-mail/libpst-0.6.55
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dii? ( media-gfx/imagemagick[png] ) virtual/libiconv virtual/pkgconfig dii? ( media-libs/gd[png] ) python? ( >=dev-libs/boost-1.48[python] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=dii? ( media-gfx/imagemagick[png] ) virtual/libiconv virtual/pkgconfig dii? ( media-libs/gd[png] ) python? ( >=dev-libs/boost-1.48[python] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Tools and library for reading Outlook files (.pst format)
 EAPI=4
 HOMEPAGE=http://www.five-ten-sg.com/libpst/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dii? ( media-gfx/imagemagick[png] ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://www.five-ten-sg.com/libpst/packages/libpst-0.6.55.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=002e547aa36cb59854df4f687be37801
diff --git a/metadata/md5-cache/net-mail/libpst-0.6.58 b/metadata/md5-cache/net-mail/libpst-0.6.58
index 8dcd70355de4..7fb17bec2012 100644
--- a/metadata/md5-cache/net-mail/libpst-0.6.58
+++ b/metadata/md5-cache/net-mail/libpst-0.6.58
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dii? ( media-gfx/imagemagick[png] ) gnome-extra/libgsf virtual/libiconv virtual/pkgconfig dii? ( media-libs/gd[png] ) python? ( >=dev-libs/boost-1.48[python] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=dii? ( media-gfx/imagemagick[png] ) gnome-extra/libgsf virtual/libiconv virtual/pkgconfig dii? ( media-libs/gd[png] ) python? ( >=dev-libs/boost-1.48[python] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Tools and library for reading Outlook files (.pst format)
 EAPI=4
 HOMEPAGE=http://www.five-ten-sg.com/libpst/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dii? ( media-gfx/imagemagick[png] ) gnome-extra/libgsf python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://www.five-ten-sg.com/libpst/packages/libpst-0.6.58.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4ddeb5fb3a3a8bff7883053209c5b8af
diff --git a/metadata/md5-cache/net-mail/metamail-2.7.53.3-r1 b/metadata/md5-cache/net-mail/metamail-2.7.53.3-r1
index 68227f3ddf0f..37a020cbdecb 100644
--- a/metadata/md5-cache/net-mail/metamail-2.7.53.3-r1
+++ b/metadata/md5-cache/net-mail/metamail-2.7.53.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses app-arch/sharutils net-mail/mailbase || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses app-arch/sharutils net-mail/mailbase || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Metamail (with Debian patches) - Generic MIME package
 EAPI=4
 HOMEPAGE=http://ftp.funet.fi/pub/unix/mail/metamail/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-misc/mime-types sys-apps/debianutils !app-misc/run-mailcap
 SLOT=0
 SRC_URI=http://ftp.funet.fi/pub/unix/mail/metamail/mm2.7.tar.Z mirror://debian/pool/main/m/metamail/metamail_2.7-53.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4674211ead0f4821375e1c3bb0fe28c7
diff --git a/metadata/md5-cache/net-mail/mpack-1.6-r3 b/metadata/md5-cache/net-mail/mpack-1.6-r3
index 97e7854f949e..9e389b95b79b 100644
--- a/metadata/md5-cache/net-mail/mpack-1.6-r3
+++ b/metadata/md5-cache/net-mail/mpack-1.6-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Command-line MIME encoding and decoding utilities
 EAPI=3
 HOMEPAGE=ftp://ftp.andrew.cmu.edu/pub/mpack/
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86 ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=HPND
 SLOT=0
 SRC_URI=ftp://ftp.andrew.cmu.edu/pub/mpack/mpack-1.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ffdd9893c86bea28ae5f0dd5f67158e8
diff --git a/metadata/md5-cache/net-mail/mpop-1.0.28 b/metadata/md5-cache/net-mail/mpop-1.0.28
new file mode 100644
index 000000000000..49c914316840
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mpop-1.0.28
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install setup
+DEPEND=gnome-keyring? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/gnome-keyring-python gnome-base/libgnome-keyring ) idn? ( net-dns/libidn ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=A small, fast, and portable POP3 client
+EAPI=5
+HOMEPAGE=http://mpop.sourceforge.net/
+IUSE=gnome-keyring gnutls idn nls sasl ssl vim-syntax python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=gnome-keyring? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/gnome-keyring-python gnome-base/libgnome-keyring ) idn? ( net-dns/libidn ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) )
+REQUIRED_USE=gnutls? ( ssl )
+SLOT=0
+SRC_URI=mirror://sourceforge/mpop/mpop-1.0.28.tar.bz2
+_eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_md5_=b3ab8c3926a971bf756d37872873c354
diff --git a/metadata/md5-cache/net-mail/mswatch-1.2.0 b/metadata/md5-cache/net-mail/mswatch-1.2.0
index d133cb59a812..5e412920acbd 100644
--- a/metadata/md5-cache/net-mail/mswatch-1.2.0
+++ b/metadata/md5-cache/net-mail/mswatch-1.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6:2
 SLOT=0
 SRC_URI=mirror://sourceforge/mswatch/mswatch-1.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=08d46da3dd2373d771d6b7a524ef0af5
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.15 b/metadata/md5-cache/net-mail/qmailadmin-1.2.15
index 61dbf40fd1be..364047db4319 100644
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.15
+++ b/metadata/md5-cache/net-mail/qmailadmin-1.2.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prerm setup unpack
-DEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=sys-apps/sed-4 >=app-admin/webapp-config-1.50.15 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=sys-apps/sed-4 >=app-admin/webapp-config-1.50.15 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A web interface for managing a qmail system with virtual domains
 HOMEPAGE=http://www.inter7.com/qmailadmin.html
 IUSE=maildrop vhosts
@@ -9,5 +9,5 @@ RDEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/autorespond maildrop? ( >
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.15.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qmail	5fc81682db4b862e5b126eae627ba70c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qmail	5fc81682db4b862e5b126eae627ba70c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=1de842fe61e35b981583599920431b97
diff --git a/metadata/md5-cache/net-mail/tpop3d-1.5.5 b/metadata/md5-cache/net-mail/tpop3d-1.5.5
index 330366873f59..53316fec0101 100644
--- a/metadata/md5-cache/net-mail/tpop3d-1.5.5
+++ b/metadata/md5-cache/net-mail/tpop3d-1.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An extensible POP3 server with vmail-sql/MySQL support.
 EAPI=4
 HOMEPAGE=http://savannah.nongnu.org/projects/tpop3d/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://download.savannah.nongnu.org/releases/tpop3d/tpop3d-1.5.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bb49358e711db690d22db7bae226cb09
diff --git a/metadata/md5-cache/net-mail/vchkuser-0.3.3 b/metadata/md5-cache/net-mail/vchkuser-0.3.3
index 995806fe494c..51f9a1e8df90 100644
--- a/metadata/md5-cache/net-mail/vchkuser-0.3.3
+++ b/metadata/md5-cache/net-mail/vchkuser-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=net-mail/vpopmail || ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[qmail-spp] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=net-mail/vpopmail || ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[qmail-spp] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=qmail-spp plugin to check recipient existance with vpopmail
 EAPI=2
 HOMEPAGE=http://github.com/hollow/vchkuser
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://bb.xnull.de/projects/vchkuser/dist/vchkuser-0.3.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qmail	5fc81682db4b862e5b126eae627ba70c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qmail	5fc81682db4b862e5b126eae627ba70c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bc9395dcadac5273d6163119399e3e60
diff --git a/metadata/md5-cache/net-mail/vchkuser-0.4 b/metadata/md5-cache/net-mail/vchkuser-0.4
index 5c223b2e8477..127bc86cc65e 100644
--- a/metadata/md5-cache/net-mail/vchkuser-0.4
+++ b/metadata/md5-cache/net-mail/vchkuser-0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=net-mail/vpopmail || ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[qmail-spp] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=net-mail/vpopmail || ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[qmail-spp] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=qmail-spp plugin to check recipient existance with vpopmail
 EAPI=3
 HOMEPAGE=http://github.com/hollow/vchkuser
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://github.com/hollow/vchkuser/tarball/v0.4 -> vchkuser-0.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qmail	5fc81682db4b862e5b126eae627ba70c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qmail	5fc81682db4b862e5b126eae627ba70c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=757ae628aae286fbcaae8096447f1421
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.16 b/metadata/md5-cache/net-mail/vpopmail-5.4.16
index b6c72d775c37..11ebdd31260c 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.16
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DEPEND=sys-apps/sed sys-apps/ucspi-tcp virtual/qmail mysql? ( virtual/mysql ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/sed sys-apps/ucspi-tcp virtual/qmail mysql? ( virtual/mysql ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A collection of programs to manage virtual email domains and accounts on your Qmail mail servers.
 HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
 IUSE=mysql ipalias clearpasswd
@@ -9,5 +9,5 @@ RDEPEND=virtual/qmail mysql? ( virtual/mysql ) virtual/cron
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=106a42b7e298d35e6db1f987303da1fd
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.30-r1 b/metadata/md5-cache/net-mail/vpopmail-5.4.30-r1
index b67590c6c923..954a2698e522 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.30-r1
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.30-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 >=sys-apps/sed-4
+DEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 >=sys-apps/sed-4
 DESCRIPTION=A collection of programs to manage virtual email domains and accounts on your Qmail mail servers.
 EAPI=2
 HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.30.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qmail	5fc81682db4b862e5b126eae627ba70c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qmail	5fc81682db4b862e5b126eae627ba70c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=50119a4a33553a1afca2a9de2f63f778
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.30-r2 b/metadata/md5-cache/net-mail/vpopmail-5.4.30-r2
index c1b422e58468..20342e28a5d9 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.30-r2
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.30-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 >=sys-apps/sed-4
+DEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 >=sys-apps/sed-4
 DESCRIPTION=A collection of programs to manage virtual email domains and accounts on your Qmail mail servers.
 EAPI=2
 HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.30.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qmail	5fc81682db4b862e5b126eae627ba70c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qmail	5fc81682db4b862e5b126eae627ba70c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f3750cf3755a719c3811513a88d8851e
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33 b/metadata/md5-cache/net-mail/vpopmail-5.4.33
index 9e155cf26baf..3323b563e60f 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 >=sys-apps/sed-4
+DEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 >=sys-apps/sed-4
 DESCRIPTION=A collection of programs to manage virtual email domains and accounts on your Qmail mail servers.
 EAPI=4
 HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qmail	5fc81682db4b862e5b126eae627ba70c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qmail	5fc81682db4b862e5b126eae627ba70c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8e3b2ae76b27a0bdd06b0fc37839da8c
diff --git a/metadata/md5-cache/net-mail/vqadmin-2.3.7 b/metadata/md5-cache/net-mail/vqadmin-2.3.7
index 787f2aa0b3f2..b9a9b82f3836 100644
--- a/metadata/md5-cache/net-mail/vqadmin-2.3.7
+++ b/metadata/md5-cache/net-mail/vqadmin-2.3.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prerm setup unpack
-DEPEND=virtual/qmail >=net-mail/vpopmail-5.3 >=app-admin/webapp-config-1.50.15 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=virtual/qmail >=net-mail/vpopmail-5.3 >=app-admin/webapp-config-1.50.15 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A web based control pannel to manage Virtual Qmail Domains. Works with qmailadmin
 HOMEPAGE=http://www.inter7.com/index.php?page=vqadmin
 IUSE=vhosts
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/qmailadmin >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=http://www.inter7.com/vqadmin/vqadmin-2.3.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qmail	5fc81682db4b862e5b126eae627ba70c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qmail	5fc81682db4b862e5b126eae627ba70c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=bd5fcade1a333afe8ace2889daa2562a
diff --git a/metadata/md5-cache/net-misc/arpd-0.2-r1 b/metadata/md5-cache/net-misc/arpd-0.2-r1
index 170aeb32423b..1eb134897fba 100644
--- a/metadata/md5-cache/net-misc/arpd-0.2-r1
+++ b/metadata/md5-cache/net-misc/arpd-0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libdnet-1.4 >=dev-libs/libevent-0.6 net-libs/libpcap !sys-apps/iproute2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libdnet-1.4 >=dev-libs/libevent-0.6 net-libs/libpcap !sys-apps/iproute2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ARP server which claims all unassigned addresses (for network monitoring or simulation)
 EAPI=3
 HOMEPAGE=http://www.citi.umich.edu/u/provos/honeyd/
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libdnet-1.4 >=dev-libs/libevent-0.6 net-libs/libpcap !sys-apps/iproute2
 SLOT=0
 SRC_URI=http://www.citi.umich.edu/u/provos/honeyd/arpd-0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d8eeaa96b0fec81d6c3205a08a490c68
diff --git a/metadata/md5-cache/net-misc/asterisk-1.8.20.2 b/metadata/md5-cache/net-misc/asterisk-1.8.20.2
index cff70c6c9790..85aa5fdeb873 100644
--- a/metadata/md5-cache/net-misc/asterisk-1.8.20.2
+++ b/metadata/md5-cache/net-misc/asterisk-1.8.20.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup unpack
-DEPEND=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 ) selinux? ( sec-policy/selinux-asterisk ) 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 ) vorbis? ( media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) !net-libs/openh323 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) selinux? ( sec-policy/selinux-asterisk ) 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 ) vorbis? ( media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) !net-libs/openh323 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Asterisk: A Modular Open Source PBX System
 EAPI=5
 HOMEPAGE=http://www.asterisk.org/
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/popt dev-libs/libxml2 dev-libs/openssl sys-libs/ncurses sys-lib
 REQUIRED_USE=gtalk? ( jabber ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0
 SRC_URI=http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-1.8.20.2.tar.gz mirror://gentoo/gentoo-asterisk-patchset-1.17.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=93179db7826e8766aac4ff5699d396f9
diff --git a/metadata/md5-cache/net-misc/asterisk-1.8.21.0 b/metadata/md5-cache/net-misc/asterisk-1.8.21.0
index 26b92931be58..670dfe4f9cce 100644
--- a/metadata/md5-cache/net-misc/asterisk-1.8.21.0
+++ b/metadata/md5-cache/net-misc/asterisk-1.8.21.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup unpack
-DEPEND=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 ) selinux? ( sec-policy/selinux-asterisk ) 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 ) vorbis? ( media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) !net-libs/openh323 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) selinux? ( sec-policy/selinux-asterisk ) 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 ) vorbis? ( media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) !net-libs/openh323 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Asterisk: A Modular Open Source PBX System
 EAPI=5
 HOMEPAGE=http://www.asterisk.org/
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/popt dev-libs/libxml2 dev-libs/openssl sys-libs/ncurses sys-lib
 REQUIRED_USE=gtalk? ( jabber ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0
 SRC_URI=http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-1.8.21.0.tar.gz mirror://gentoo/gentoo-asterisk-patchset-1.17.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6ab78baeca6d1984e1f47cd10f80572d
diff --git a/metadata/md5-cache/net-misc/asterisk-11.2.2 b/metadata/md5-cache/net-misc/asterisk-11.2.2
index fe5ee841f20f..50e1c5237281 100644
--- a/metadata/md5-cache/net-misc/asterisk-11.2.2
+++ b/metadata/md5-cache/net-misc/asterisk-11.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup unpack
-DEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 dev-libs/openssl sys-libs/ncurses sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) 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 ) ilbc? ( dev-libs/ilbc-rfc3951 ) jabber? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) 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 ) selinux? ( sec-policy/selinux-asterisk ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 voicemail_storage_imap? ( virtual/imap-c-client ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 dev-libs/openssl sys-libs/ncurses sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) 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 ) ilbc? ( dev-libs/ilbc-rfc3951 ) jabber? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) 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 ) selinux? ( sec-policy/selinux-asterisk ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 voicemail_storage_imap? ( virtual/imap-c-client ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Asterisk: A Modular Open Source PBX System
 EAPI=5
 HOMEPAGE=http://www.asterisk.org/
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 dev-libs/openssl sys-libs
 REQUIRED_USE=gtalk? ( jabber ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0
 SRC_URI=http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-11.2.2.tar.gz mirror://gentoo/gentoo-asterisk-patchset-3.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6095e0f77706936e799d16261e9aff19
diff --git a/metadata/md5-cache/net-misc/asterisk-11.3.0 b/metadata/md5-cache/net-misc/asterisk-11.3.0
index 8edd0f005e69..747e81d9c663 100644
--- a/metadata/md5-cache/net-misc/asterisk-11.3.0
+++ b/metadata/md5-cache/net-misc/asterisk-11.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup unpack
-DEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 dev-libs/openssl sys-libs/ncurses sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) 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 ) ilbc? ( dev-libs/ilbc-rfc3951 ) jabber? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) 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 ) selinux? ( sec-policy/selinux-asterisk ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 voicemail_storage_imap? ( virtual/imap-c-client ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 dev-libs/openssl sys-libs/ncurses sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) 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 ) ilbc? ( dev-libs/ilbc-rfc3951 ) jabber? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) 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 ) selinux? ( sec-policy/selinux-asterisk ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 voicemail_storage_imap? ( virtual/imap-c-client ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Asterisk: A Modular Open Source PBX System
 EAPI=5
 HOMEPAGE=http://www.asterisk.org/
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 dev-libs/openssl sys-libs
 REQUIRED_USE=gtalk? ( jabber ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0
 SRC_URI=http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-11.3.0.tar.gz mirror://gentoo/gentoo-asterisk-patchset-3.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8b2977c09cdcbf0bf147642aff45ffb0
diff --git a/metadata/md5-cache/net-misc/autoupnp-0.4.6 b/metadata/md5-cache/net-misc/autoupnp-0.4.6
index 3750036837cc..20faa25a3598 100644
--- a/metadata/md5-cache/net-misc/autoupnp-0.4.6
+++ b/metadata/md5-cache/net-misc/autoupnp-0.4.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=net-libs/miniupnpc libnotify? ( x11-libs/libtinynotify )
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/autoupnp/autoupnp-0.4.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6a507e6444867f6cdee3cefb915c047b
diff --git a/metadata/md5-cache/net-misc/autoupnp-9999 b/metadata/md5-cache/net-misc/autoupnp-9999
index 9b747dbf2b74..7edff83e7568 100644
--- a/metadata/md5-cache/net-misc/autoupnp-9999
+++ b/metadata/md5-cache/net-misc/autoupnp-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=net-libs/miniupnpc libnotify? ( x11-libs/libtinynotify ) dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-libs/miniupnpc libnotify? ( x11-libs/libtinynotify ) dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Automatic open port forwarder using UPnP
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/autoupnp/
@@ -7,5 +7,5 @@ IUSE=libnotify
 LICENSE=BSD
 RDEPEND=net-libs/miniupnpc libnotify? ( x11-libs/libtinynotify )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=158d78ff309923783fa13ae8be816609
diff --git a/metadata/md5-cache/net-misc/bird-1.2.4 b/metadata/md5-cache/net-misc/bird-1.2.4
index 9c20213064ef..65d7f5b2c232 100644
--- a/metadata/md5-cache/net-misc/bird-1.2.4
+++ b/metadata/md5-cache/net-misc/bird-1.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6
 EAPI=1
 HOMEPAGE=http://bird.network.cz
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses sys-libs/readline
 SLOT=0
 SRC_URI=ftp://bird.network.cz/pub/bird/bird-1.2.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ea6dd85564a4e763f96ed999c2e4409b
diff --git a/metadata/md5-cache/net-misc/bird-1.3.0 b/metadata/md5-cache/net-misc/bird-1.3.0
index 9cb526c375de..d8c54c909bea 100644
--- a/metadata/md5-cache/net-misc/bird-1.3.0
+++ b/metadata/md5-cache/net-misc/bird-1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6
 EAPI=1
 HOMEPAGE=http://bird.network.cz
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses sys-libs/readline
 SLOT=0
 SRC_URI=ftp://bird.network.cz/pub/bird/bird-1.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a08697a057795cab92cb2a8896d8d4b4
diff --git a/metadata/md5-cache/net-misc/bird-1.3.1 b/metadata/md5-cache/net-misc/bird-1.3.1
index c4930f99bd09..9f18daad1442 100644
--- a/metadata/md5-cache/net-misc/bird-1.3.1
+++ b/metadata/md5-cache/net-misc/bird-1.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6
 EAPI=1
 HOMEPAGE=http://bird.network.cz
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses sys-libs/readline
 SLOT=0
 SRC_URI=ftp://bird.network.cz/pub/bird/bird-1.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=65959e92ed63ae78425ae32ae2cb70a8
diff --git a/metadata/md5-cache/net-misc/bird-1.3.2 b/metadata/md5-cache/net-misc/bird-1.3.2
index 811004ef0a76..398e614bbb0c 100644
--- a/metadata/md5-cache/net-misc/bird-1.3.2
+++ b/metadata/md5-cache/net-misc/bird-1.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6
 EAPI=1
 HOMEPAGE=http://bird.network.cz
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses sys-libs/readline
 SLOT=0
 SRC_URI=ftp://bird.network.cz/pub/bird/bird-1.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=de8f14411ccad2fde4c359616c404012
diff --git a/metadata/md5-cache/net-misc/bird-1.3.6 b/metadata/md5-cache/net-misc/bird-1.3.6
index 49436b81480c..3fbbb0ce0fbe 100644
--- a/metadata/md5-cache/net-misc/bird-1.3.6
+++ b/metadata/md5-cache/net-misc/bird-1.3.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6
 EAPI=1
 HOMEPAGE=http://bird.network.cz
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses sys-libs/readline
 SLOT=0
 SRC_URI=ftp://bird.network.cz/pub/bird/bird-1.3.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b458d7c53959ed2aeceaca7e9f35326
diff --git a/metadata/md5-cache/net-misc/bridge-utils-1.2 b/metadata/md5-cache/net-misc/bridge-utils-1.2
index 6faf3da8d4bb..0a3291dc1b4b 100644
--- a/metadata/md5-cache/net-misc/bridge-utils-1.2
+++ b/metadata/md5-cache/net-misc/bridge-utils-1.2
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=virtual/os-headers >=sys-devel/autoconf-2.59 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/os-headers >=sys-devel/autoconf-2.59 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tools for configuring the Linux kernel 802.1d Ethernet Bridge
 HOMEPAGE=http://bridge.sourceforge.net/
 KEYWORDS=amd64 hppa ia64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/bridge/bridge-utils-1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7b3de4314bbeadf1e5484dbffc675844
diff --git a/metadata/md5-cache/net-misc/bridge-utils-1.4 b/metadata/md5-cache/net-misc/bridge-utils-1.4
index 5ed0cc232118..d1c20891c49c 100644
--- a/metadata/md5-cache/net-misc/bridge-utils-1.4
+++ b/metadata/md5-cache/net-misc/bridge-utils-1.4
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=virtual/os-headers || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/os-headers || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tools for configuring the Linux kernel 802.1d Ethernet Bridge
 HOMEPAGE=http://bridge.sourceforge.net/
 KEYWORDS=amd64 ~arm hppa ia64 ppc sparc x86 ~ppc64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/bridge/bridge-utils-1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=35a6a68bc254015f8a451ab5d183432c
diff --git a/metadata/md5-cache/net-misc/bridge-utils-1.5 b/metadata/md5-cache/net-misc/bridge-utils-1.5
index 9cac24b71df4..7f40c3a907a5 100644
--- a/metadata/md5-cache/net-misc/bridge-utils-1.5
+++ b/metadata/md5-cache/net-misc/bridge-utils-1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=virtual/os-headers || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/os-headers || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tools for configuring the Linux kernel 802.1d Ethernet Bridge
 EAPI=5
 HOMEPAGE=http://bridge.sourceforge.net/
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/bridge/bridge-utils-1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=83d63286f37ef51d96e6c11ece0cd0f2
diff --git a/metadata/md5-cache/net-misc/cadaver-0.23.3 b/metadata/md5-cache/net-misc/cadaver-0.23.3
index 08b955c44da5..6b07316ec63e 100644
--- a/metadata/md5-cache/net-misc/cadaver-0.23.3
+++ b/metadata/md5-cache/net-misc/cadaver-0.23.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=net-libs/neon-0.27.0 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-libs/neon-0.27.0 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Command-line WebDAV client.
 EAPI=3
 HOMEPAGE=http://www.webdav.org/cadaver
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/neon-0.27.0
 SLOT=0
 SRC_URI=http://www.webdav.org/cadaver/cadaver-0.23.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e17c710228be5e8c3251d44e4144d319
diff --git a/metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.3-r1 b/metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.3-r1
index f24818c43a58..9b18c2bf36bc 100644
--- a/metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.3-r1
+++ b/metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=net-dialup/capi4k-utils media-libs/tiff virtual/jpeg sys-libs/zlib || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-dialup/capi4k-utils media-libs/tiff virtual/jpeg sys-libs/zlib || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=capi4hylafax adds a faxcapi modem to the hylafax enviroment.
 HOMEPAGE=http://packages.qa.debian.org/c/capi4hylafax.html
 IUSE=unicode
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/capi4k-utils media-libs/tiff virtual/jpeg sys-libs/zlib dev-util/dialog
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/capi4hylafax/capi4hylafax_01.03.00.99.svn.300.orig.tar.gz mirror://debian/pool/main/c/capi4hylafax/capi4hylafax_01.03.00.99.svn.300-3.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=82f3e4b28470aaf6f8ddaef49513aec3
diff --git a/metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.4 b/metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.4
index 6a933c40403f..64c31e66f77d 100644
--- a/metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.4
+++ b/metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=net-dialup/capi4k-utils media-libs/tiff virtual/jpeg sys-libs/zlib || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-dialup/capi4k-utils media-libs/tiff virtual/jpeg sys-libs/zlib || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=capi4hylafax adds a faxcapi modem to the hylafax enviroment.
 HOMEPAGE=http://packages.qa.debian.org/c/capi4hylafax.html
 IUSE=unicode
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/capi4k-utils media-libs/tiff virtual/jpeg sys-libs/zlib dev-util/dialog
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/capi4hylafax/capi4hylafax_01.03.00.99.svn.300.orig.tar.gz mirror://debian/pool/main/c/capi4hylafax/capi4hylafax_01.03.00.99.svn.300-4.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b19b569f851dd1bb49a6623d2fd95164
diff --git a/metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.7 b/metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.7
index d982ef41a94b..2fde803d4cdd 100644
--- a/metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.7
+++ b/metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=net-dialup/capi4k-utils app-shells/bash media-libs/tiff virtual/jpeg sys-libs/zlib || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-dialup/capi4k-utils app-shells/bash media-libs/tiff virtual/jpeg sys-libs/zlib || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=capi4hylafax adds a faxcapi modem to the hylafax enviroment.
 HOMEPAGE=http://packages.qa.debian.org/c/capi4hylafax.html
 KEYWORDS=~amd64 ~ppc ~x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/capi4k-utils app-shells/bash media-libs/tiff virtual/jpeg sys-libs/zlib dev-util/dialog
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/capi4hylafax/capi4hylafax_01.03.00.99.svn.300.orig.tar.gz mirror://debian/pool/main/c/capi4hylafax/capi4hylafax_01.03.00.99.svn.300-7.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=37de0397fa3f73f92432edb2b10a6332
diff --git a/metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.9 b/metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.9
index 9b414e81b792..2477d63cfd17 100644
--- a/metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.9
+++ b/metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=net-dialup/capi4k-utils app-shells/bash media-libs/tiff virtual/jpeg sys-libs/zlib || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-dialup/capi4k-utils app-shells/bash media-libs/tiff virtual/jpeg sys-libs/zlib || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=capi4hylafax adds a faxcapi modem to the hylafax enviroment.
 HOMEPAGE=http://packages.qa.debian.org/c/capi4hylafax.html
 KEYWORDS=~amd64 ~ppc ~x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/capi4k-utils app-shells/bash media-libs/tiff virtual/jpeg sys-libs/zlib dev-util/dialog
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/capi4hylafax/capi4hylafax_01.03.00.99.svn.300.orig.tar.gz mirror://debian/pool/main/c/capi4hylafax/capi4hylafax_01.03.00.99.svn.300-9.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a7b8b6fb81e8d9180be5c0b76096daed
diff --git a/metadata/md5-cache/net-misc/cfengine-3.4.4 b/metadata/md5-cache/net-misc/cfengine-3.4.4
index 601a41331420..97d6d376fc64 100644
--- a/metadata/md5-cache/net-misc/cfengine-3.4.4
+++ b/metadata/md5-cache/net-misc/cfengine-3.4.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst prepare
-DEPEND=>=sys-libs/db-4 acl? ( virtual/acl ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) selinux? ( sys-libs/libselinux ) tokyocabinet? ( dev-db/tokyocabinet ) qdbm? ( dev-db/qdbm ) libvirt? ( app-emulation/libvirt ) xml? ( dev-libs/libxml2:2 ) >=dev-libs/openssl-0.9.7 dev-libs/libpcre || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/db-4 acl? ( virtual/acl ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) selinux? ( sys-libs/libselinux ) tokyocabinet? ( dev-db/tokyocabinet ) qdbm? ( dev-db/qdbm ) libvirt? ( app-emulation/libvirt ) xml? ( dev-libs/libxml2:2 ) >=dev-libs/openssl-0.9.7 dev-libs/libpcre || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An automated suite of programs for configuring and maintaining Unix-like computers
 EAPI=5
 HOMEPAGE=http://www.cfengine.org/
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/db-4 acl? ( virtual/acl ) mysql? ( virtual/mysql ) postgres?
 REQUIRED_USE=qdbm? ( !tokyocabinet ) tokyocabinet? ( !qdbm ) !tokyocabinet? ( qdbm ) !qdbm? ( tokyocabinet )
 SLOT=3
 SRC_URI=http://cfengine.com/source-code/download?file=cfengine-3.4.4.tar.gz -> cfengine-3.4.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dd9ed2a76279067895c809a628659711
diff --git a/metadata/md5-cache/net-misc/corkscrew-2.0 b/metadata/md5-cache/net-misc/corkscrew-2.0
index de370898c760..376a1a059717 100644
--- a/metadata/md5-cache/net-misc/corkscrew-2.0
+++ b/metadata/md5-cache/net-misc/corkscrew-2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a tool for tunneling SSH through HTTP proxies
 EAPI=4
 HOMEPAGE=http://www.agroman.net/corkscrew/
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.agroman.net/corkscrew/corkscrew-2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=7a72e7553cca8d9516d6946476bd8abc
diff --git a/metadata/md5-cache/net-misc/curl-7.21.4 b/metadata/md5-cache/net-misc/curl-7.21.4
index 2c229eaa90f5..2e585f3cd802 100644
--- a/metadata/md5-cache/net-misc/curl-7.21.4
+++ b/metadata/md5-cache/net-misc/curl-7.21.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Client that groks URLs
 EAPI=4
 HOMEPAGE=http://curl.haxx.se/
@@ -10,5 +10,5 @@ RDEPEND=ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/lib
 REQUIRED_USE=threads? ( !ares ) gnutls? ( ssl ) nss? ( ssl )
 SLOT=0
 SRC_URI=http://curl.haxx.se/download/curl-7.21.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6ef18735cab8379c6ce98740790204a2
diff --git a/metadata/md5-cache/net-misc/curl-7.25.0-r1 b/metadata/md5-cache/net-misc/curl-7.25.0-r1
index 2c24000ce912..9788da5dd151 100644
--- a/metadata/md5-cache/net-misc/curl-7.25.0-r1
+++ b/metadata/md5-cache/net-misc/curl-7.25.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ( <net-libs/gnutls-2.12 dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) ares? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib sys-apps/ed virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ( <net-libs/gnutls-2.12 dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) ares? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib sys-apps/ed virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Client that groks URLs
 EAPI=4
 HOMEPAGE=http://curl.haxx.se/
@@ -11,5 +11,5 @@ REQUIRED_USE=threads? ( !ares ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_
 RESTRICT=test
 SLOT=0
 SRC_URI=http://curl.haxx.se/download/curl-7.25.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8494de472e4d6fe4dd396c14773f0d43
diff --git a/metadata/md5-cache/net-misc/curl-7.26.0 b/metadata/md5-cache/net-misc/curl-7.26.0
index 021b56ec3333..64f11d27c57d 100644
--- a/metadata/md5-cache/net-misc/curl-7.26.0
+++ b/metadata/md5-cache/net-misc/curl-7.26.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ( <net-libs/gnutls-2.12 dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) ares? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib sys-apps/ed virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ( <net-libs/gnutls-2.12 dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) ares? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib sys-apps/ed virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Client that groks URLs
 EAPI=4
 HOMEPAGE=http://curl.haxx.se/
@@ -11,5 +11,5 @@ REQUIRED_USE=threads? ( !ares ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_cyassl curl_
 RESTRICT=test
 SLOT=0
 SRC_URI=http://curl.haxx.se/download/curl-7.26.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5dfd19eeeb77d0c130d7a9e2ea228f77
diff --git a/metadata/md5-cache/net-misc/curl-7.29.0-r1 b/metadata/md5-cache/net-misc/curl-7.29.0-r1
index 330056374cfc..038069ed910c 100644
--- a/metadata/md5-cache/net-misc/curl-7.29.0-r1
+++ b/metadata/md5-cache/net-misc/curl-7.29.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Client that groks URLs
 EAPI=4
 HOMEPAGE=http://curl.haxx.se/
@@ -11,5 +11,5 @@ REQUIRED_USE=threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_cyassl curl_
 RESTRICT=test
 SLOT=0
 SRC_URI=http://curl.haxx.se/download/curl-7.29.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=56f5173ee6bea0e6cd3c7ae119d91ec6
diff --git a/metadata/md5-cache/net-misc/curl-7.30.0 b/metadata/md5-cache/net-misc/curl-7.30.0
index 7fda2a94e099..4936552d1741 100644
--- a/metadata/md5-cache/net-misc/curl-7.30.0
+++ b/metadata/md5-cache/net-misc/curl-7.30.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Client that groks URLs
 EAPI=5
 HOMEPAGE=http://curl.haxx.se/
@@ -11,5 +11,5 @@ REQUIRED_USE=threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_cyassl curl_
 RESTRICT=test
 SLOT=0
 SRC_URI=http://curl.haxx.se/download/curl-7.30.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8297812312252d418a887d09b7497dc4
diff --git a/metadata/md5-cache/net-misc/dhcpcd-5.6.8 b/metadata/md5-cache/net-misc/dhcpcd-5.6.8
new file mode 100644
index 000000000000..98ddbfb11457
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dhcpcd-5.6.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst preinst prepare
+DEPEND=virtual/pkgconfig
+DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
+EAPI=5
+HOMEPAGE=http://roy.marples.name/projects/dhcpcd/
+IUSE=+zeroconf elibc_glibc
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=http://roy.marples.name/downloads/dhcpcd/dhcpcd-5.6.8.tar.bz2
+_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=639c84ce649578027ee4383b2f0623ec
diff --git a/metadata/md5-cache/net-misc/dhcpcd-9999 b/metadata/md5-cache/net-misc/dhcpcd-9999
index 7ceca4cabcda..6b30d5c4233e 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-9999
+++ b/metadata/md5-cache/net-misc/dhcpcd-9999
@@ -7,4 +7,4 @@ IUSE=+zeroconf elibc_glibc
 LICENSE=BSD-2
 SLOT=0
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3014ea37d1908ded52afa8a592cadfe1
+_md5_=5a8b34c7db8a1468b532ffa3ca176356
diff --git a/metadata/md5-cache/net-misc/dibbler-0.8.0 b/metadata/md5-cache/net-misc/dibbler-0.8.0
index 39c4785b898f..e862bf8679c9 100644
--- a/metadata/md5-cache/net-misc/dibbler-0.8.0
+++ b/metadata/md5-cache/net-misc/dibbler-0.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare
-DEPEND=doc? ( dev-texlive/texlive-latex dev-tex/floatflt ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( dev-texlive/texlive-latex dev-tex/floatflt ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Portable DHCPv6 implementation (server, client and relay)
 EAPI=4
 HOMEPAGE=http://klub.com.pl/dhcpv6/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~hppa ~mips ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://klub.com.pl/dhcpv6/dibbler/dibbler-0.8.0-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ab9f8f9f01484a242e23d5ea66181182
diff --git a/metadata/md5-cache/net-misc/directvnc-0.7.6-r1 b/metadata/md5-cache/net-misc/directvnc-0.7.6-r1
index 775efbf56ede..64b550947f52 100644
--- a/metadata/md5-cache/net-misc/directvnc-0.7.6-r1
+++ b/metadata/md5-cache/net-misc/directvnc-0.7.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/DirectFB[fbcon,dynload] virtual/jpeg dmalloc? ( dev-libs/dmalloc ) x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/DirectFB[fbcon,dynload] virtual/jpeg dmalloc? ( dev-libs/dmalloc ) x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Very thin VNC client for unix framebuffer systems
 EAPI=5
 HOMEPAGE=http://drinkmilk.github.com/directvnc/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/DirectFB[fbcon,dynload] virtual/jpeg
 SLOT=0
 SRC_URI=http://github.com/downloads/drinkmilk/directvnc/directvnc-0.7.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cd884cf5a755782a9a86fe71abe30a2e
diff --git a/metadata/md5-cache/net-misc/directvnc-0.7.8 b/metadata/md5-cache/net-misc/directvnc-0.7.8
index dc222c0bb859..938340bd22d5 100644
--- a/metadata/md5-cache/net-misc/directvnc-0.7.8
+++ b/metadata/md5-cache/net-misc/directvnc-0.7.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/DirectFB[fbcon,dynload] virtual/jpeg dmalloc? ( dev-libs/dmalloc ) x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/DirectFB[fbcon,dynload] virtual/jpeg dmalloc? ( dev-libs/dmalloc ) x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Very thin VNC client for unix framebuffer systems
 EAPI=5
 HOMEPAGE=http://drinkmilk.github.com/directvnc/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/DirectFB[fbcon,dynload] virtual/jpeg
 SLOT=0
 SRC_URI=http://github.com/downloads/drinkmilk/directvnc/directvnc-0.7.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b96cc16495ec7999748fb5609a2b77b7
diff --git a/metadata/md5-cache/net-misc/drivel-3.0.3 b/metadata/md5-cache/net-misc/drivel-3.0.3
index 3cc02deba2f3..86eeb9a3f7d6 100644
--- a/metadata/md5-cache/net-misc/drivel-3.0.3
+++ b/metadata/md5-cache/net-misc/drivel-3.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 ) virtual/pkgconfig >=app-text/gnome-doc-utils-0.3.2 >=dev-util/intltool-0.21 >=app-text/scrollkeeper-0.3.5 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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 ) virtual/pkgconfig >=app-text/gnome-doc-utils-0.3.2 >=dev-util/intltool-0.21 >=app-text/scrollkeeper-0.3.5 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Drivel is a desktop blogger with support for LiveJournal, Blogger, MoveableType, Wordpress and more.
 EAPI=2
 HOMEPAGE=http://drivel.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/drivel/drivel-3.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=678ee6fdbd994f89eb3c729372fe811e
diff --git a/metadata/md5-cache/net-misc/elliptics-eblob-0.0.1 b/metadata/md5-cache/net-misc/elliptics-eblob-0.0.1
index 0fe7adeab39e..baa43330704e 100644
--- a/metadata/md5-cache/net-misc/elliptics-eblob-0.0.1
+++ b/metadata/md5-cache/net-misc/elliptics-eblob-0.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/openssl python? ( dev-libs/boost[python] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=dev-libs/openssl python? ( dev-libs/boost[python] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=The elliptics network - eblob backend
 EAPI=4
 HOMEPAGE=http://www.ioremap.net/projects/elliptics
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl python? ( dev-libs/boost[python] ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://www.ioremap.net/archive/eblob/eblob-0.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f31e13b9f101cdbfc41a382561dbe475
diff --git a/metadata/md5-cache/net-misc/gsasl-1.8.0-r1 b/metadata/md5-cache/net-misc/gsasl-1.8.0-r1
index 6b4d29665f81..b7050b742497 100644
--- a/metadata/md5-cache/net-misc/gsasl-1.8.0-r1
+++ b/metadata/md5-cache/net-misc/gsasl-1.8.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The GNU SASL client, server, and library
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/gsasl/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm )
 SLOT=0
 SRC_URI=mirror://gnu/gsasl/gsasl-1.8.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4c549f7b332451d12c0e24a348292bed
diff --git a/metadata/md5-cache/net-misc/gwibber-3.1.0 b/metadata/md5-cache/net-misc/gwibber-3.1.0
deleted file mode 100644
index aa9e9f303ee8..000000000000
--- a/metadata/md5-cache/net-misc/gwibber-3.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND==dev-lang/python-2* =dev-lang/python-2*[sqlite]
-DESCRIPTION=Gwibber is an open source microblogging client for GNOME developed with Python and GTK.
-EAPI=5
-HOMEPAGE=https://launchpad.net/gwibber
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/dbus-python-0.80.2 >=dev-python/gconf-python-2.18.0 dev-python/gnome-keyring-python >=dev-python/imaging-1.1.6 >=dev-python/notify-python-0.1.1 >=dev-python/pywebkitgtk-1.0.1 >=dev-python/simplejson-1.9.1 >=dev-python/egenix-mx-base-3.0.0 >=dev-python/python-distutils-extra-2.15 >=dev-python/pycurl-7.19.0 >=dev-python/libwnck-python-2.26.0 >=dev-python/feedparser-4.1 >=dev-python/pyxdg-0.15 >=dev-python/mako-0.2.4 >=dev-python/pygtk-2.16 dev-python/oauth >=gnome-base/librsvg-2.22.2 =dev-lang/python-2* =dev-lang/python-2*[sqlite]
-SLOT=0
-SRC_URI=http://launchpad.net/gwibber/3.2/3.1.0/+download/gwibber-3.1.0.tar.gz
-_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0564ddb572db217d1c90000dd9f89915
diff --git a/metadata/md5-cache/net-misc/hsc-1.0b b/metadata/md5-cache/net-misc/hsc-1.0b
index 533c891ea30b..de116b37c983 100644
--- a/metadata/md5-cache/net-misc/hsc-1.0b
+++ b/metadata/md5-cache/net-misc/hsc-1.0b
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An HTML preprocessor using ML syntax
 HOMEPAGE=http://www.linguistik.uni-erlangen.de/~msbethke/software.html
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.linguistik.uni-erlangen.de/~msbethke/binaries/hsc-1.0b.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=33a45dce732df1a7c975b7461b4af235
diff --git a/metadata/md5-cache/net-misc/icecast-2.3.3-r1 b/metadata/md5-cache/net-misc/icecast-2.3.3-r1
index b85fb62781b1..6de6ddffffd4 100644
--- a/metadata/md5-cache/net-misc/icecast-2.3.3-r1
+++ b/metadata/md5-cache/net-misc/icecast-2.3.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=dev-libs/libxslt dev-libs/libxml2 media-libs/libogg media-libs/libvorbis kate? ( media-libs/libkate ) logrotate? ( app-admin/logrotate ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) yp? ( net-misc/curl ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxslt dev-libs/libxml2 media-libs/libogg media-libs/libvorbis kate? ( media-libs/libkate ) logrotate? ( app-admin/logrotate ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) yp? ( net-misc/curl ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An opensource alternative to shoutcast that supports mp3, ogg (vorbis/theora) and aac streaming
 EAPI=4
 HOMEPAGE=http://www.icecast.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxslt dev-libs/libxml2 media-libs/libogg media-libs/libvorbis kate? ( media-libs/libkate ) logrotate? ( app-admin/logrotate ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) yp? ( net-misc/curl ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/icecast/icecast-2.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7c47a2b80e4cb155e76f36895f17edcc
diff --git a/metadata/md5-cache/net-misc/jumpgate-0.7 b/metadata/md5-cache/net-misc/jumpgate-0.7
index 9d19f8c38c6f..518dab23eb46 100644
--- a/metadata/md5-cache/net-misc/jumpgate-0.7
+++ b/metadata/md5-cache/net-misc/jumpgate-0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An advanced TCP connection forwarder
 EAPI=4
 HOMEPAGE=http://jumpgate.sourceforge.net/
@@ -7,5 +7,5 @@ KEYWORDS=x86 amd64
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://jumpgate.sourceforge.net/jumpgate-0.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9c8ae0ec69ca06a5f9cac3df90ced312
diff --git a/metadata/md5-cache/net-misc/l7-filter-userspace-0.11 b/metadata/md5-cache/net-misc/l7-filter-userspace-0.11
index 0c4b0c600d99..1f708263ecd3 100644
--- a/metadata/md5-cache/net-misc/l7-filter-userspace-0.11
+++ b/metadata/md5-cache/net-misc/l7-filter-userspace-0.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=net-libs/libnetfilter_conntrack-0.0.100 net-libs/libnetfilter_queue || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-libs/libnetfilter_conntrack-0.0.100 net-libs/libnetfilter_queue || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Userspace utilities for layer 7 iptables QoS
 EAPI=4
 HOMEPAGE=http://l7-filter.clearfoundation.com/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/l7-protocols >=net-libs/libnetfilter_conntrack-0.0.100 net-libs/libnetfilter_queue
 SLOT=0
 SRC_URI=mirror://sourceforge/l7-filter/l7-filter-userspace-0.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5a584cce665b1419a531882134f7638c
diff --git a/metadata/md5-cache/net-misc/lambdamoo-1.8.1-r2 b/metadata/md5-cache/net-misc/lambdamoo-1.8.1-r2
index a89dbaadab63..4082b45a0c96 100644
--- a/metadata/md5-cache/net-misc/lambdamoo-1.8.1-r2
+++ b/metadata/md5-cache/net-misc/lambdamoo-1.8.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=sys-devel/bison || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-devel/bison || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=networked mud that can be used for different types of collaborative software
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/lambdamoo/
@@ -7,5 +7,5 @@ KEYWORDS=~x86 ~sparc
 LICENSE=LambdaMOO GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/lambdamoo/LambdaMOO-1.8.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=84a9d2a3a82f6e4637364f61213603e9
diff --git a/metadata/md5-cache/net-misc/libteam-1.0 b/metadata/md5-cache/net-misc/libteam-1.0
index f03234c1447a..2c7e3c4e8238 100644
--- a/metadata/md5-cache/net-misc/libteam-1.0
+++ b/metadata/md5-cache/net-misc/libteam-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/jansson dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] sys-apps/dbus || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/jansson dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] sys-apps/dbus || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library and tools set for controlling team network device
 EAPI=5
 HOMEPAGE=https://fedorahosted.org/libteam/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/jansson dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] sys-apps/dbus syslog? ( virtual/logger )
 SLOT=0
 SRC_URI=https://github.com/jpirko/libteam/archive/v1.0.tar.gz -> libteam-1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=18350f49359a9c2dd87fce62c69ffea0
diff --git a/metadata/md5-cache/net-misc/linux-eoip-0.5 b/metadata/md5-cache/net-misc/linux-eoip-0.5
index bddac3215710..59cfd06e0359 100644
--- a/metadata/md5-cache/net-misc/linux-eoip-0.5
+++ b/metadata/md5-cache/net-misc/linux-eoip-0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/lzo:2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/lzo:2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Linux support for proprietary MIkrotik EoIP protocol
 EAPI=4
 HOMEPAGE=http://code.google.com/p/linux-eoip/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/lzo:2
 SLOT=0
 SRC_URI=http://linux-eoip.googlecode.com/files/linux-eoip-0.5.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3a3745eef072cdcf2b595338376c17a5
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.13 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.13
index 50f95fcd33d3..2073ff366baf 100644
--- a/metadata/md5-cache/net-misc/lksctp-tools-1.0.13
+++ b/metadata/md5-cache/net-misc/lksctp-tools-1.0.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-kernel/linux-headers-2.6 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-kernel/linux-headers-2.6 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tools for Linux Kernel Stream Control Transmission Protocol implementation
 EAPI=5
 HOMEPAGE=http://lksctp.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2+ LGPL-2.1 )
 REQUIRED_USE=kernel_linux
 SLOT=0
 SRC_URI=mirror://sourceforge/lksctp/lksctp-tools-1.0.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=431d3cb79c690de89d039569c6da6bb0
diff --git a/metadata/md5-cache/net-misc/mediatomb-0.12.1-r2 b/metadata/md5-cache/net-misc/mediatomb-0.12.1-r2
index 83025238a2d4..87b645bb761c 100644
--- a/metadata/md5-cache/net-misc/mediatomb-0.12.1-r2
+++ b/metadata/md5-cache/net-misc/mediatomb-0.12.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=mysql? ( virtual/mysql ) !mysql? ( >=dev-db/sqlite-3 ) javascript? ( <dev-lang/spidermonkey-1.8.6 ) 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-1.9.1_p479:0 ) ffmpeg? ( virtual/ffmpeg ) thumbnail? ( media-video/ffmpegthumbnailer[jpeg] ) net-misc/curl sys-apps/file sys-libs/zlib virtual/libiconv || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mysql? ( virtual/mysql ) !mysql? ( >=dev-db/sqlite-3 ) javascript? ( <dev-lang/spidermonkey-1.8.6 ) 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-1.9.1_p479:0 ) ffmpeg? ( virtual/ffmpeg ) thumbnail? ( media-video/ffmpegthumbnailer[jpeg] ) net-misc/curl sys-apps/file sys-libs/zlib virtual/libiconv || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MediaTomb is an open source UPnP MediaServer
 EAPI=2
 HOMEPAGE=http://www.mediatomb.cc/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql ) !mysql? ( >=dev-db/sqlite-3 ) javascript? ( <dev-lang/spidermonkey-1.8.6 ) 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-1.9.1_p479:0 ) ffmpeg? ( virtual/ffmpeg ) thumbnail? ( media-video/ffmpegthumbnailer[jpeg] ) net-misc/curl sys-apps/file sys-libs/zlib virtual/libiconv
 SLOT=0
 SRC_URI=mirror://sourceforge/mediatomb/mediatomb-0.12.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1bb21fd937c9220701cb939885cdd4b6
diff --git a/metadata/md5-cache/net-misc/mediatomb-0.12.1-r5 b/metadata/md5-cache/net-misc/mediatomb-0.12.1-r5
index 822139861651..3a0caae86e9a 100644
--- a/metadata/md5-cache/net-misc/mediatomb-0.12.1-r5
+++ b/metadata/md5-cache/net-misc/mediatomb-0.12.1-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=mysql? ( virtual/mysql ) id3tag? ( media-libs/id3lib ) javascript? ( >=dev-lang/spidermonkey-1.8.5 ) dev-libs/expat taglib? ( media-libs/taglib ) sqlite? ( >=dev-db/sqlite-3 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) libextractor? ( media-libs/libextractor ) mp4? ( >=media-libs/libmp4v2-1.9.1_p479:0 ) ffmpeg? ( virtual/ffmpeg ) thumbnail? ( media-video/ffmpegthumbnailer[jpeg] ) curl? ( net-misc/curl ) magic? ( sys-apps/file ) sys-apps/util-linux zlib? ( sys-libs/zlib ) virtual/libiconv || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mysql? ( virtual/mysql ) id3tag? ( media-libs/id3lib ) javascript? ( >=dev-lang/spidermonkey-1.8.5 ) dev-libs/expat taglib? ( media-libs/taglib ) sqlite? ( >=dev-db/sqlite-3 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) libextractor? ( media-libs/libextractor ) mp4? ( >=media-libs/libmp4v2-1.9.1_p479:0 ) ffmpeg? ( virtual/ffmpeg ) thumbnail? ( media-video/ffmpegthumbnailer[jpeg] ) curl? ( net-misc/curl ) magic? ( sys-apps/file ) sys-apps/util-linux zlib? ( sys-libs/zlib ) virtual/libiconv || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MediaTomb is an open source UPnP MediaServer
 EAPI=4
 HOMEPAGE=http://www.mediatomb.cc/
@@ -10,5 +10,5 @@ RDEPEND=mysql? ( virtual/mysql ) id3tag? ( media-libs/id3lib ) javascript? ( >=d
 REQUIRED_USE=|| ( mysql sqlite ) taglib? ( !id3tag ) id3tag? ( !taglib ) thumbnail? ( ffmpeg !libextractor ) ffmpeg? ( !libextractor ) libextractor? ( !ffmpeg !thumbnail )
 SLOT=0
 SRC_URI=mirror://sourceforge/mediatomb/mediatomb-0.12.1.tar.gz mirror://debian/pool/main/m/mediatomb/mediatomb_0.12.1-4.debian.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=be9804e264f13feeb21b630e6ac6176d
diff --git a/metadata/md5-cache/net-misc/memcached-1.2.8-r1 b/metadata/md5-cache/net-misc/memcached-1.2.8-r1
index 76076a2da30e..4f77920a77e6 100644
--- a/metadata/md5-cache/net-misc/memcached-1.2.8-r1
+++ b/metadata/md5-cache/net-misc/memcached-1.2.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst test unpack
-DEPEND=>=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High-performance, distributed memory object caching system
 HOMEPAGE=http://code.google.com/p/memcached/
 IUSE=nptl test
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.2.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f0a6783f42f28c9a35a48a4a704a99c3
diff --git a/metadata/md5-cache/net-misc/memcached-1.3.3-r3 b/metadata/md5-cache/net-misc/memcached-1.3.3-r3
index 4fc8ab31c3d1..6bd2f9050006 100644
--- a/metadata/md5-cache/net-misc/memcached-1.3.3-r3
+++ b/metadata/md5-cache/net-misc/memcached-1.3.3-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst test unpack
-DEPEND=>=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High-performance, distributed memory object caching system
 HOMEPAGE=http://code.google.com/p/memcached/
 IUSE=nptl test
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eb511abec1b45def38bf28eb5581c497
diff --git a/metadata/md5-cache/net-misc/memcached-1.3.3-r4 b/metadata/md5-cache/net-misc/memcached-1.3.3-r4
index 2aeb37d66beb..6b48d8ac9e89 100644
--- a/metadata/md5-cache/net-misc/memcached-1.3.3-r4
+++ b/metadata/md5-cache/net-misc/memcached-1.3.3-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst test unpack
-DEPEND=>=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High-performance, distributed memory object caching system
 HOMEPAGE=http://code.google.com/p/memcached/
 IUSE=nptl test slabs-reassign
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9eba3123b02c7e296a3e21650aea6136
diff --git a/metadata/md5-cache/net-misc/memcached-1.3.3-r5 b/metadata/md5-cache/net-misc/memcached-1.3.3-r5
index 3617bff49534..7f3b00b11501 100644
--- a/metadata/md5-cache/net-misc/memcached-1.3.3-r5
+++ b/metadata/md5-cache/net-misc/memcached-1.3.3-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst test unpack
-DEPEND=>=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High-performance, distributed memory object caching system
 HOMEPAGE=http://code.google.com/p/memcached/
 IUSE=test slabs-reassign
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fa55454c7245287c693b49e921ef5b4c
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.0-r2 b/metadata/md5-cache/net-misc/memcached-1.4.0-r2
index 0c67290a3415..ee5de8d65fe4 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.0-r2
+++ b/metadata/md5-cache/net-misc/memcached-1.4.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst test unpack
-DEPEND=>=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High-performance, distributed memory object caching system
 HOMEPAGE=http://code.google.com/p/memcached/
 IUSE=test slabs-reassign
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=97238cf2d9947be57b7719e0dffeebdc
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.0-r3 b/metadata/md5-cache/net-misc/memcached-1.4.0-r3
index 92b48e1963e2..9405cc284991 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.0-r3
+++ b/metadata/md5-cache/net-misc/memcached-1.4.0-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare test
-DEPEND=>=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=2
 HOMEPAGE=http://code.google.com/p/memcached/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c7d79f320e3d6b00bd3492dc6b0988e4
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.1-r1 b/metadata/md5-cache/net-misc/memcached-1.4.1-r1
index c52ae9a3025f..4c1daaee0774 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.1-r1
+++ b/metadata/md5-cache/net-misc/memcached-1.4.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare test
-DEPEND=>=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=2
 HOMEPAGE=http://code.google.com/p/memcached/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=157fe9e5d21270a304addcc13d734cdc
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.10-r1 b/metadata/md5-cache/net-misc/memcached-1.4.10-r1
index 307835d1be5a..49934b9a4e68 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.10-r1
+++ b/metadata/md5-cache/net-misc/memcached-1.4.10-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=2
 HOMEPAGE=http://code.google.com/p/memcached/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2535c1d091bb39ed7950714adc4d159e
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.11 b/metadata/md5-cache/net-misc/memcached-1.4.11
index 32a242fdd2a0..8a4b35b7fcf2 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.11
+++ b/metadata/md5-cache/net-misc/memcached-1.4.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=2
 HOMEPAGE=http://code.google.com/p/memcached/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aa088ad38db5eb28a4b2707b148f7555
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.13 b/metadata/md5-cache/net-misc/memcached-1.4.13
index c1870642f90a..cc44cc7eb4a9 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.13
+++ b/metadata/md5-cache/net-misc/memcached-1.4.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=2
 HOMEPAGE=http://code.google.com/p/memcached/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1fc6f7c9ebdffb1c459bf72436a527b9
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.2-r1 b/metadata/md5-cache/net-misc/memcached-1.4.2-r1
index 89e81d0326b2..019f9daf5fb3 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.2-r1
+++ b/metadata/md5-cache/net-misc/memcached-1.4.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=2
 HOMEPAGE=http://code.google.com/p/memcached/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2d665cad100cb6f5b85d2f5a1fdf1b79
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.4-r1 b/metadata/md5-cache/net-misc/memcached-1.4.4-r1
index 1cd67b401052..964622d0359d 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.4-r1
+++ b/metadata/md5-cache/net-misc/memcached-1.4.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=2
 HOMEPAGE=http://code.google.com/p/memcached/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f54de68ef03fe5bf5b33bdc8ae2453cb
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.5-r1 b/metadata/md5-cache/net-misc/memcached-1.4.5-r1
index 5e3ff2dc9a7f..14c643f0b341 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.5-r1
+++ b/metadata/md5-cache/net-misc/memcached-1.4.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=2
 HOMEPAGE=http://code.google.com/p/memcached/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aa501ba112dd00a3ee815e18a8a19bd4
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.7-r1 b/metadata/md5-cache/net-misc/memcached-1.4.7-r1
index ed2160bb2539..1e6a57bc0b2c 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.7-r1
+++ b/metadata/md5-cache/net-misc/memcached-1.4.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=2
 HOMEPAGE=http://code.google.com/p/memcached/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6b0ed54ccdf85d91c206fe1b568c3349
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.8-r1 b/metadata/md5-cache/net-misc/memcached-1.4.8-r1
index 6d100ed54e4b..ab547ed218a5 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.8-r1
+++ b/metadata/md5-cache/net-misc/memcached-1.4.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=2
 HOMEPAGE=http://code.google.com/p/memcached/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b9b8897eb4d8c5e2f460875d2788da02
diff --git a/metadata/md5-cache/net-misc/mico-2.3.13-r5 b/metadata/md5-cache/net-misc/mico-2.3.13-r5
index ca57611f0ba7..2fb49749d377 100644
--- a/metadata/md5-cache/net-misc/mico-2.3.13-r5
+++ b/metadata/md5-cache/net-misc/mico-2.3.13-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql-base ) qt4? ( dev-qt/qtgui: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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql-base ) qt4? ( dev-qt/qtgui: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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A freely available and fully compliant implementation of the CORBA standard
 EAPI=3
 HOMEPAGE=http://www.mico.org/
@@ -10,5 +10,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql-base ) qt4? ( dev
 RESTRICT=test
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b40a0b6baa997983383c44f3707ee163
diff --git a/metadata/md5-cache/net-misc/mico-2.3.13-r6 b/metadata/md5-cache/net-misc/mico-2.3.13-r6
index 91871484ad5d..1eda58373c57 100644
--- a/metadata/md5-cache/net-misc/mico-2.3.13-r6
+++ b/metadata/md5-cache/net-misc/mico-2.3.13-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql-base ) qt4? ( dev-qt/qtgui: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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql-base ) qt4? ( dev-qt/qtgui: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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A freely available and fully compliant implementation of the CORBA standard
 EAPI=3
 HOMEPAGE=http://www.mico.org/
@@ -10,5 +10,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql-base ) qt4? ( dev
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mico.org/mico-2.3.13.tar.gz http://dev.gentoo.org/~haubi/distfiles/mico-2.3.13-gentoo-patches-0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f34afa7ecbf96509aad521c1d217a972
diff --git a/metadata/md5-cache/net-misc/mico-9999 b/metadata/md5-cache/net-misc/mico-9999
index dbcbb78d96d3..eb02ceba0055 100644
--- a/metadata/md5-cache/net-misc/mico-9999
+++ b/metadata/md5-cache/net-misc/mico-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql-base ) qt4? ( dev-qt/qtgui: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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/darcs net-misc/rsync
+DEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql-base ) qt4? ( dev-qt/qtgui: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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/darcs net-misc/rsync
 DESCRIPTION=A freely available and fully compliant implementation of the CORBA standard
 EAPI=3
 HOMEPAGE=http://www.mico.org/
@@ -9,5 +9,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql-base ) qt4? ( dev
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~haubi/distfiles/mico-9999-gentoo-patches-20120924.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	darcs	04f63caa2ef9dbb662f5b5fcd80c2c30	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	darcs	04f63caa2ef9dbb662f5b5fcd80c2c30	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b4737551d5ce4b06f7d22d36eb9ddd33
diff --git a/metadata/md5-cache/net-misc/miredo-1.2.5-r2 b/metadata/md5-cache/net-misc/miredo-1.2.5-r2
index 8a53fd7b1755..1f2d5bc2ac4f 100644
--- a/metadata/md5-cache/net-misc/miredo-1.2.5-r2
+++ b/metadata/md5-cache/net-misc/miredo-1.2.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install preinst prepare setup
-DEPEND=sys-apps/iproute2 dev-libs/judy caps? ( sys-libs/libcap ) app-arch/xz-utils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/iproute2 dev-libs/judy caps? ( sys-libs/libcap ) app-arch/xz-utils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Miredo is an open-source Teredo IPv6 tunneling software.
 EAPI=4
 HOMEPAGE=http://www.remlab.net/miredo/
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/iproute2 dev-libs/judy caps? ( sys-libs/libcap )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.remlab.net/files/miredo/miredo-1.2.5.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3f444b08e2650ce3f60323a8a4ae7438
diff --git a/metadata/md5-cache/net-misc/modemmanager-9999 b/metadata/md5-cache/net-misc/modemmanager-9999
index 3957fbbd64ce..a553a7d0bba5 100644
--- a/metadata/md5-cache/net-misc/modemmanager-9999
+++ b/metadata/md5-cache/net-misc/modemmanager-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=>=dev-libs/glib-2.30.2:2 net-dialup/ppp >=virtual/udev-147[gudev] policykit? ( >=sys-auth/polkit-0.106 ) qmi? ( net-libs/libqmi ) doc? ( app-office/dia dev-libs/libxslt dev-util/gtk-doc ) test? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) dev-util/gdbus-codegen >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git app-arch/xz-utils virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.30.2:2 net-dialup/ppp >=virtual/udev-147[gudev] policykit? ( >=sys-auth/polkit-0.106 ) qmi? ( net-libs/libqmi ) doc? ( app-office/dia dev-libs/libxslt dev-util/gtk-doc ) test? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) dev-util/gdbus-codegen >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git app-arch/xz-utils virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Modem and mobile broadband management libraries
 EAPI=5
 HOMEPAGE=http://cgit.freedesktop.org/ModemManager/ModemManager/
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.30.2:2 net-dialup/ppp >=virtual/udev-147[gudev] policykit? ( >=sys-auth/polkit-0.106 ) qmi? ( net-libs/libqmi )
 REQUIRED_USE=qmi-newest? ( qmi )
 SLOT=0/1
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=6ab25196d144239885c95f98bde8e5f8
diff --git a/metadata/md5-cache/net-misc/mosh-1.2.2 b/metadata/md5-cache/net-misc/mosh-1.2.2
index 7738c17dae42..432cceabfef8 100644
--- a/metadata/md5-cache/net-misc/mosh-1.2.2
+++ b/metadata/md5-cache/net-misc/mosh-1.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
 EAPI=4
 HOMEPAGE=http://mosh.mit.edu
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl
 REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
 SRC_URI=https://github.com/keithw/mosh/tarball/mosh-1.2.2 -> mosh-1.2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	vcs-snapshot	3facff03591093044e38f21285a02129
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	vcs-snapshot	3facff03591093044e38f21285a02129
 _md5_=9e9e641654088e89b9709b7a548f2f1c
diff --git a/metadata/md5-cache/net-misc/mosh-1.2.3 b/metadata/md5-cache/net-misc/mosh-1.2.3
index f3aff89efd7d..9e4c7eb243fb 100644
--- a/metadata/md5-cache/net-misc/mosh-1.2.3
+++ b/metadata/md5-cache/net-misc/mosh-1.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
 EAPI=4
 HOMEPAGE=http://mosh.mit.edu
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl
 REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
 SRC_URI=https://github.com/keithw/mosh/tarball/mosh-1.2.3 -> mosh-1.2.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	vcs-snapshot	3facff03591093044e38f21285a02129
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	vcs-snapshot	3facff03591093044e38f21285a02129
 _md5_=0c9ec2dcf8663a36e2c3a09d298d2d24
diff --git a/metadata/md5-cache/net-misc/mosh-1.2.3.95_rc1 b/metadata/md5-cache/net-misc/mosh-1.2.3.95_rc1
index e0e0358b0078..304fd4412e9f 100644
--- a/metadata/md5-cache/net-misc/mosh-1.2.3.95_rc1
+++ b/metadata/md5-cache/net-misc/mosh-1.2.3.95_rc1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
 EAPI=4
 HOMEPAGE=http://mosh.mit.edu
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl
 REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
 SRC_URI=http://mosh.mit.edu/mosh-1.2.3.95rc1.tar.gz -> mosh-1.2.3.95_rc1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	vcs-snapshot	3facff03591093044e38f21285a02129
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	vcs-snapshot	3facff03591093044e38f21285a02129
 _md5_=d8f518645cf02ff56bfa457c3a66f26a
diff --git a/metadata/md5-cache/net-misc/mosh-1.2.4 b/metadata/md5-cache/net-misc/mosh-1.2.4
index ac12801240ab..bc813b68b65b 100644
--- a/metadata/md5-cache/net-misc/mosh-1.2.4
+++ b/metadata/md5-cache/net-misc/mosh-1.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
 EAPI=4
 HOMEPAGE=http://mosh.mit.edu
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl
 REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
 SRC_URI=http://mosh.mit.edu/mosh-1.2.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	vcs-snapshot	3facff03591093044e38f21285a02129
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	vcs-snapshot	3facff03591093044e38f21285a02129
 _md5_=44730e56cf2ed76aad8d6a03a22da555
diff --git a/metadata/md5-cache/net-misc/mosh-9999 b/metadata/md5-cache/net-misc/mosh-9999
index 11fc8c8deda4..756b2abb193c 100644
--- a/metadata/md5-cache/net-misc/mosh-9999
+++ b/metadata/md5-cache/net-misc/mosh-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) dev-vcs/git[curl] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) dev-vcs/git[curl] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
 EAPI=4
 HOMEPAGE=http://mosh.mit.edu
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter )
 REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=4189fa973f569496e301549ee6a23198
diff --git a/metadata/md5-cache/net-misc/neatx-0.3.1_p59-r1 b/metadata/md5-cache/net-misc/neatx-0.3.1_p59-r1
index aa024515d1d6..1380bb359eb8 100644
--- a/metadata/md5-cache/net-misc/neatx-0.3.1_p59-r1
+++ b/metadata/md5-cache/net-misc/neatx-0.3.1_p59-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=dev-python/docutils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=dev-python/docutils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=Google implementation of NX server
 EAPI=3
 HOMEPAGE=http://code.google.com/p/neatx/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=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*
 SLOT=0
 SRC_URI=mirror://gentoo/neatx-0.3.1_p59.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f5a3f5f557a6aaf1d8035507b620698d
diff --git a/metadata/md5-cache/net-misc/neatx-0.3.1_p59-r4 b/metadata/md5-cache/net-misc/neatx-0.3.1_p59-r4
index 01f2559fbbd9..93e7ac8400ea 100644
--- a/metadata/md5-cache/net-misc/neatx-0.3.1_p59-r4
+++ b/metadata/md5-cache/net-misc/neatx-0.3.1_p59-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-python/docutils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=dev-python/docutils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=Google implementation of NX server
 EAPI=4
 HOMEPAGE=http://code.google.com/p/neatx/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=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*
 SLOT=0
 SRC_URI=mirror://gentoo/neatx-0.3.1_p59.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=df5bc3addc7b3c0a5e31c6b472c0b68a
diff --git a/metadata/md5-cache/net-misc/netstat-nat-1.4.10 b/metadata/md5-cache/net-misc/netstat-nat-1.4.10
index fee21e5462d2..49c48b5c56fa 100644
--- a/metadata/md5-cache/net-misc/netstat-nat-1.4.10
+++ b/metadata/md5-cache/net-misc/netstat-nat-1.4.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Display NAT connections
 EAPI=2
 HOMEPAGE=http://tweegy.nl/projects/netstat-nat/index.html
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://tweegy.nl/download/netstat-nat-1.4.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=caf5dbc2a496156b5e23b8574ae69a13
diff --git a/metadata/md5-cache/net-misc/netstat-nat-1.4.9 b/metadata/md5-cache/net-misc/netstat-nat-1.4.9
index b9cebc1d0e59..0a889079317b 100644
--- a/metadata/md5-cache/net-misc/netstat-nat-1.4.9
+++ b/metadata/md5-cache/net-misc/netstat-nat-1.4.9
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Display NAT connections
 HOMEPAGE=http://tweegy.demon.nl/projects/netstat-nat/index.html
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://tweegy.demon.nl/download/netstat-nat-1.4.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=10aba1e469b5c579063e90505d5bdb0d
diff --git a/metadata/md5-cache/net-misc/networkmanager-0.9.4.0-r6 b/metadata/md5-cache/net-misc/networkmanager-0.9.4.0-r6
index 0490172dc7cd..9c937e4a8179 100644
--- a/metadata/md5-cache/net-misc/networkmanager-0.9.4.0-r6
+++ b/metadata/md5-cache/net-misc/networkmanager-0.9.4.0-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare pretend setup test
-DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 virtual/udev[gudev] >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 >=net-libs/libsoup-2.26:2.4 >=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[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( dev-libs/libnl:1.1 >=net-wireless/wimax-1.5.1 ) !wimax? ( dev-libs/libnl:3 ) virtual/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 doc? ( >=dev-util/gtk-doc-1.8 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
+DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 virtual/udev[gudev] >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 >=net-libs/libsoup-2.26:2.4 >=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[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( dev-libs/libnl:1.1 >=net-wireless/wimax-1.5.1 ) !wimax? ( dev-libs/libnl:3 ) virtual/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 doc? ( >=dev-util/gtk-doc-1.8 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=Universal network configuration daemon for laptops, desktops, servers and virtualization hosts
 EAPI=4
 HOMEPAGE=http://www.gnome.org/projects/NetworkManager/
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 virtual/udev[gudev] >=dev-
 REQUIRED_USE=modemmanager? ( ppp ) ^^ ( nss gnutls ) ^^ ( dhclient dhcpcd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/0.9/NetworkManager-0.9.4.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f4a6f4fb40388e16d9a31eb925986082
diff --git a/metadata/md5-cache/net-misc/networkmanager-0.9.6.4 b/metadata/md5-cache/net-misc/networkmanager-0.9.6.4
index 2c081c52c709..6de642f36e0b 100644
--- a/metadata/md5-cache/net-misc/networkmanager-0.9.6.4
+++ b/metadata/md5-cache/net-misc/networkmanager-0.9.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare pretend setup test
-DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 virtual/udev[gudev] >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 >=net-libs/libsoup-2.26:2.4= >=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[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( dev-libs/libnl:1.1= >=net-wireless/wimax-1.5.1 ) !wimax? ( dev-libs/libnl:3= ) virtual/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 doc? ( >=dev-util/gtk-doc-1.8 ) vala? ( || ( dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) !wimax? ( !=dev-libs/libnl-3.2.20 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
+DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 virtual/udev[gudev] >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 >=net-libs/libsoup-2.26:2.4= >=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[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( dev-libs/libnl:1.1= >=net-wireless/wimax-1.5.1 ) !wimax? ( dev-libs/libnl:3= ) virtual/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 doc? ( >=dev-util/gtk-doc-1.8 ) vala? ( || ( dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) !wimax? ( !=dev-libs/libnl-3.2.20 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=Universal network configuration daemon for laptops, desktops, servers and virtualization hosts
 EAPI=5
 HOMEPAGE=http://www.gnome.org/projects/NetworkManager/
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 virtual/udev[gudev] >=dev-
 REQUIRED_USE=modemmanager? ( ppp ) ^^ ( nss gnutls ) ^^ ( dhclient dhcpcd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/0.9/NetworkManager-0.9.6.4.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aae17903051f8ecddfb9b7464bbb1698
diff --git a/metadata/md5-cache/net-misc/networkmanager-0.9.6.4-r1 b/metadata/md5-cache/net-misc/networkmanager-0.9.6.4-r1
index 939a4acbc400..a5280777024e 100644
--- a/metadata/md5-cache/net-misc/networkmanager-0.9.6.4-r1
+++ b/metadata/md5-cache/net-misc/networkmanager-0.9.6.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare pretend setup test
-DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 virtual/udev[gudev] >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 >=net-libs/libsoup-2.26:2.4= >=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[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( dev-libs/libnl:1.1= >=net-wireless/wimax-1.5.1 ) !wimax? ( dev-libs/libnl:3= ) virtual/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 doc? ( >=dev-util/gtk-doc-1.8 ) vala? ( || ( dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) !wimax? ( !=dev-libs/libnl-3.2.20 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
+DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 virtual/udev[gudev] >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 >=net-libs/libsoup-2.26:2.4= >=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[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( dev-libs/libnl:1.1= >=net-wireless/wimax-1.5.1 ) !wimax? ( dev-libs/libnl:3= ) virtual/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 doc? ( >=dev-util/gtk-doc-1.8 ) vala? ( || ( dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) !wimax? ( !=dev-libs/libnl-3.2.20 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=Universal network configuration daemon for laptops, desktops, servers and virtualization hosts
 EAPI=5
 HOMEPAGE=http://www.gnome.org/projects/NetworkManager/
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 virtual/udev[gudev] >=dev-
 REQUIRED_USE=modemmanager? ( ppp ) ^^ ( nss gnutls ) ^^ ( dhclient dhcpcd ) ?? ( consolekit systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/0.9/NetworkManager-0.9.6.4.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a2ef8ffcac38310a84cd9a68c8fc24bb
diff --git a/metadata/md5-cache/net-misc/networkmanager-9999 b/metadata/md5-cache/net-misc/networkmanager-9999
index 16362c73c4e1..703e85e89c9e 100644
--- a/metadata/md5-cache/net-misc/networkmanager-9999
+++ b/metadata/md5-cache/net-misc/networkmanager-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare pretend setup test unpack
-DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 >=dev-libs/glib-2.30 >=dev-libs/libnl-3.2.7:3= >=sys-auth/polkit-0.106 >=net-libs/libsoup-2.26:2.4= >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] >=virtual/udev-165[gudev] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi:=[autoipd] ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.990 ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( =net-misc/dhcp-4*[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183 ) !systemd? ( sys-power/upower ) >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.8 ) vala? ( || ( dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) test? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) dev-libs/vala-common dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git app-arch/xz-utils virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
+DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 >=dev-libs/glib-2.30 >=dev-libs/libnl-3.2.7:3= >=sys-auth/polkit-0.106 >=net-libs/libsoup-2.26:2.4= >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] >=virtual/udev-165[gudev] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi:=[autoipd] ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.990 ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( =net-misc/dhcp-4*[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183 ) !systemd? ( sys-power/upower ) >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.8 ) vala? ( || ( dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) test? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) dev-libs/vala-common dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git app-arch/xz-utils virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
 DESCRIPTION=Universal network configuration daemon for laptops, desktops, servers and virtualization hosts
 EAPI=5
 HOMEPAGE=http://www.gnome.org/projects/NetworkManager/
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 >=dev-libs/glib-2.30 >=dev-libs/libnl-3.2.7:3= >=sys-auth/polkit-0.106 >=net-libs/libsoup-2.26:2.4= >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] >=virtual/udev-165[gudev] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi:=[autoipd] ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.990 ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( =net-misc/dhcp-4*[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183 ) !systemd? ( sys-power/upower ) consolekit? ( sys-auth/consolekit )
 REQUIRED_USE=modemmanager? ( ppp ) ^^ ( nss gnutls ) ^^ ( dhclient dhcpcd ) ?? ( consolekit systemd )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=5885fe57446f64da5b7e660aed91c264
diff --git a/metadata/md5-cache/net-misc/npapi-sdk-0.27 b/metadata/md5-cache/net-misc/npapi-sdk-0.27
index e45346199bad..2e91b68110e8 100644
--- a/metadata/md5-cache/net-misc/npapi-sdk-0.27
+++ b/metadata/md5-cache/net-misc/npapi-sdk-0.27
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=MPL-1.1
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/npapi-sdk/downloads/npapi-sdk-0.27.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=43b8844efe46ee6f61135091e288d4cf
diff --git a/metadata/md5-cache/net-misc/npapi-sdk-0.27.2 b/metadata/md5-cache/net-misc/npapi-sdk-0.27.2
index 6434f51bffd3..dbb82b17a0de 100644
--- a/metadata/md5-cache/net-misc/npapi-sdk-0.27.2
+++ b/metadata/md5-cache/net-misc/npapi-sdk-0.27.2
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=MPL-1.1
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/npapi-sdk/downloads/npapi-sdk-0.27.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=faae189f2b7e4b2eff496b7db70ca7ea
diff --git a/metadata/md5-cache/net-misc/npapi-sdk-9999 b/metadata/md5-cache/net-misc/npapi-sdk-9999
index c03dc21b5d34..4bc182a6a964 100644
--- a/metadata/md5-cache/net-misc/npapi-sdk-9999
+++ b/metadata/md5-cache/net-misc/npapi-sdk-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/pkgconfig dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NPAPI headers bundle
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/npapi-sdk/
 LICENSE=MPL-1.1
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f67077cfa10d963f1481319748bef7fa
diff --git a/metadata/md5-cache/net-misc/nx-3.5.0.14-r1 b/metadata/md5-cache/net-misc/nx-3.5.0.14-r1
index 727994124bc3..3be44999b017 100644
--- a/metadata/md5-cache/net-misc/nx-3.5.0.14-r1
+++ b/metadata/md5-cache/net-misc/nx-3.5.0.14-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) >=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NX compression technology core libraries
 EAPI=4
 HOMEPAGE=http://www.nomachine.com/developers.php http://www.x2go.org/doku.php/wiki:libs:nx-libs
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) >=media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/nx-libs/nx-libs-3.5.0.14-full.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5ec82ab9dd0238a3f62eb10a933d0610
diff --git a/metadata/md5-cache/net-misc/nx-3.5.0.15 b/metadata/md5-cache/net-misc/nx-3.5.0.15
index d0c71f50382c..feff4dda48fe 100644
--- a/metadata/md5-cache/net-misc/nx-3.5.0.15
+++ b/metadata/md5-cache/net-misc/nx-3.5.0.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) >=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NX compression technology core libraries
 EAPI=4
 HOMEPAGE=http://www.nomachine.com/developers.php http://www.x2go.org/doku.php/wiki:libs:nx-libs
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) >=media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/nx-libs/nx-libs-3.5.0.15-full.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2848e38ac70aed501323617c088e3190
diff --git a/metadata/md5-cache/net-misc/nx-3.5.0.16 b/metadata/md5-cache/net-misc/nx-3.5.0.16
index 8c59cd068844..c7907a83d3b3 100644
--- a/metadata/md5-cache/net-misc/nx-3.5.0.16
+++ b/metadata/md5-cache/net-misc/nx-3.5.0.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) >=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NX compression technology core libraries
 EAPI=4
 HOMEPAGE=http://www.nomachine.com/developers.php http://www.x2go.org/doku.php/wiki:libs:nx-libs
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) >=media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/nx-libs/nx-libs-3.5.0.16-full.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d3c97a881bdd1aded0937fb0803ee82f
diff --git a/metadata/md5-cache/net-misc/nx-3.5.0.17 b/metadata/md5-cache/net-misc/nx-3.5.0.17
index 9dd40fa7c27c..43be966ba96b 100644
--- a/metadata/md5-cache/net-misc/nx-3.5.0.17
+++ b/metadata/md5-cache/net-misc/nx-3.5.0.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) >=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NX compression technology core libraries
 EAPI=4
 HOMEPAGE=http://www.nomachine.com/developers.php http://www.x2go.org/doku.php/wiki:libs:nx-libs
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) >=media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/nx-libs/nx-libs-3.5.0.17-full.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b9dd9163ae1f4c6bcc1fe88cc4a05165
diff --git a/metadata/md5-cache/net-misc/nx-3.5.0.17-r1 b/metadata/md5-cache/net-misc/nx-3.5.0.17-r1
index b3a7055ee28d..bc46d8d83535 100644
--- a/metadata/md5-cache/net-misc/nx-3.5.0.17-r1
+++ b/metadata/md5-cache/net-misc/nx-3.5.0.17-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) >=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NX compression technology core libraries
 EAPI=4
 HOMEPAGE=http://www.nomachine.com/developers.php http://www.x2go.org/doku.php/wiki:libs:nx-libs
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) >=media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/nx-libs/nx-libs-3.5.0.17-full.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7ecb2ad9479b76b3c33481b18fe28a8f
diff --git a/metadata/md5-cache/net-misc/nx-3.5.0.20 b/metadata/md5-cache/net-misc/nx-3.5.0.20
index f4f0b75d5aab..ea01a2c847fd 100644
--- a/metadata/md5-cache/net-misc/nx-3.5.0.20
+++ b/metadata/md5-cache/net-misc/nx-3.5.0.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) >=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NX compression technology core libraries
 EAPI=4
 HOMEPAGE=http://www.nomachine.com/developers.php http://www.x2go.org/doku.php/wiki:libs:nx-libs
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) >=media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/nx-libs/nx-libs-3.5.0.20-full.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1302224d8f7cbc0f99ce1c0742073735
diff --git a/metadata/md5-cache/net-misc/nxcl-0.9-r1 b/metadata/md5-cache/net-misc/nxcl-0.9-r1
index 96adf14681a9..6cb1f2370ead 100644
--- a/metadata/md5-cache/net-misc/nxcl-0.9-r1
+++ b/metadata/md5-cache/net-misc/nxcl-0.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=net-misc/nx-3.2.0-r5 dbus? ( sys-apps/dbus ) nxclient? ( net-misc/nxclient ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-misc/nx-3.2.0-r5 dbus? ( sys-apps/dbus ) nxclient? ( net-misc/nxclient ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for building NX clients
 HOMEPAGE=http://developer.berlios.de/projects/freenx/
 IUSE=dbus doc nxclient
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-misc/nx-3.2.0-r5 dbus? ( sys-apps/dbus ) nxclient? ( net-misc/nxclient )
 SLOT=0
 SRC_URI=mirror://berlios/freenx/freenx-client-0.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=038306078c39a4e4d0e641f86c372e00
diff --git a/metadata/md5-cache/net-misc/nxcl-0.9-r2 b/metadata/md5-cache/net-misc/nxcl-0.9-r2
index 2da65f7d0638..5c3f126b4553 100644
--- a/metadata/md5-cache/net-misc/nxcl-0.9-r2
+++ b/metadata/md5-cache/net-misc/nxcl-0.9-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=net-misc/nx-3.2.0-r5 dbus? ( sys-apps/dbus ) nxclient? ( net-misc/nxclient ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-misc/nx-3.2.0-r5 dbus? ( sys-apps/dbus ) nxclient? ( net-misc/nxclient ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for building NX clients
 EAPI=4
 HOMEPAGE=http://developer.berlios.de/projects/freenx/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-misc/nx-3.2.0-r5 dbus? ( sys-apps/dbus ) nxclient? ( net-misc/nxclient )
 SLOT=0
 SRC_URI=mirror://berlios/freenx/freenx-client-0.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c6e54355580af8a46875b3cee7e7294c
diff --git a/metadata/md5-cache/net-misc/nxsadmin-0.2.1 b/metadata/md5-cache/net-misc/nxsadmin-0.2.1
index da5f875c8934..81fc0abb2e71 100644
--- a/metadata/md5-cache/net-misc/nxsadmin-0.2.1
+++ b/metadata/md5-cache/net-misc/nxsadmin-0.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=dev-cpp/gtkmm:2.4 dev-util/intltool || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-cpp/gtkmm:2.4 dev-util/intltool || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=graphical tool for management of active NX sessions on FreeNX server
 EAPI=1
 HOMEPAGE=http://developer.berlios.de/projects/nxsadmin/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/gtkmm:2.4 net-misc/nxserver-freenx
 SLOT=0
 SRC_URI=mirror://berlios/nxsadmin/nxsadmin-0.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=c0e053577498740a5bc80bd6ca6d999c
diff --git a/metadata/md5-cache/net-misc/openntpd-20080406 b/metadata/md5-cache/net-misc/openntpd-20080406
index 92cd020e3f35..b5e1e8c52bfe 100644
--- a/metadata/md5-cache/net-misc/openntpd-20080406
+++ b/metadata/md5-cache/net-misc/openntpd-20080406
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Lightweight NTP server ported from OpenBSD
 EAPI=5
 HOMEPAGE=http://www.openntpd.org/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) !<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/openntpd/openntpd_20080406p.orig.tar.gz mirror://debian/pool/main/o/openntpd/openntpd_20080406p-4.debian.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=608985cf54f1b8d68bc5fb751b5d0179
diff --git a/metadata/md5-cache/net-misc/openntpd-3.9_p1-r3 b/metadata/md5-cache/net-misc/openntpd-3.9_p1-r3
index ab25121e7f08..b5b4cc1af286 100644
--- a/metadata/md5-cache/net-misc/openntpd-3.9_p1-r3
+++ b/metadata/md5-cache/net-misc/openntpd-3.9_p1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) !<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) !<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Lightweight NTP server ported from OpenBSD
 EAPI=2
 HOMEPAGE=http://www.openntpd.org/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) !<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd]
 SLOT=0
 SRC_URI=mirror://openbsd/OpenNTPD/openntpd-3.9p1.tar.gz mirror://debian/pool/main/o/openntpd/openntpd_3.9p1+debian-8.debian.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0de87cf3af1b33a20a8dd4f6d4ab7511
diff --git a/metadata/md5-cache/net-misc/openntpd-3.9_p1-r4 b/metadata/md5-cache/net-misc/openntpd-3.9_p1-r4
index 62d64cac8ab8..f5f1ffb6aabb 100644
--- a/metadata/md5-cache/net-misc/openntpd-3.9_p1-r4
+++ b/metadata/md5-cache/net-misc/openntpd-3.9_p1-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Lightweight NTP server ported from OpenBSD
 EAPI=2
 HOMEPAGE=http://www.openntpd.org/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) !<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd]
 SLOT=0
 SRC_URI=mirror://openbsd/OpenNTPD/openntpd-3.9p1.tar.gz mirror://debian/pool/main/o/openntpd/openntpd_3.9p1+debian-8.debian.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2207f4dcd055a451d61cb50a714d517c
diff --git a/metadata/md5-cache/net-misc/openntpd-3.9_p1-r5 b/metadata/md5-cache/net-misc/openntpd-3.9_p1-r5
index aa4e0ccf6eb0..b74361b8cffb 100644
--- a/metadata/md5-cache/net-misc/openntpd-3.9_p1-r5
+++ b/metadata/md5-cache/net-misc/openntpd-3.9_p1-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Lightweight NTP server ported from OpenBSD
 EAPI=5
 HOMEPAGE=http://www.openntpd.org/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) !<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd]
 SLOT=0
 SRC_URI=mirror://openbsd/OpenNTPD/openntpd-3.9p1.tar.gz mirror://debian/pool/main/o/openntpd/openntpd_3.9p1+debian-8.debian.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=549812e1e321f4f440ee8c5dac6aed38
diff --git a/metadata/md5-cache/net-misc/openr2-1.3.0 b/metadata/md5-cache/net-misc/openr2-1.3.0
index 17214ed5f0d6..c70c8bae036a 100644
--- a/metadata/md5-cache/net-misc/openr2-1.3.0
+++ b/metadata/md5-cache/net-misc/openr2-1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An open implementation of the MFC/R2 telephony signaling protocol.
 EAPI=3
 HOMEPAGE=http://libopenr2.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/dahdi
 SLOT=0
 SRC_URI=http://openr2.googlecode.com/files/openr2-1.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=11686b4486fa9cbe6f84308b3566daf5
diff --git a/metadata/md5-cache/net-misc/openrdate-1.1.3 b/metadata/md5-cache/net-misc/openrdate-1.1.3
index ceef29825ea4..c61b03bab873 100644
--- a/metadata/md5-cache/net-misc/openrdate-1.1.3
+++ b/metadata/md5-cache/net-misc/openrdate-1.1.3
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=use TCP or UDP to retrieve the current time of another machine
 HOMEPAGE=http://sourceforge.net/projects/openrdate/
 KEYWORDS=~x86 ~amd64 ~ppc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/openrdate/openrdate-1.1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cdfb1ab03a7965a36d2c1091e1f94ab9
diff --git a/metadata/md5-cache/net-misc/openrdate-1.2 b/metadata/md5-cache/net-misc/openrdate-1.2
index 823f2f4e01ed..81985c451512 100644
--- a/metadata/md5-cache/net-misc/openrdate-1.2
+++ b/metadata/md5-cache/net-misc/openrdate-1.2
@@ -6,5 +6,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/openrdate/openrdate-1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b7b94a0298897740f213b169b1ff06d7
diff --git a/metadata/md5-cache/net-misc/openssh-5.9_p1-r4 b/metadata/md5-cache/net-misc/openssh-5.9_p1-r4
index 1bd739d8d9dd..cd2ebb071031 100644
--- a/metadata/md5-cache/net-misc/openssh-5.9_p1-r4
+++ b/metadata/md5-cache/net-misc/openssh-5.9_p1-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=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:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=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:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Port of OpenBSD's free SSH release
 EAPI=2
 HOMEPAGE=http://www.openssh.org/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=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:0[bindist=] >=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 )
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2534fb7044f29e90353b7f59ecb5bf77
diff --git a/metadata/md5-cache/net-misc/openssh-6.0_p1 b/metadata/md5-cache/net-misc/openssh-6.0_p1
index 108b40b36099..f22ac6e51af9 100644
--- a/metadata/md5-cache/net-misc/openssh-6.0_p1
+++ b/metadata/md5-cache/net-misc/openssh-6.0_p1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=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:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=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:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Port of OpenBSD's free SSH release
 EAPI=2
 HOMEPAGE=http://www.openssh.org/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=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:0[bindist=] >=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 )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-6.0p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-6.0p1-hpn13v12.diff.gz mirror://gentoo/openssh-6.0p1-hpn13v12.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-6.0p1-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-7.1/openssh-6.0p1+x509-7.1.diff.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=38f4c93aa9f4da53dc7d54b8bc31be6a
diff --git a/metadata/md5-cache/net-misc/openssh-6.0_p1-r1 b/metadata/md5-cache/net-misc/openssh-6.0_p1-r1
index c27de5268cf8..9dc23ee29b27 100644
--- a/metadata/md5-cache/net-misc/openssh-6.0_p1-r1
+++ b/metadata/md5-cache/net-misc/openssh-6.0_p1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=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:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=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:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Port of OpenBSD's free SSH release
 EAPI=2
 HOMEPAGE=http://www.openssh.org/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=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:0[bindist=] >=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 )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-6.0p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-6.0p1-hpn13v11.diff.bz2 mirror://gentoo/openssh-6.0p1-hpn13v11.diff.bz2 ) ldap? ( mirror://gentoo/openssh-lpk-6.0p1-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-7.1/openssh-6.0p1+x509-7.1.diff.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9063060759ddfc86e33b108f87acb8bc
diff --git a/metadata/md5-cache/net-misc/openssh-6.1_p1 b/metadata/md5-cache/net-misc/openssh-6.1_p1
index c84571d783c2..ba020c7794da 100644
--- a/metadata/md5-cache/net-misc/openssh-6.1_p1
+++ b/metadata/md5-cache/net-misc/openssh-6.1_p1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=!static? ( selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] dev-libs/openssl >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) libedit? ( dev-libs/libedit[static-libs(+)] ) >=dev-libs/openssl-0.9.6d:0[bindist=] dev-libs/openssl[static-libs(+)] >=sys-libs/zlib-1.2.3[static-libs(+)] tcpd? ( >=sys-apps/tcp-wrappers-7.6[static-libs(+)] ) ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=!static? ( selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] dev-libs/openssl >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) libedit? ( dev-libs/libedit[static-libs(+)] ) >=dev-libs/openssl-0.9.6d:0[bindist=] dev-libs/openssl[static-libs(+)] >=sys-libs/zlib-1.2.3[static-libs(+)] tcpd? ( >=sys-apps/tcp-wrappers-7.6[static-libs(+)] ) ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Port of OpenBSD's free SSH release
 EAPI=4
 HOMEPAGE=http://www.openssh.org/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=!static? ( selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] dev-libs/openssl >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-6.1p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-6.1p1-hpn13v11.diff.bz2 mirror://gentoo/openssh-6.1p1-hpn13v11.diff.bz2 ) ldap? ( mirror://gentoo/openssh-lpk-6.1p1-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-7.2.1/openssh-6.1p1+x509-7.2.1.diff.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b6ae7e5034011c4787ce9bbf113d965c
diff --git a/metadata/md5-cache/net-misc/openssh-6.1_p1-r1 b/metadata/md5-cache/net-misc/openssh-6.1_p1-r1
index 47cf3a239553..8d0cad14c2bc 100644
--- a/metadata/md5-cache/net-misc/openssh-6.1_p1-r1
+++ b/metadata/md5-cache/net-misc/openssh-6.1_p1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=!static? ( selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] dev-libs/openssl >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) ldns? ( !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) libedit? ( dev-libs/libedit[static-libs(+)] ) >=dev-libs/openssl-0.9.6d:0[bindist=] dev-libs/openssl[static-libs(+)] >=sys-libs/zlib-1.2.3[static-libs(+)] tcpd? ( >=sys-apps/tcp-wrappers-7.6[static-libs(+)] ) ldns? ( !bindist? ( net-libs/ldns[ecdsa,ssl,static-libs(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl,static-libs(+)] ) ) ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=!static? ( selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] dev-libs/openssl >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) ldns? ( !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) libedit? ( dev-libs/libedit[static-libs(+)] ) >=dev-libs/openssl-0.9.6d:0[bindist=] dev-libs/openssl[static-libs(+)] >=sys-libs/zlib-1.2.3[static-libs(+)] tcpd? ( >=sys-apps/tcp-wrappers-7.6[static-libs(+)] ) ldns? ( !bindist? ( net-libs/ldns[ecdsa,ssl,static-libs(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl,static-libs(+)] ) ) ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Port of OpenBSD's free SSH release
 EAPI=4
 HOMEPAGE=http://www.openssh.org/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=!static? ( selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] dev-libs/openssl >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) ldns? ( !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-6.1p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-6.1p1-hpn13v11.diff.bz2 mirror://gentoo/openssh-6.1p1-hpn13v11.diff.bz2 ) ldap? ( mirror://gentoo/openssh-lpk-6.1p1-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-7.2.1/openssh-6.1p1+x509-7.2.1.diff.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cda184bd9f782c301910dbd519450f0c
diff --git a/metadata/md5-cache/net-misc/openssh-6.2_p1 b/metadata/md5-cache/net-misc/openssh-6.2_p1
index 3ed5a1c055aa..e5d8152422a0 100644
--- a/metadata/md5-cache/net-misc/openssh-6.2_p1
+++ b/metadata/md5-cache/net-misc/openssh-6.2_p1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=!static? ( selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] dev-libs/openssl >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) ldns? ( !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) libedit? ( dev-libs/libedit[static-libs(+)] ) >=dev-libs/openssl-0.9.6d:0[bindist=] dev-libs/openssl[static-libs(+)] >=sys-libs/zlib-1.2.3[static-libs(+)] tcpd? ( >=sys-apps/tcp-wrappers-7.6[static-libs(+)] ) ldns? ( !bindist? ( net-libs/ldns[ecdsa,ssl,static-libs(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl,static-libs(+)] ) ) ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=!static? ( selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] dev-libs/openssl >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) ldns? ( !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) libedit? ( dev-libs/libedit[static-libs(+)] ) >=dev-libs/openssl-0.9.6d:0[bindist=] dev-libs/openssl[static-libs(+)] >=sys-libs/zlib-1.2.3[static-libs(+)] tcpd? ( >=sys-apps/tcp-wrappers-7.6[static-libs(+)] ) ldns? ( !bindist? ( net-libs/ldns[ecdsa,ssl,static-libs(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl,static-libs(+)] ) ) ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Port of OpenBSD's free SSH release
 EAPI=4
 HOMEPAGE=http://www.openssh.org/
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2
 RDEPEND=!static? ( selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] dev-libs/openssl >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) ldns? ( !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-6.2p1.tar.gz hpn? ( mirror://gentoo/openssh-6.1p1-hpn13v14.diff.bz2 ) X509? ( http://roumenpetrov.info/openssh/x509-7.4.1/openssh-6.2p1+x509-7.4.1.diff.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cd78b760f33b058421f1b1911aa072c1
diff --git a/metadata/md5-cache/net-misc/openvpn-2.3.0 b/metadata/md5-cache/net-misc/openvpn-2.3.0
index 086425c018f1..40a53cf90a03 100644
--- a/metadata/md5-cache/net-misc/openvpn-2.3.0
+++ b/metadata/md5-cache/net-misc/openvpn-2.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.7 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.7 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Robust and highly flexible tunneling application compatible with many OSes
 EAPI=4
 HOMEPAGE=http://openvpn.net/
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( s
 REQUIRED_USE=static? ( !plugins !pkcs11 ) !plugins? ( !pam !down-root )
 SLOT=0
 SRC_URI=http://swupdate.openvpn.net/community/releases/openvpn-2.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=90d4c0b2bfd0fdec9f94725fd8d5e7f5
diff --git a/metadata/md5-cache/net-misc/openvpn-9999 b/metadata/md5-cache/net-misc/openvpn-9999
index 0fd1d5165f15..023f03266806 100644
--- a/metadata/md5-cache/net-misc/openvpn-9999
+++ b/metadata/md5-cache/net-misc/openvpn-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.7 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.7 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Robust and highly flexible tunneling application compatible with many OSes
 EAPI=4
 HOMEPAGE=http://openvpn.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.7 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )
 REQUIRED_USE=static? ( !plugins !pkcs11 ) !plugins? ( !pam !down-root )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ef3086b5e650ed6e476cefb7123cb4f0
diff --git a/metadata/md5-cache/net-misc/packETH-1.7.1 b/metadata/md5-cache/net-misc/packETH-1.7.1
index cfdb0d83c805..723f1011b855 100644
--- a/metadata/md5-cache/net-misc/packETH-1.7.1
+++ b/metadata/md5-cache/net-misc/packETH-1.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=virtual/pkgconfig x11-libs/gtk+:2 x11-libs/gdk-pixbuf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig x11-libs/gtk+:2 x11-libs/gdk-pixbuf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Packet generator tool for ethernet
 EAPI=2
 HOMEPAGE=http://packeth.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:2 x11-libs/gdk-pixbuf
 SLOT=0
 SRC_URI=mirror://sourceforge/packeth/packETH-1.7.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6c7a961a5fe6910d1268637d330f5bb2
diff --git a/metadata/md5-cache/net-misc/packETH-1.7.2 b/metadata/md5-cache/net-misc/packETH-1.7.2
index 55a4b87f3141..bd4e7e8b4440 100644
--- a/metadata/md5-cache/net-misc/packETH-1.7.2
+++ b/metadata/md5-cache/net-misc/packETH-1.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=virtual/pkgconfig dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Packet generator tool for ethernet
 EAPI=4
 HOMEPAGE=http://packeth.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/packeth/packETH-1.7.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=2d06a6bba52a9bbdf5cdfd56b6050cba
diff --git a/metadata/md5-cache/net-misc/pavuk-0.9.36_pre20120215-r2 b/metadata/md5-cache/net-misc/pavuk-0.9.36_pre20120215-r2
index c020342fd32c..4efeb45a8a39 100644
--- a/metadata/md5-cache/net-misc/pavuk-0.9.36_pre20120215-r2
+++ b/metadata/md5-cache/net-misc/pavuk-0.9.36_pre20120215-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libintl:= gtk? ( x11-libs/gtk+:2 ) pcre? ( dev-libs/libpcre:= ) ssl? ( dev-libs/openssl:= ) >=sys-apps/sed-4 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/libintl:= gtk? ( x11-libs/gtk+:2 ) pcre? ( dev-libs/libpcre:= ) ssl? ( dev-libs/openssl:= ) >=sys-apps/sed-4 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Web spider and website mirroring tool
 EAPI=5
 HOMEPAGE=http://www.pavuk.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libintl:= gtk? ( x11-libs/gtk+:2 ) pcre? ( dev-libs/libpcre:= ) ssl? ( dev-libs/openssl:= )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pacho/maintainer-needed/pavuk-0.9.36_pre20120215.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=abda28c1df112f9e12ee1da72112d3bd
diff --git a/metadata/md5-cache/net-misc/portfwd-0.28 b/metadata/md5-cache/net-misc/portfwd-0.28
index 94c3d75810b7..bd6fb92f09de 100644
--- a/metadata/md5-cache/net-misc/portfwd-0.28
+++ b/metadata/md5-cache/net-misc/portfwd-0.28
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ia64 ~ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/portfwd/portfwd-0.28.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ec0be033a37daa342185c77b24be91fb
diff --git a/metadata/md5-cache/net-misc/proxychains-3.1_p20110225-r1 b/metadata/md5-cache/net-misc/proxychains-3.1_p20110225-r1
index bac86c0363df..d1e4175fef65 100644
--- a/metadata/md5-cache/net-misc/proxychains-3.1_p20110225-r1
+++ b/metadata/md5-cache/net-misc/proxychains-3.1_p20110225-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/xz-utils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/xz-utils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=force any tcp connections to flow through a proxy (or proxy chain)
 EAPI=4
 HOMEPAGE=http://proxychains.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-dns/bind-tools
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~radhermit/distfiles/proxychains-3.1_p20110225.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b228c83a2f68f040c19bd15f640b00b9
diff --git a/metadata/md5-cache/net-misc/putty-0.62 b/metadata/md5-cache/net-misc/putty-0.62
index 70da445444bb..0e4945cf0a35 100644
--- a/metadata/md5-cache/net-misc/putty-0.62
+++ b/metadata/md5-cache/net-misc/putty-0.62
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=!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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=UNIX port of the famous Telnet and SSH client
 EAPI=4
 HOMEPAGE=http://www.chiark.greenend.org.uk/~sgtatham/putty/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!net-misc/pssh dev-libs/glib kerberos? ( virtual/krb5 ) x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango
 SLOT=0
 SRC_URI=http://the.earth.li/~sgtatham/putty/latest/putty-0.62.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ac1e606c5facecd1a8630aeaf318f161
diff --git a/metadata/md5-cache/net-misc/putty-0.62.20120823 b/metadata/md5-cache/net-misc/putty-0.62.20120823
index 954638ce1162..75765bd6faf7 100644
--- a/metadata/md5-cache/net-misc/putty-0.62.20120823
+++ b/metadata/md5-cache/net-misc/putty-0.62.20120823
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=!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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=UNIX port of the famous Telnet and SSH client
 EAPI=4
 HOMEPAGE=http://www.chiark.greenend.org.uk/~sgtatham/putty/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!net-misc/pssh dev-libs/glib kerberos? ( virtual/krb5 ) x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango
 SLOT=0
 SRC_URI=http://tartarus.org/~simon/putty-snapshots/putty-0.62-2012-08-23.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e18660e07e2e9250143f7c7662f59b35
diff --git a/metadata/md5-cache/net-misc/quagga-0.99.20 b/metadata/md5-cache/net-misc/quagga-0.99.20
index d9b7e8f018d3..850cd51de84e 100644
--- a/metadata/md5-cache/net-misc/quagga-0.99.20
+++ b/metadata/md5-cache/net-misc/quagga-0.99.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free routing daemon replacing Zebra supporting RIP, OSPF and BGP.
 EAPI=4
 HOMEPAGE=http://quagga.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d3e026a6cff8f2ad3e9cab9a28295693
diff --git a/metadata/md5-cache/net-misc/quagga-0.99.20-r1 b/metadata/md5-cache/net-misc/quagga-0.99.20-r1
index bc958d9d271c..cb4e32e95ee6 100644
--- a/metadata/md5-cache/net-misc/quagga-0.99.20-r1
+++ b/metadata/md5-cache/net-misc/quagga-0.99.20-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free routing daemon replacing Zebra supporting RIP, OSPF and BGP.
 EAPI=4
 HOMEPAGE=http://quagga.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bffb16ed95db6e743d2a66ee46c57032
diff --git a/metadata/md5-cache/net-misc/quagga-0.99.21 b/metadata/md5-cache/net-misc/quagga-0.99.21
index f8712fad626b..3d5499519f4c 100644
--- a/metadata/md5-cache/net-misc/quagga-0.99.21
+++ b/metadata/md5-cache/net-misc/quagga-0.99.21
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free routing daemon replacing Zebra supporting RIP, OSPF and BGP
 EAPI=4
 HOMEPAGE=http://quagga.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=mirror://nongnu/quagga/quagga-0.99.21.tar.xz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b872724ad0264026b600b9f3b028e42c
diff --git a/metadata/md5-cache/net-misc/quagga-0.99.22 b/metadata/md5-cache/net-misc/quagga-0.99.22
index d103775fee82..dec2d96e62f5 100644
--- a/metadata/md5-cache/net-misc/quagga-0.99.22
+++ b/metadata/md5-cache/net-misc/quagga-0.99.22
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free routing daemon replacing Zebra supporting RIP, OSPF and BGP
 EAPI=5
 HOMEPAGE=http://quagga.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=mirror://nongnu/quagga/quagga-0.99.22.tar.xz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c92444f51938e157fe81e7a4e6fb9ca5
diff --git a/metadata/md5-cache/net-misc/quagga-0.99.22.1 b/metadata/md5-cache/net-misc/quagga-0.99.22.1
new file mode 100644
index 000000000000..0957cd13ad01
--- /dev/null
+++ b/metadata/md5-cache/net-misc/quagga-0.99.22.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A free routing daemon replacing Zebra supporting RIP, OSPF and BGP
+EAPI=5
+HOMEPAGE=http://quagga.net/
+IUSE=bgpclassless caps doc elibc_glibc ipv6 multipath ospfapi pam +readline snmp tcp-zebra
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=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
+SLOT=0
+SRC_URI=mirror://nongnu/quagga/quagga-0.99.22.1.tar.xz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4e8d69be412bb07ae6c20fb30a769290
diff --git a/metadata/md5-cache/net-misc/radvd-1.9.2-r1 b/metadata/md5-cache/net-misc/radvd-1.9.2-r1
index 22ca895a4cfc..7a4b17273f67 100644
--- a/metadata/md5-cache/net-misc/radvd-1.9.2-r1
+++ b/metadata/md5-cache/net-misc/radvd-1.9.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd ) sys-devel/bison sys-devel/flex virtual/pkgconfig virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd ) sys-devel/bison sys-devel/flex virtual/pkgconfig virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Linux IPv6 Router Advertisement Daemon
 EAPI=4
 HOMEPAGE=http://v6web.litech.org/radvd/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-1.9.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=69d3d6786fa939b13b48d8dbf92e4e1c
diff --git a/metadata/md5-cache/net-misc/rancid-2.3.8 b/metadata/md5-cache/net-misc/rancid-2.3.8
index 485ff0d791fc..0a6f880ab5f3 100644
--- a/metadata/md5-cache/net-misc/rancid-2.3.8
+++ b/metadata/md5-cache/net-misc/rancid-2.3.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=dev-lang/perl dev-lang/tcl dev-tcltk/expect sys-apps/diffutils cvs? ( dev-vcs/cvs ) subversion? ( dev-vcs/subversion ) || ( net-misc/netkit-telnetd net-misc/telnet-bsd ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl dev-lang/tcl dev-tcltk/expect sys-apps/diffutils cvs? ( dev-vcs/cvs ) subversion? ( dev-vcs/subversion ) || ( net-misc/netkit-telnetd net-misc/telnet-bsd ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Really Awesome New Cisco confIg Differ
 EAPI=4
 HOMEPAGE=http://www.shrubbery.net/rancid/
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( cvs subversion )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=ftp://ftp.shrubbery.net/pub/rancid/rancid-2.3.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f2193a54cdd665c61aee603fef26e3fd
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.7.0 b/metadata/md5-cache/net-misc/rdesktop-1.7.0
index ee68c74c9496..e3f1d7437d2b 100644
--- a/metadata/md5-cache/net-misc/rdesktop-1.7.0
+++ b/metadata/md5-cache/net-misc/rdesktop-1.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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 ) virtual/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Remote Desktop Protocol Client
 EAPI=2
 HOMEPAGE=http://rdesktop.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/rdesktop/rdesktop-1.7.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4c715c71a9045a89f7a6ae87b65e5f53
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.7.0-r1 b/metadata/md5-cache/net-misc/rdesktop-1.7.0-r1
index bf51eb0252ca..19a5d291410e 100644
--- a/metadata/md5-cache/net-misc/rdesktop-1.7.0-r1
+++ b/metadata/md5-cache/net-misc/rdesktop-1.7.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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 ) virtual/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Remote Desktop Protocol Client
 EAPI=4
 HOMEPAGE=http://rdesktop.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/rdesktop/rdesktop-1.7.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d44da4a21cf342b0f08ba957deb855aa
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.7.1 b/metadata/md5-cache/net-misc/rdesktop-1.7.1
index cbac86f2ddd0..9c11b763f45b 100644
--- a/metadata/md5-cache/net-misc/rdesktop-1.7.1
+++ b/metadata/md5-cache/net-misc/rdesktop-1.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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 ) virtual/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Remote Desktop Protocol Client
 EAPI=4
 HOMEPAGE=http://rdesktop.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/rdesktop/rdesktop-1.7.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c1da881b06bd886f8b9bec6155f71af4
diff --git a/metadata/md5-cache/net-misc/rygel-0.18.1 b/metadata/md5-cache/net-misc/rygel-0.18.1
new file mode 100644
index 000000000000..e627b8336388
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rygel-0.18.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libgee-0.8:0.8 >=dev-libs/libxml2-2.7:2 >=media-libs/gupnp-dlna-0.9.4:2.0 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/gssdp-0.13 >=net-libs/gupnp-0.19 >=net-libs/gupnp-av-0.11.4 >=net-libs/libsoup-2.34:2.4 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring ) tracker? ( >=app-misc/tracker-0.14:= ) transcode? ( >=media-libs/gst-plugins-bad-0.10.14:0.10 >=media-plugins/gst-plugins-twolame-0.10.12:0.10 >=media-plugins/gst-plugins-ffmpeg-0.10.5:0.10 ) X? ( >=x11-libs/gtk+-2.90.3:3 ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Rygel is an open source UPnP/DLNA MediaServer
+EAPI=5
+HOMEPAGE=http://live.gnome.org/Rygel
+IUSE=X nls +sqlite tracker test transcode test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libgee-0.8:0.8 >=dev-libs/libxml2-2.7:2 >=media-libs/gupnp-dlna-0.9.4:2.0 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/gssdp-0.13 >=net-libs/gupnp-0.19 >=net-libs/gupnp-av-0.11.4 >=net-libs/libsoup-2.34:2.4 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring ) tracker? ( >=app-misc/tracker-0.14:= ) transcode? ( >=media-libs/gst-plugins-bad-0.10.14:0.10 >=media-plugins/gst-plugins-twolame-0.10.12:0.10 >=media-plugins/gst-plugins-ffmpeg-0.10.5:0.10 ) X? ( >=x11-libs/gtk+-2.90.3:3 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/rygel/0.18/rygel-0.18.1.tar.xz
+_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=4d35b910e1573c951dd9783a9c397ff6
diff --git a/metadata/md5-cache/net-misc/ser2net-2.7-r1 b/metadata/md5-cache/net-misc/ser2net-2.7-r1
index ef153f2b5251..8b001f925475 100644
--- a/metadata/md5-cache/net-misc/ser2net-2.7-r1
+++ b/metadata/md5-cache/net-misc/ser2net-2.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Serial To Network Proxy
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/ser2net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=mirror://sourceforge/ser2net/ser2net-2.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2099cb852af23f4bbc2008af79fbd2f2
diff --git a/metadata/md5-cache/net-misc/shigofumi-9999 b/metadata/md5-cache/net-misc/shigofumi-9999
index 5c5ecea57141..6d850e2caac8 100644
--- a/metadata/md5-cache/net-misc/shigofumi-9999
+++ b/metadata/md5-cache/net-misc/shigofumi-9999
@@ -7,5 +7,5 @@ IUSE=debug doc nls xattr
 LICENSE=GPL-3
 RDEPEND=dev-libs/confuse dev-libs/libxml2 sys-libs/readline >=net-libs/libisds-0.7
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7c66d016158ddf77280f8ee8cc5014d0
diff --git a/metadata/md5-cache/net-misc/siproxd-0.8.0-r2 b/metadata/md5-cache/net-misc/siproxd-0.8.0-r2
index cf91049caef9..e32f15314048 100644
--- a/metadata/md5-cache/net-misc/siproxd-0.8.0-r2
+++ b/metadata/md5-cache/net-misc/siproxd-0.8.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=net-libs/libosip-3.0.0 <net-libs/libosip-4.0.0 >=sys-devel/libtool-2.4 doc? ( app-text/docbook-sgml-utils app-text/docbook-sgml-dtd:4.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-libs/libosip-3.0.0 <net-libs/libosip-4.0.0 >=sys-devel/libtool-2.4 doc? ( app-text/docbook-sgml-utils app-text/docbook-sgml-dtd:4.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A proxy/masquerading daemon for the SIP protocol
 EAPI=2
 HOMEPAGE=http://siproxd.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libosip-3.0.0 <net-libs/libosip-4.0.0
 SLOT=0
 SRC_URI=mirror://sourceforge/siproxd/siproxd-0.8.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c9b4a3f5b5c8cc30ffc0992e66540ed4
diff --git a/metadata/md5-cache/net-misc/siproxd-0.8.1 b/metadata/md5-cache/net-misc/siproxd-0.8.1
index c3fa3af5023a..ac0de41da972 100644
--- a/metadata/md5-cache/net-misc/siproxd-0.8.1
+++ b/metadata/md5-cache/net-misc/siproxd-0.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=net-libs/libosip-3.0.0 <net-libs/libosip-4.0.0 >=sys-devel/libtool-2.4 doc? ( app-text/docbook-sgml-utils app-text/docbook-sgml-dtd:4.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-libs/libosip-3.0.0 <net-libs/libosip-4.0.0 >=sys-devel/libtool-2.4 doc? ( app-text/docbook-sgml-utils app-text/docbook-sgml-dtd:4.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A proxy/masquerading daemon for the SIP protocol
 EAPI=2
 HOMEPAGE=http://siproxd.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libosip-3.0.0 <net-libs/libosip-4.0.0
 SLOT=0
 SRC_URI=mirror://sourceforge/siproxd/siproxd-0.8.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b7e732d2baa48c8d54326802ffaef575
diff --git a/metadata/md5-cache/net-misc/sitecopy-0.16.3_p17 b/metadata/md5-cache/net-misc/sitecopy-0.16.3_p17
index 40d43fe66de4..7569261b150b 100644
--- a/metadata/md5-cache/net-misc/sitecopy-0.16.3_p17
+++ b/metadata/md5-cache/net-misc/sitecopy-0.16.3_p17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=sitecopy is for easily maintaining remote web sites
 EAPI=2
 HOMEPAGE=http://packages.debian.org/unstable/sitecopy http://www.lyra.org/sitecopy/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=rsh? ( net-misc/netkit-rsh ) >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] xml? ( >=net-libs/neon-0.24.6[-expat] )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7276543e37ff8604079f357aca9c6596
diff --git a/metadata/md5-cache/net-misc/sitecopy-0.16.6_p3 b/metadata/md5-cache/net-misc/sitecopy-0.16.6_p3
index 230d0fc419db..270e1b0485b1 100644
--- a/metadata/md5-cache/net-misc/sitecopy-0.16.6_p3
+++ b/metadata/md5-cache/net-misc/sitecopy-0.16.6_p3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Maintain remote web sites with ease
 EAPI=2
 HOMEPAGE=http://www.manyfish.co.uk/sitecopy/ http://packages.debian.org/unstable/sitecopy
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=rsh? ( net-misc/netkit-rsh ) >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] xml? ( >=net-libs/neon-0.24.6[-expat] )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=49df99aceffd9dd419f67729f4f5d13a
diff --git a/metadata/md5-cache/net-misc/smbc-1.2.2-r2 b/metadata/md5-cache/net-misc/smbc-1.2.2-r2
index f31fb218ae22..231861e7113f 100644
--- a/metadata/md5-cache/net-misc/smbc-1.2.2-r2
+++ b/metadata/md5-cache/net-misc/smbc-1.2.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=net-fs/samba sys-libs/ncurses dev-libs/popt nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-fs/samba sys-libs/ncurses dev-libs/popt nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A text mode (ncurses) SMB network commander. Features: resume and UTF-8
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/smbc/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-fs/samba sys-libs/ncurses dev-libs/popt nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=mirror://sourceforge/smbc/smbc-1.2.2.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ee3dabe25689df3c10c37a4327f140d8
diff --git a/metadata/md5-cache/net-misc/socat-1.7.2.1 b/metadata/md5-cache/net-misc/socat-1.7.2.1
index 61fb26d2784e..12b66d091b6b 100644
--- a/metadata/md5-cache/net-misc/socat-1.7.2.1
+++ b/metadata/md5-cache/net-misc/socat-1.7.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Multipurpose relay (SOcket CAT)
 EAPI=4
 HOMEPAGE=http://www.dest-unreach.org/socat/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6 ) readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=http://www.dest-unreach.org/socat/download/socat-1.7.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=513eb4f1c0c825f162692e6c57568f47
diff --git a/metadata/md5-cache/net-misc/socat-2.0.0_beta5 b/metadata/md5-cache/net-misc/socat-2.0.0_beta5
index 9c869e1d787c..57d23bae3d93 100644
--- a/metadata/md5-cache/net-misc/socat-2.0.0_beta5
+++ b/metadata/md5-cache/net-misc/socat-2.0.0_beta5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Multipurpose relay (SOcket CAT)
 EAPI=4
 HOMEPAGE=http://www.dest-unreach.org/socat/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6 ) readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=http://www.dest-unreach.org/socat/download/socat-2.0.0-b5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=823bfacd522fd0432601f9bbe81ca073
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.14 b/metadata/md5-cache/net-misc/spice-gtk-0.14
index d6f89fdf1e6d..81090228abab 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.14
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.14
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( !pulseaudio? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) ) >=app-emulation/spice-protocol-0.10.1 >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 dev-libs/openssl gtk3? ( x11-libs/gtk+:3[introspection?] ) !gtk3? ( x11-libs/gtk+:2[introspection?] ) >=dev-libs/glib-2.26:2 >=x11-libs/cairo-1.2 virtual/jpeg sys-libs/zlib introspection? ( dev-libs/gobject-introspection ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/libcacard ) usbredir? ( sys-apps/hwids policykit? ( sys-apps/acl >=sys-auth/polkit-0.101 ) virtual/libusb:1 >=sys-apps/usbredir-0.4.2 virtual/udev[gudev] )
 SLOT=0
 SRC_URI=http://spice-space.org/download/gtk/spice-gtk-0.14.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=29e8165275cc139ebea05d14a5d56c76
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.14-r2 b/metadata/md5-cache/net-misc/spice-gtk-0.14-r2
index 9af4fedbd199..a1f6db3b8fb3 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.14-r2
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.14-r2
@@ -10,5 +10,5 @@ RDEPEND=pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gst
 REQUIRED_USE=?? ( pulseaudio gstreamer )
 SLOT=0
 SRC_URI=http://spice-space.org/download/gtk/spice-gtk-0.14.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e7966135fb85c7af7dad8765ea91133
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.15.3 b/metadata/md5-cache/net-misc/spice-gtk-0.15.3
index 68b83a48f90e..88325bec45a8 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.15.3
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.15.3
@@ -10,5 +10,5 @@ RDEPEND=pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gst
 REQUIRED_USE=?? ( pulseaudio gstreamer )
 SLOT=0
 SRC_URI=http://spice-space.org/download/gtk/spice-gtk-0.15.3-76cb.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f34cea96e2a578135d277574e47a89bc
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.16 b/metadata/md5-cache/net-misc/spice-gtk-0.16
index 92f9a55e78b6..57b1cc12fa9a 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.16
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.16
@@ -10,5 +10,5 @@ RDEPEND=pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gst
 REQUIRED_USE=?? ( pulseaudio gstreamer )
 SLOT=0
 SRC_URI=http://spice-space.org/download/gtk/spice-gtk-0.16.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=daaf8a85bc03372c860eb1455cf36644
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.18 b/metadata/md5-cache/net-misc/spice-gtk-0.18
index 0397021b26db..d8f8ea38cdff 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.18
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.18
@@ -10,5 +10,5 @@ RDEPEND=pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gst
 REQUIRED_USE=?? ( pulseaudio gstreamer )
 SLOT=0
 SRC_URI=http://spice-space.org/download/gtk/spice-gtk-0.18.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=beefe9d43923fc037417dc79cba858ea
diff --git a/metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.0-r1 b/metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.0-r1
index 33b28b23024a..a4ff2d2811ae 100644
--- a/metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.0-r1
+++ b/metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=x11-libs/gtk+-2.10.0:2 x11-libs/libX11 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.10.0:2 x11-libs/libX11 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A small SSH Askpass replacement written with GTK2
 EAPI=4
 HOMEPAGE=https://github.com/atj/ssh-askpass-fullscreen
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=x11-libs/gtk+-2.10.0:2 x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://github/atj/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8ef1f002b47f6dbb374ff63b47baf9e1
diff --git a/metadata/md5-cache/net-misc/stunnel-4.44 b/metadata/md5-cache/net-misc/stunnel-4.44
index 0fb773ef083f..a07ccaa8cf38 100644
--- a/metadata/md5-cache/net-misc/stunnel-4.44
+++ b/metadata/md5-cache/net-misc/stunnel-4.44
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
+DEPEND=tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
 DESCRIPTION=TLS/SSL - Port Wrapper
 EAPI=2
 HOMEPAGE=http://stunnel.mirt.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k selinux? ( sec-policy/selinux-stunnel )
 SLOT=0
 SRC_URI=ftp://ftp.stunnel.org/stunnel/stunnel-4.44.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3518fed737de010df481a0a545254521
diff --git a/metadata/md5-cache/net-misc/stunnel-4.44-r1 b/metadata/md5-cache/net-misc/stunnel-4.44-r1
index 2761379b619c..9d7bb716bc47 100644
--- a/metadata/md5-cache/net-misc/stunnel-4.44-r1
+++ b/metadata/md5-cache/net-misc/stunnel-4.44-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
+DEPEND=tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
 DESCRIPTION=TLS/SSL - Port Wrapper
 EAPI=4
 HOMEPAGE=http://stunnel.mirt.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k selinux? ( sec-policy/selinux-stunnel )
 SLOT=0
 SRC_URI=ftp://ftp.stunnel.org/stunnel/stunnel-4.44.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6fae12c6bc8fc5b47562272a6fdf6bbe
diff --git a/metadata/md5-cache/net-misc/stunnel-4.54 b/metadata/md5-cache/net-misc/stunnel-4.54
index faf4472a4db1..ecf17d8d5391 100644
--- a/metadata/md5-cache/net-misc/stunnel-4.54
+++ b/metadata/md5-cache/net-misc/stunnel-4.54
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
+DEPEND=tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
 DESCRIPTION=TLS/SSL - Port Wrapper
 EAPI=4
 HOMEPAGE=http://stunnel.mirt.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k selinux? ( sec-policy/selinux-stunnel )
 SLOT=0
 SRC_URI=ftp://ftp.stunnel.org/stunnel/stunnel-4.54.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f971aebd1a5da4c7447737da69eada36
diff --git a/metadata/md5-cache/net-misc/taylor-uucp-1.07-r2 b/metadata/md5-cache/net-misc/taylor-uucp-1.07-r2
index 248e209f52a5..dbbcd3509235 100644
--- a/metadata/md5-cache/net-misc/taylor-uucp-1.07-r2
+++ b/metadata/md5-cache/net-misc/taylor-uucp-1.07-r2
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install preinst unpack
-DEPEND=>=sys-apps/sed-4 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-apps/sed-4 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Taylor UUCP
 HOMEPAGE=http://www.airs.com/ian/uucp.html
 KEYWORDS=alpha amd64 ~arm ia64 ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/uucp/uucp-1.07.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b60cae62e76db690a89bc9548344a573
diff --git a/metadata/md5-cache/net-misc/telnet-bsd-1.2-r1 b/metadata/md5-cache/net-misc/telnet-bsd-1.2-r1
index 212f991fe67f..1f887e145712 100644
--- a/metadata/md5-cache/net-misc/telnet-bsd-1.2-r1
+++ b/metadata/md5-cache/net-misc/telnet-bsd-1.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses !net-misc/netkit-telnetd xinetd? ( sys-apps/xinetd ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses !net-misc/netkit-telnetd xinetd? ( sys-apps/xinetd ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Telnet and telnetd ported from OpenBSD with IPv6 support
 EAPI=5
 HOMEPAGE=ftp://ftp.suse.com/pub/people/kukuk/ipv6/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=ftp://ftp.suse.com/pub/people/kukuk/ipv6/telnet-bsd-1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=767f0299c815043d0936ac5436ae5c5f
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.1.0-r7 b/metadata/md5-cache/net-misc/tigervnc-1.1.0-r7
index 176c2dd3dc43..b230f0b1c183 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.1.0-r7
+++ b/metadata/md5-cache/net-misc/tigervnc-1.1.0-r7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=virtual/jpeg sys-libs/zlib media-libs/freetype x11-libs/libSM >=x11-libs/libXtst-1.0.99.2 >=app-admin/eselect-opengl-1.0.8 server? ( >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libXmu-1.0.3 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.21.8 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 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.12.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? ( virtual/pkgconfig media-fonts/font-util x11-misc/util-macros >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/dri2proto-2.6 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/randrproto-1.2.99 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xineramaproto-1.1.3 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/jpeg sys-libs/zlib media-libs/freetype x11-libs/libSM >=x11-libs/libXtst-1.0.99.2 >=app-admin/eselect-opengl-1.0.8 server? ( >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libXmu-1.0.3 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.21.8 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 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.12.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? ( virtual/pkgconfig media-fonts/font-util x11-misc/util-macros >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/dri2proto-2.6 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/randrproto-1.2.99 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xineramaproto-1.1.3 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Remote desktop viewer display system
 EAPI=1
 HOMEPAGE=http://www.tigervnc.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg sys-libs/zlib media-libs/freetype x11-libs/libSM >=x11-libs/libXtst-1.0.99.2 >=app-admin/eselect-opengl-1.0.8 server? ( >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libXmu-1.0.3 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.21.8 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 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.12.4 ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc
 SLOT=0
 SRC_URI=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.12.4.tar.bz2 mirror://gentoo/tigervnc-1.1.0_xorg-1.11.patch.bz2 mirror://gentoo/tigervnc-1.1.0_xorg-1.12.patch.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=be9a42a0daf989275bda939e6bacc817
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.2.0 b/metadata/md5-cache/net-misc/tigervnc-1.2.0
index 6fb38f2c1a68..91769d58fb1c 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.2.0
+++ b/metadata/md5-cache/net-misc/tigervnc-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=virtual/jpeg sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 gnutls? ( net-libs/gnutls ) java? ( >=virtual/jre-1.5 ) pam? ( virtual/pam ) !internal-fltk? ( x11-libs/fltk:1 ) internal-fltk? ( x11-libs/libXft x11-libs/libXinerama x11-libs/libXcursor ) server? ( >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.21.8 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-admin/eselect-opengl-1.0.8 ) xorgmodule? ( =x11-base/xorg-server-1.13* ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc amd64? ( dev-lang/nasm ) x86? ( dev-lang/nasm ) >=x11-proto/inputproto-2.1.99.3 >=x11-proto/xextproto-7.1.99 >=x11-proto/xproto-7.0.22 java? ( >=virtual/jdk-1.5 ) server? ( virtual/pkgconfig media-fonts/font-util x11-misc/util-macros >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/randrproto-1.4.0 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xineramaproto-1.1.3 >=x11-libs/xtrans-1.2.2 >=x11-proto/dri2proto-2.8 opengl? ( >=media-libs/mesa-7.8_rc[nptl=] ) ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=virtual/jpeg sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 gnutls? ( net-libs/gnutls ) java? ( >=virtual/jre-1.5 ) pam? ( virtual/pam ) !internal-fltk? ( x11-libs/fltk:1 ) internal-fltk? ( x11-libs/libXft x11-libs/libXinerama x11-libs/libXcursor ) server? ( >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.21.8 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-admin/eselect-opengl-1.0.8 ) xorgmodule? ( =x11-base/xorg-server-1.13* ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc amd64? ( dev-lang/nasm ) x86? ( dev-lang/nasm ) >=x11-proto/inputproto-2.1.99.3 >=x11-proto/xextproto-7.1.99 >=x11-proto/xproto-7.0.22 java? ( >=virtual/jdk-1.5 ) server? ( virtual/pkgconfig media-fonts/font-util x11-misc/util-macros >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/randrproto-1.4.0 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xineramaproto-1.1.3 >=x11-libs/xtrans-1.2.2 >=x11-proto/dri2proto-2.8 opengl? ( >=media-libs/mesa-7.8_rc[nptl=] ) ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=Remote desktop viewer display system
 EAPI=4
 HOMEPAGE=http://www.tigervnc.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 gnutls? ( net-libs/gnutls ) java? ( >=virtual/jre-1.5 ) pam? ( virtual/pam ) !internal-fltk? ( x11-libs/fltk:1 ) internal-fltk? ( x11-libs/libXft x11-libs/libXinerama x11-libs/libXcursor ) server? ( >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.21.8 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-admin/eselect-opengl-1.0.8 ) xorgmodule? ( =x11-base/xorg-server-1.13* ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/tigervnc/tigervnc-1.2.0.tar.gz mirror://gentoo/tigervnc.png mirror://gentoo/tigervnc-1.2.0-patches-0.1.tar.bz2 http://dev.gentoo.org/~armin76/dist/tigervnc-1.2.0-patches-0.1.tar.bz2 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.13.0.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	bc8bbf26de246f74e2901a3696ad96d6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	bc8bbf26de246f74e2901a3696ad96d6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1e1be882b7e870ac0acb340f088ed213
diff --git a/metadata/md5-cache/net-misc/tinc-1.0.21 b/metadata/md5-cache/net-misc/tinc-1.0.21
new file mode 100644
index 000000000000..d2ea41729803
--- /dev/null
+++ b/metadata/md5-cache/net-misc/tinc-1.0.21
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=>=dev-libs/openssl-0.9.7 lzo? ( dev-libs/lzo:2 ) zlib? ( >=sys-libs/zlib-1.1.4 )
+DESCRIPTION=tinc is an easy to configure VPN implementation
+EAPI=5
+HOMEPAGE=http://www.tinc-vpn.org/
+IUSE=+lzo uml vde +zlib
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/openssl-0.9.7 lzo? ( dev-libs/lzo:2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) vde? ( net-misc/vde )
+SLOT=0
+SRC_URI=http://www.tinc-vpn.org/packages/tinc-1.0.21.tar.gz
+_md5_=669e7e2f10dfbf61d938190964694425
diff --git a/metadata/md5-cache/net-misc/tlsdate-0.0.1 b/metadata/md5-cache/net-misc/tlsdate-0.0.1
index 3c4ca4d5c67d..e6a426f794f7 100644
--- a/metadata/md5-cache/net-misc/tlsdate-0.0.1
+++ b/metadata/md5-cache/net-misc/tlsdate-0.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare unpack
-DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Update local time over HTTPS
 EAPI=4
 HOMEPAGE=https://github.com/ioerror/tlsdate
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/openssl
 SLOT=0
 SRC_URI=https://github.com/ioerror/tlsdate/tarball/tlsdate-0.0.1 -> tlsdate-0.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
 _md5_=c0685a6eede7c9004be7e5d2787aa689
diff --git a/metadata/md5-cache/net-misc/tlsdate-0.0.4 b/metadata/md5-cache/net-misc/tlsdate-0.0.4
index 3308a7db346a..07fc735bad70 100644
--- a/metadata/md5-cache/net-misc/tlsdate-0.0.4
+++ b/metadata/md5-cache/net-misc/tlsdate-0.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare unpack
-DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Update local time over HTTPS
 EAPI=4
 HOMEPAGE=https://github.com/ioerror/tlsdate
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/openssl
 SLOT=0
 SRC_URI=https://github.com/ioerror/tlsdate/tarball/tlsdate-0.0.4 -> tlsdate-0.0.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
 _md5_=17dbc1d844e8307cbefd307b435e90a9
diff --git a/metadata/md5-cache/net-misc/tlsdate-0.0.4-r1 b/metadata/md5-cache/net-misc/tlsdate-0.0.4-r1
index 94655f9d5744..5fd54813226a 100644
--- a/metadata/md5-cache/net-misc/tlsdate-0.0.4-r1
+++ b/metadata/md5-cache/net-misc/tlsdate-0.0.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare unpack
-DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Update local time over HTTPS
 EAPI=4
 HOMEPAGE=https://github.com/ioerror/tlsdate
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/openssl
 SLOT=0
 SRC_URI=https://github.com/ioerror/tlsdate/tarball/tlsdate-0.0.4 -> tlsdate-0.0.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
 _md5_=09763421adcf613c0d8cc927d60d1545
diff --git a/metadata/md5-cache/net-misc/tlsdate-0.0.4-r2 b/metadata/md5-cache/net-misc/tlsdate-0.0.4-r2
index 19354294ee6e..7734b1583536 100644
--- a/metadata/md5-cache/net-misc/tlsdate-0.0.4-r2
+++ b/metadata/md5-cache/net-misc/tlsdate-0.0.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install preinst prepare unpack
-DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Update local time over HTTPS
 EAPI=4
 HOMEPAGE=https://github.com/ioerror/tlsdate
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/openssl
 SLOT=0
 SRC_URI=https://github.com/ioerror/tlsdate/tarball/tlsdate-0.0.4 -> tlsdate-0.0.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
 _md5_=3a190c3e34a019321866c85e7b1c4d0d
diff --git a/metadata/md5-cache/net-misc/tlsdate-0.0.5 b/metadata/md5-cache/net-misc/tlsdate-0.0.5
index 339659c87c37..8c36a1aaa246 100644
--- a/metadata/md5-cache/net-misc/tlsdate-0.0.5
+++ b/metadata/md5-cache/net-misc/tlsdate-0.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install preinst prepare unpack
-DEPEND=dev-libs/openssl dbus? ( sys-apps/dbus ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl dbus? ( sys-apps/dbus ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Update local time over HTTPS
 EAPI=4
 HOMEPAGE=https://github.com/ioerror/tlsdate
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/openssl dbus? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=https://github.com/ioerror/tlsdate/tarball/tlsdate-0.0.5 -> tlsdate-0.0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
 _md5_=34343a728ee05386dffe6c685bccbbad
diff --git a/metadata/md5-cache/net-misc/tlsdate-0.0.6 b/metadata/md5-cache/net-misc/tlsdate-0.0.6
index 378b3104e30b..f65b8b06b87b 100644
--- a/metadata/md5-cache/net-misc/tlsdate-0.0.6
+++ b/metadata/md5-cache/net-misc/tlsdate-0.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install preinst prepare unpack
-DEPEND=dev-libs/openssl dbus? ( sys-apps/dbus ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl dbus? ( sys-apps/dbus ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Update local time over HTTPS
 EAPI=4
 HOMEPAGE=https://github.com/ioerror/tlsdate
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/openssl dbus? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=https://github.com/ioerror/tlsdate/tarball/tlsdate-0.0.6 -> tlsdate-0.0.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
 _md5_=3affe7fe102feaadd9d4a6768cc033d1
diff --git a/metadata/md5-cache/net-misc/tsclient-2.0.1-r1 b/metadata/md5-cache/net-misc/tsclient-2.0.1-r1
index d911a0ffdd23..b1ee62cab1ba 100644
--- a/metadata/md5-cache/net-misc/tsclient-2.0.1-r1
+++ b/metadata/md5-cache/net-misc/tsclient-2.0.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK2 frontend for rdesktop
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/tsclient
@@ -9,5 +9,5 @@ RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2 gnome-base/libglade:2.0 gnome-base/libgn
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/tsclient/tsclient-2.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b4e634bb63782ada2f7df098c677feef
diff --git a/metadata/md5-cache/net-misc/usbip-3.6 b/metadata/md5-cache/net-misc/usbip-3.6
index 624c0b517edd..996bda2f00af 100644
--- a/metadata/md5-cache/net-misc/usbip-3.6
+++ b/metadata/md5-cache/net-misc/usbip-3.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-fs/sysfsutils-2 tcpd? ( sys-apps/tcp-wrappers ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-fs/sysfsutils-2 tcpd? ( sys-apps/tcp-wrappers ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Userspace utilities for a general USB device sharing system over IP networks
 EAPI=5
 HOMEPAGE=http://www.kernel.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-fs/sysfsutils-2 tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v3.0/linux-3.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e3ce7c6684077a813178ee18c24f7c89
diff --git a/metadata/md5-cache/net-misc/vmpsd-1.4 b/metadata/md5-cache/net-misc/vmpsd-1.4
index 089ba7f86b65..2c68522ed52e 100644
--- a/metadata/md5-cache/net-misc/vmpsd-1.4
+++ b/metadata/md5-cache/net-misc/vmpsd-1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=net-analyzer/net-snmp[ucd-compat(+)] dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-analyzer/net-snmp[ucd-compat(+)] dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An open-source VLAN management system
 EAPI=4
 HOMEPAGE=http://vmps.sourceforge.net
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/vmps/vmpsd-1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=53fabf2df6dd3f8b8393e8d00492b8ef
diff --git a/metadata/md5-cache/net-misc/wget-1.13.4-r1 b/metadata/md5-cache/net-misc/wget-1.13.4-r1
index 39d7bf821842..cde6be7723c5 100644
--- a/metadata/md5-cache/net-misc/wget-1.13.4-r1
+++ b/metadata/md5-cache/net-misc/wget-1.13.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=!static? ( idn? ( net-dns/libidn ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( net-dns/libidn[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) ) ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!static? ( idn? ( net-dns/libidn ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( net-dns/libidn[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) ) ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Network utility to retrieve files from the WWW
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/wget/
@@ -10,5 +10,5 @@ RDEPEND=!static? ( idn? ( net-dns/libidn ) ssl? ( gnutls? ( net-libs/gnutls ) !g
 REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.13.4.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b54c36720f4ac16910a89c9b0324e54c
diff --git a/metadata/md5-cache/net-misc/wget-1.14 b/metadata/md5-cache/net-misc/wget-1.14
index acf0a460afbc..dbfc101a8880 100644
--- a/metadata/md5-cache/net-misc/wget-1.14
+++ b/metadata/md5-cache/net-misc/wget-1.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( net-dns/libidn[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( net-dns/libidn[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Network utility to retrieve files from the WWW
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/wget/
@@ -10,5 +10,5 @@ RDEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnu
 REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.14.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9c9aeebb796ca531215398c36f64fb8e
diff --git a/metadata/md5-cache/net-misc/xsupplicant-2.2.0 b/metadata/md5-cache/net-misc/xsupplicant-2.2.0
index 051cba6f266d..18e81cf03f9c 100644
--- a/metadata/md5-cache/net-misc/xsupplicant-2.2.0
+++ b/metadata/md5-cache/net-misc/xsupplicant-2.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=dev-libs/libxml2 dev-libs/openssl net-wireless/wireless-tools sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 dev-libs/openssl net-wireless/wireless-tools sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open1X xsupplicant is an open source implementation of the IEEE 802.1X protocol.
 EAPI=3
 HOMEPAGE=http://open1x.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD )
 RDEPEND=dev-libs/libxml2 dev-libs/openssl net-wireless/wireless-tools sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/open1x/XSupplicant-2.2.0-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=da3cfc7be9eb72f50318400106ef062d
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2013.04.22 b/metadata/md5-cache/net-misc/youtube-dl-2013.04.22
new file mode 100644
index 000000000000..70641f008987
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2013.04.22
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=test? ( dev-python/nose[coverage(+)] )
+DESCRIPTION=Download videos from YouTube.com (and mores sites...)
+EAPI=5
+HOMEPAGE=http://rg3.github.com/youtube-dl/
+IUSE=offensive test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+SLOT=0
+SRC_URI=http://youtube-dl.org/downloads/2013.04.22/youtube-dl-2013.04.22.tar.gz
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=73f82ee9e0829fb3af4ee86ce6939f4a
diff --git a/metadata/md5-cache/net-misc/zsync-0.6.2 b/metadata/md5-cache/net-misc/zsync-0.6.2
index e7e97942c2a9..ecf002bb957c 100644
--- a/metadata/md5-cache/net-misc/zsync-0.6.2
+++ b/metadata/md5-cache/net-misc/zsync-0.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Partial/differential file download client over HTTP which uses the rsync algorithm
 EAPI=3
 HOMEPAGE=http://zsync.moria.org.uk/
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Artistic-2
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=17c074c876cc7cf65319d8685ea40c5a
diff --git a/metadata/md5-cache/net-nds/389-admin-1.1.31 b/metadata/md5-cache/net-nds/389-admin-1.1.31
index 2a35bb386a49..75502cfaff67 100644
--- a/metadata/md5-cache/net-nds/389-admin-1.1.31
+++ b/metadata/md5-cache/net-nds/389-admin-1.1.31
@@ -9,5 +9,5 @@ LICENSE=GPL-2 Apache-2.0
 RDEPEND=>=app-admin/389-admin-console-1.1.0 >=app-admin/389-ds-console-1.1.0 app-misc/mime-types dev-libs/389-adminutil dev-libs/cyrus-sasl dev-libs/icu dev-libs/nss[utils] || ( <=dev-libs/nspr-4.8.3-r3[ipv6?] >=dev-libs/nspr-4.8.4 ) dev-libs/svrcore net-analyzer/net-snmp[ipv6?] net-nds/openldap selinux? ( sys-apps/checkpolicy sys-apps/policycoreutils sec-policy/selinux-base-policy ) >=sys-libs/db-4.2.52 sys-libs/pam sys-apps/tcp-wrappers[ipv6?] www-apache/mod_nss www-servers/apache:2[apache2_modules_actions,apache2_modules_alias,apache2_modules_auth_basic,apache2_modules_authz_default,apache2_modules_cgi,apache2_modules_mime_magic,apache2_modules_rewrite,apache2_modules_setenvif,suexec,threads] www-client/lynx =www-servers/apache-2.2*
 SLOT=0
 SRC_URI=http://directory.fedoraproject.org/sources/389-admin-1.1.31.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3d356c73aa2bd22b92308805bd968def
diff --git a/metadata/md5-cache/net-nds/389-ds-base-1.3.0.2 b/metadata/md5-cache/net-nds/389-ds-base-1.3.0.2
index dfb2728ad9f6..7a880653fc78 100644
--- a/metadata/md5-cache/net-nds/389-ds-base-1.3.0.2
+++ b/metadata/md5-cache/net-nds/389-ds-base-1.3.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-exceptions
 RDEPEND=!>=sys-libs/db-5.0 >=dev-libs/cyrus-sasl-2.1.19 >=dev-libs/icu-3.4 dev-libs/nss[utils] dev-libs/nspr dev-libs/svrcore dev-libs/openssl dev-libs/libpcre:3 dev-perl/perl-mozldap >=net-analyzer/net-snmp-5.1.2 net-nds/openldap sys-apps/tcp-wrappers >=sys-libs/db-4.5 sys-libs/pam sys-libs/zlib kerberos? ( >=app-crypt/mit-krb5-1.7-r100[openldap] ) selinux? ( >=sys-apps/policycoreutils-1.30.30 sec-policy/selinux-base-policy ) virtual/perl-Time-Local virtual/perl-MIME-Base64
 SLOT=0
 SRC_URI=http://directory.fedoraproject.org/sources/389-ds-base-1.3.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=614a1f581d554b972eae47759caa13e4
diff --git a/metadata/md5-cache/net-nds/adtool-1.3.3 b/metadata/md5-cache/net-nds/adtool-1.3.3
index 3f678bebc288..86122b29ac50 100644
--- a/metadata/md5-cache/net-nds/adtool-1.3.3
+++ b/metadata/md5-cache/net-nds/adtool-1.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-nds/openldap ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-nds/openldap ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utility for Active Directory administration
 EAPI=4
 HOMEPAGE=http://gp2x.org/adtool/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-nds/openldap ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=http://gp2x.org/adtool/adtool-1.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=00c9b15f052a9cd3b3ba906d728b50d7
diff --git a/metadata/md5-cache/net-nds/ldapvi-1.7_p20101214 b/metadata/md5-cache/net-nds/ldapvi-1.7_p20101214
index c2b84cf21cdf..c97ed88b721f 100644
--- a/metadata/md5-cache/net-nds/ldapvi-1.7_p20101214
+++ b/metadata/md5-cache/net-nds/ldapvi-1.7_p20101214
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses:5 net-nds/openldap dev-libs/popt dev-libs/glib:2 sys-libs/readline gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) sasl? ( dev-libs/cyrus-sasl:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses:5 net-nds/openldap dev-libs/popt dev-libs/glib:2 sys-libs/readline gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) sasl? ( dev-libs/cyrus-sasl:2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Manage LDAP entries with a text editor
 EAPI=5
 HOMEPAGE=http://www.lichteblau.com/ldapvi/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:5 net-nds/openldap dev-libs/popt dev-libs/glib:2 sys-libs/readline gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) sasl? ( dev-libs/cyrus-sasl:2 )
 SLOT=0
 SRC_URI=mirror://gentoo/ldapvi-1.7_p20101214.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=23863ae8b094049073e9d81e4ec820f9
diff --git a/metadata/md5-cache/net-nds/openldap-2.3.43-r1 b/metadata/md5-cache/net-nds/openldap-2.3.43-r1
index f796fbc009e0..626b115b101c 100644
--- a/metadata/md5-cache/net-nds/openldap-2.3.43-r1
+++ b/metadata/md5-cache/net-nds/openldap-2.3.43-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=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-ldap ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
+DEPEND=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-ldap ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=2
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP
 RDEPEND=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-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.3.43.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=edfbb8c1e95238f85a00a39388b7126b
diff --git a/metadata/md5-cache/net-nds/openldap-2.3.43-r3 b/metadata/md5-cache/net-nds/openldap-2.3.43-r3
index e64a423351eb..ff48a57b70c0 100644
--- a/metadata/md5-cache/net-nds/openldap-2.3.43-r3
+++ b/metadata/md5-cache/net-nds/openldap-2.3.43-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=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-ldap ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
+DEPEND=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-ldap ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=2
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP
 RDEPEND=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-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.3.43.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=28436c59d316b223d1245c32407b20bf
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.21 b/metadata/md5-cache/net-nds/openldap-2.4.21
index 7e527f147e8e..510079044952 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.21
+++ b/metadata/md5-cache/net-nds/openldap-2.4.21
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP
 RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 ) ) 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-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.21.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=56851f3668cdf1603aa6b0f430739de2
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.23 b/metadata/md5-cache/net-nds/openldap-2.4.23
index 480e20cd55a3..0c1d11c6b98d 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.23
+++ b/metadata/md5-cache/net-nds/openldap-2.4.23
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP
 RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 ) ) 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-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.23.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b89c041748632598e40a9b42094621c4
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.24 b/metadata/md5-cache/net-nds/openldap-2.4.24
index c6034e78cd9d..a58426e9d635 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.24
+++ b/metadata/md5-cache/net-nds/openldap-2.4.24
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP
 RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 ) ) 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-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.24.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e412fdc13400fe3b3bca4cd068801cab
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.25 b/metadata/md5-cache/net-nds/openldap-2.4.25
index 2d4cbf646aff..ba0aa6d8af5a 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.25
+++ b/metadata/md5-cache/net-nds/openldap-2.4.25
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP
 RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 ) ) 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-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.25.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=71302d7ad1144aeb944af1658b4747ea
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.25-r1 b/metadata/md5-cache/net-nds/openldap-2.4.25-r1
index 630b03e9028c..59020560c904 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.25-r1
+++ b/metadata/md5-cache/net-nds/openldap-2.4.25-r1
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP
 RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 ) ) 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-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.25.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e08b61fa28a0d1769358d0c103e8892d
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.28 b/metadata/md5-cache/net-nds/openldap-2.4.28
index 1818bc2b756e..b64d89d7b3ec 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.28
+++ b/metadata/md5-cache/net-nds/openldap-2.4.28
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP
 RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 ) ) 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-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.28.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d732f503000cdf77d9edb30d309d577b
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.28-r1 b/metadata/md5-cache/net-nds/openldap-2.4.28-r1
index 139ae08f58d9..4a58b5a83c48 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.28-r1
+++ b/metadata/md5-cache/net-nds/openldap-2.4.28-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 ) ) 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-ldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 ) ) 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-ldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=3
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP
 RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 ) ) 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-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.28.tgz http://simon.kisikew.org/src/ldap/rfc2307bis.schema -> rfc2307bis.schema-20100722
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c682ae81dc1e534250c237223946d325
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.30 b/metadata/md5-cache/net-nds/openldap-2.4.30
index a714e6de9f35..be9fba0357cd 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.30
+++ b/metadata/md5-cache/net-nds/openldap-2.4.30
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) ) 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-ldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) ) 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-ldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=3
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP
 RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) ) 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-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.30.tgz http://simon.kisikew.org/src/ldap/rfc2307bis.schema -> rfc2307bis.schema-20100722
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=77f9c43f5377f34fc541eea9b286fba8
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.31 b/metadata/md5-cache/net-nds/openldap-2.4.31
index b9d7d4743ef5..35993ca2f077 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.31
+++ b/metadata/md5-cache/net-nds/openldap-2.4.31
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) ) 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-ldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) ) 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-ldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=4
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-app
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.31.tgz mirror://gentoo/rfc2307bis.schema-20120525
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8b046ccf4f7cbcae4944627c5201dc18
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.31-r1 b/metadata/md5-cache/net-nds/openldap-2.4.31-r1
index e8b222b0ca79..0d3c67f350ae 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.31-r1
+++ b/metadata/md5-cache/net-nds/openldap-2.4.31-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) ) 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-ldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) ) 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-ldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=4
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-app
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.31.tgz mirror://gentoo/rfc2307bis.schema-20120525
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cd7e4e6ec1a082e12133a62a51dc52f5
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.32 b/metadata/md5-cache/net-nds/openldap-2.4.32
index 6de838338b31..40226d154e60 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.32
+++ b/metadata/md5-cache/net-nds/openldap-2.4.32
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) ) 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-ldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) ) 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-ldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=4
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-app
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.32.tgz mirror://gentoo/rfc2307bis.schema-20120525
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2ac36a946dfb405405101d87dfea0abb
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.33 b/metadata/md5-cache/net-nds/openldap-2.4.33
index df1604e6839e..3d441871af0a 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.33
+++ b/metadata/md5-cache/net-nds/openldap-2.4.33
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) ) 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-ldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) ) 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-ldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=4
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-app
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.33.tgz mirror://gentoo/rfc2307bis.schema-20120525
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=febf05c50341321d91ad8a07b1d74036
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.33-r1 b/metadata/md5-cache/net-nds/openldap-2.4.33-r1
index 26be1c599267..81f15bd1f5cf 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.33-r1
+++ b/metadata/md5-cache/net-nds/openldap-2.4.33-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=icu? ( dev-libs/icu ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( sys-devel/libtool tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=icu? ( dev-libs/icu ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( sys-devel/libtool tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=4
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( <ne
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.33.tgz mirror://gentoo/rfc2307bis.schema-20120525
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=90a9513e897a554641751fa051dfeb63
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.33-r2 b/metadata/md5-cache/net-nds/openldap-2.4.33-r2
index 8c8ab5074c65..84278e6945b9 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.33-r2
+++ b/metadata/md5-cache/net-nds/openldap-2.4.33-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=icu? ( dev-libs/icu ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( sys-devel/libtool tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=icu? ( dev-libs/icu ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( sys-devel/libtool tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=4
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.33.tgz mirror://gentoo/rfc2307bis.schema-20120525
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=854f315ad769c9c3f430ee2f15c5e667
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.35 b/metadata/md5-cache/net-nds/openldap-2.4.35
index 4dfba1c8d28c..342c7341dfaa 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.35
+++ b/metadata/md5-cache/net-nds/openldap-2.4.35
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=icu? ( dev-libs/icu ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( sys-devel/libtool tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=icu? ( dev-libs/icu ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( sys-devel/libtool tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=4
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.35.tgz mirror://gentoo/rfc2307bis.schema-20120525
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2a67034bee736610cf6197acd227df3c
diff --git a/metadata/md5-cache/net-nds/rpcbind-0.2.0 b/metadata/md5-cache/net-nds/rpcbind-0.2.0
index 618bb82dd8d6..31d1bb206ab3 100644
--- a/metadata/md5-cache/net-nds/rpcbind-0.2.0
+++ b/metadata/md5-cache/net-nds/rpcbind-0.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=net-libs/libtirpc selinux? ( sec-policy/selinux-rpcbind ) tcpd? ( sys-apps/tcp-wrappers ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-libs/libtirpc selinux? ( sec-policy/selinux-rpcbind ) tcpd? ( sys-apps/tcp-wrappers ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=portmap replacement which supports RPC over various protocols
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/rpcbind/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libtirpc selinux? ( sec-policy/selinux-rpcbind ) tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=mirror://sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5164d4df88ced24de98b805ae993764b
diff --git a/metadata/md5-cache/net-nds/rpcbind-9999 b/metadata/md5-cache/net-nds/rpcbind-9999
index 21e2eabbc9cf..bea814721c7e 100644
--- a/metadata/md5-cache/net-nds/rpcbind-9999
+++ b/metadata/md5-cache/net-nds/rpcbind-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=net-libs/libtirpc selinux? ( sec-policy/selinux-rpcbind ) tcpd? ( sys-apps/tcp-wrappers ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=net-libs/libtirpc selinux? ( sec-policy/selinux-rpcbind ) tcpd? ( sys-apps/tcp-wrappers ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=portmap replacement which supports RPC over various protocols
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/rpcbind/
@@ -7,5 +7,5 @@ IUSE=selinux tcpd
 LICENSE=BSD
 RDEPEND=net-libs/libtirpc selinux? ( sec-policy/selinux-rpcbind ) tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=4a42e4ad218175cd8597ec25f1b70d1e
diff --git a/metadata/md5-cache/net-nds/tac_plus-4.0.4.19-r3 b/metadata/md5-cache/net-nds/tac_plus-4.0.4.19-r3
index 407e9dd0713c..ce5811ce65bf 100644
--- a/metadata/md5-cache/net-nds/tac_plus-4.0.4.19-r3
+++ b/metadata/md5-cache/net-nds/tac_plus-4.0.4.19-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers ) sys-libs/pam || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers ) sys-libs/pam || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An updated version of Cisco's TACACS+ server
 EAPI=4
 HOMEPAGE=http://www.shrubbery.net/tac_plus/
@@ -9,5 +9,5 @@ LICENSE=HPND RSA GPL-2
 RDEPEND=skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers ) sys-libs/pam
 SLOT=0
 SRC_URI=ftp://ftp.shrubbery.net/pub/tac_plus/tacacs+-F4.0.4.19.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2b0aa3aa95fbb357f62339f36da2cf9e
diff --git a/metadata/md5-cache/net-nds/tac_plus-4.0.4.19-r4 b/metadata/md5-cache/net-nds/tac_plus-4.0.4.19-r4
index db0ecd6a6dd9..d6d7f51d4b40 100644
--- a/metadata/md5-cache/net-nds/tac_plus-4.0.4.19-r4
+++ b/metadata/md5-cache/net-nds/tac_plus-4.0.4.19-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers ) sys-libs/pam || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers ) sys-libs/pam || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An updated version of Cisco's TACACS+ server
 EAPI=5
 HOMEPAGE=http://www.shrubbery.net/tac_plus/
@@ -9,5 +9,5 @@ LICENSE=HPND RSA GPL-2
 RDEPEND=skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers ) sys-libs/pam
 SLOT=0
 SRC_URI=ftp://ftp.shrubbery.net/pub/tac_plus/tacacs+-F4.0.4.19.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8510ecb7c1e2719f59cb0ca718d69bd2
diff --git a/metadata/md5-cache/net-nds/ypserv-2.26 b/metadata/md5-cache/net-nds/ypserv-2.26
index 11495cdf174e..ab2d64394dac 100644
--- a/metadata/md5-cache/net-nds/ypserv-2.26
+++ b/metadata/md5-cache/net-nds/ypserv-2.26
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst preinst prepare
-DEPEND=>=sys-libs/gdbm-1.8.0 slp? ( net-libs/openslp ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/gdbm-1.8.0 slp? ( net-libs/openslp ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Network Information Service server
 EAPI=4
 HOMEPAGE=http://www.linux-nis.org/nis/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/gdbm-1.8.0 slp? ( net-libs/openslp ) || ( net-nds/rpcbind net-nds/portmap )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/net/NIS/ypserv-2.26.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=02cceb69d19a1ec75ea039e795ed3ddb
diff --git a/metadata/md5-cache/net-nntp/inn-2.5.3-r1 b/metadata/md5-cache/net-nntp/inn-2.5.3-r1
index 3f7062ed33d9..8875c950c7bf 100644
--- a/metadata/md5-cache/net-nntp/inn-2.5.3-r1
+++ b/metadata/md5-cache/net-nntp/inn-2.5.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst postrm prepare setup
-DEPEND=virtual/mta dev-perl/MIME-tools sys-libs/pam sys-libs/zlib kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) berkdb? ( sys-libs/db ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
+DEPEND=virtual/mta dev-perl/MIME-tools sys-libs/pam sys-libs/zlib kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) berkdb? ( sys-libs/db ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
 DESCRIPTION=The Internet News daemon, fully featured NNTP server
 EAPI=5
 HOMEPAGE=https://www.isc.org/software/inn
@@ -9,5 +9,5 @@ LICENSE=ISC GPL-2+ public-domain BSD-4 BSD-2 RSA BSD MIT GPL-2
 RDEPEND=virtual/mta dev-perl/MIME-tools sys-libs/pam sys-libs/zlib kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) berkdb? ( sys-libs/db )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/inn/inn-2.5.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b3ad473b388714c3c1e66bf609be0bfa
diff --git a/metadata/md5-cache/net-nntp/nzbget-0.8.0 b/metadata/md5-cache/net-nntp/nzbget-0.8.0
index 0d02b7ddc196..d03e39f009a0 100644
--- a/metadata/md5-cache/net-nntp/nzbget-0.8.0
+++ b/metadata/md5-cache/net-nntp/nzbget-0.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A command-line based binary newsgrapper supporting .nzb files
 EAPI=4
 HOMEPAGE=http://nzbget.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/nzbget/nzbget-0.8.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ff6164153c2fc6ac9fe95668a97feaa1
diff --git a/metadata/md5-cache/net-nntp/nzbget-10.1 b/metadata/md5-cache/net-nntp/nzbget-10.1
index d7ec2ce53f0e..652c88628137 100644
--- a/metadata/md5-cache/net-nntp/nzbget-10.1
+++ b/metadata/md5-cache/net-nntp/nzbget-10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A command-line based binary newsgrapper supporting .nzb files
 EAPI=5
 HOMEPAGE=http://nzbget.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/nzbget/nzbget-10.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=71e6a15fd5c1f297630b93551d8d0d63
diff --git a/metadata/md5-cache/net-nntp/nzbget-10.2 b/metadata/md5-cache/net-nntp/nzbget-10.2
index c7fc69f5860b..9a576b3173b5 100644
--- a/metadata/md5-cache/net-nntp/nzbget-10.2
+++ b/metadata/md5-cache/net-nntp/nzbget-10.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A command-line based binary newsgrapper supporting .nzb files
 EAPI=5
 HOMEPAGE=http://nzbget.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/nzbget/nzbget-10.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=410ef423c1de162ad10a2e561bc86946
diff --git a/metadata/md5-cache/net-nntp/nzbget-9.1 b/metadata/md5-cache/net-nntp/nzbget-9.1
index a6dfb24ef7eb..660f13b7cf81 100644
--- a/metadata/md5-cache/net-nntp/nzbget-9.1
+++ b/metadata/md5-cache/net-nntp/nzbget-9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A command-line based binary newsgrapper supporting .nzb files
 EAPI=5
 HOMEPAGE=http://nzbget.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/nzbget/nzbget-9.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=76c9c4fae23374cc367dbcb4c18347fb
diff --git a/metadata/md5-cache/net-nntp/pan-9999 b/metadata/md5-cache/net-nntp/pan-9999
index 30743490cbae..46b039a35aea 100644
--- a/metadata/md5-cache/net-nntp/pan-9999
+++ b/metadata/md5-cache/net-nntp/pan-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare unpack
-DEPEND=>=dev-libs/glib-2.26:2 >=x11-libs/gtk+-2.16:2 dev-libs/gmime:2.6 gnome-keyring? ( >=gnome-base/libgnome-keyring-3.2 ) libnotify? ( >=x11-libs/libnotify-0.4.1 ) spell? ( >=app-text/enchant-1.6 >=app-text/gtkspell-2.0.7:2 ) ssl? ( >=net-libs/gnutls-3 ) app-text/gnome-doc-utils >=dev-util/intltool-0.35.5 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=dev-libs/glib-2.26:2 >=x11-libs/gtk+-2.16:2 dev-libs/gmime:2.6 gnome-keyring? ( >=gnome-base/libgnome-keyring-3.2 ) libnotify? ( >=x11-libs/libnotify-0.4.1 ) spell? ( >=app-text/enchant-1.6 >=app-text/gtkspell-2.0.7:2 ) ssl? ( >=net-libs/gnutls-3 ) app-text/gnome-doc-utils >=dev-util/intltool-0.35.5 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=A newsreader for GNOME
 EAPI=4
 HOMEPAGE=http://pan.rebelbase.com/
@@ -7,5 +7,5 @@ IUSE=dbus gnome-keyring libnotify spell ssl
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2 >=x11-libs/gtk+-2.16:2 dev-libs/gmime:2.6 gnome-keyring? ( >=gnome-base/libgnome-keyring-3.2 ) libnotify? ( >=x11-libs/libnotify-0.4.1 ) spell? ( >=app-text/enchant-1.6 >=app-text/gtkspell-2.0.7:2 ) ssl? ( >=net-libs/gnutls-3 )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=ae8c8e5fb480b2ab664ce9e6692c3e97
diff --git a/metadata/md5-cache/net-nntp/tin-2.0.1-r1 b/metadata/md5-cache/net-nntp/tin-2.0.1-r1
index 3660c7dd11ac..e262337fd1a3 100644
--- a/metadata/md5-cache/net-nntp/tin-2.0.1-r1
+++ b/metadata/md5-cache/net-nntp/tin-2.0.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libpcre dev-libs/uulib gpg? ( app-crypt/gnupg ) idn? ( net-dns/libidn ) mime? ( net-mail/metamail ) net-misc/urlview nls? ( sys-devel/gettext ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) sys-libs/ncurses[unicode?] unicode? ( dev-libs/icu:= ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libpcre dev-libs/uulib gpg? ( app-crypt/gnupg ) idn? ( net-dns/libidn ) mime? ( net-mail/metamail ) net-misc/urlview nls? ( sys-devel/gettext ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) sys-libs/ncurses[unicode?] unicode? ( dev-libs/icu:= ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A threaded NNTP and spool based UseNet newsreader
 EAPI=5
 HOMEPAGE=http://www.tin.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre dev-libs/uulib gpg? ( app-crypt/gnupg ) idn? ( net-dns/libidn ) mime? ( net-mail/metamail ) net-misc/urlview nls? ( sys-devel/gettext ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) sys-libs/ncurses[unicode?] unicode? ( dev-libs/icu:= )
 SLOT=0
 SRC_URI=ftp://ftp.tin.org/pub/news/clients/tin/v2.0/tin-2.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b88e01ead5c5d30b24b9f3b8c964e344
diff --git a/metadata/md5-cache/net-p2p/bitstormlite-0.2p b/metadata/md5-cache/net-p2p/bitstormlite-0.2p
index a0019814fd44..95a7f8bd6a11 100644
--- a/metadata/md5-cache/net-p2p/bitstormlite-0.2p
+++ b/metadata/md5-cache/net-p2p/bitstormlite-0.2p
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=net-misc/curl >=x11-libs/gtk+-2.6:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-misc/curl >=x11-libs/gtk+-2.6:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A light BitTorrent client based on c++ and gtk+.
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/bbom/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/curl >=x11-libs/gtk+-2.6:2
 SLOT=0
 SRC_URI=mirror://sourceforge/bbom/BitStormLite-0.2p.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ee7569227e984d21ee45668277da7951
diff --git a/metadata/md5-cache/net-p2p/createtorrent-1.1.3-r1 b/metadata/md5-cache/net-p2p/createtorrent-1.1.3-r1
index 688783cf8115..ece92944b60d 100644
--- a/metadata/md5-cache/net-p2p/createtorrent-1.1.3-r1
+++ b/metadata/md5-cache/net-p2p/createtorrent-1.1.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Create BitTorrent files easily
 HOMEPAGE=http://www.createtorrent.com/
 KEYWORDS=~amd64 ~ppc64 ~x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl
 SLOT=0
 SRC_URI=http://www.createtorrent.com/createtorrent-1.1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7c3cc4287179694f449157ce432ab404
diff --git a/metadata/md5-cache/net-p2p/createtorrent-1.1.4 b/metadata/md5-cache/net-p2p/createtorrent-1.1.4
index 0a828496c3d3..25e17b14d683 100644
--- a/metadata/md5-cache/net-p2p/createtorrent-1.1.4
+++ b/metadata/md5-cache/net-p2p/createtorrent-1.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Create BitTorrent files easily
 HOMEPAGE=http://www.createtorrent.com/
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl
 SLOT=0
 SRC_URI=http://www.createtorrent.com/createtorrent-1.1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c6e9e66d413aecf9680fb4291c1f57b7
diff --git a/metadata/md5-cache/net-p2p/dbhub-0.451 b/metadata/md5-cache/net-p2p/dbhub-0.451
index f22b6a0c2ef2..413b7abef615 100644
--- a/metadata/md5-cache/net-p2p/dbhub-0.451
+++ b/metadata/md5-cache/net-p2p/dbhub-0.451
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=perl? ( dev-lang/perl ) switch_user? ( sys-libs/libcap ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=perl? ( dev-lang/perl ) switch_user? ( sys-libs/libcap ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Hub software for Direct Connect, fork of opendchub
 EAPI=2
 HOMEPAGE=http://www.dbhub.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=perl? ( dev-lang/perl ) switch_user? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=mirror://sourceforge/dbhub/dbhub-0.451.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=72bfcfa4bc92f60644531890e499f859
diff --git a/metadata/md5-cache/net-p2p/dbhub-0.451-r1 b/metadata/md5-cache/net-p2p/dbhub-0.451-r1
index 075a85935fa5..dc1d57baeb93 100644
--- a/metadata/md5-cache/net-p2p/dbhub-0.451-r1
+++ b/metadata/md5-cache/net-p2p/dbhub-0.451-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=perl? ( dev-lang/perl ) switch_user? ( sys-libs/libcap ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=perl? ( dev-lang/perl ) switch_user? ( sys-libs/libcap ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Hub software for Direct Connect, fork of opendchub
 EAPI=2
 HOMEPAGE=http://www.dbhub.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=perl? ( dev-lang/perl ) switch_user? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=mirror://sourceforge/dbhub/dbhub-0.451.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=58fc553d3a7cb841784a9de70786490d
diff --git a/metadata/md5-cache/net-p2p/dclib-0.3.23 b/metadata/md5-cache/net-p2p/dclib-0.3.23
index 7c0569c55808..832a2b91bc34 100644
--- a/metadata/md5-cache/net-p2p/dclib-0.3.23
+++ b/metadata/md5-cache/net-p2p/dclib-0.3.23
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=app-arch/bzip2 sys-libs/zlib dev-libs/libxml2 socks5? ( net-proxy/dante ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/bzip2 sys-libs/zlib dev-libs/libxml2 socks5? ( net-proxy/dante ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=DirectConnect client library
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/wxdcgui
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 sys-libs/zlib dev-libs/libxml2 socks5? ( net-proxy/dante ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/wxdcgui/dclib-0.3.23.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dd1124d9328531e9a4001024f943b787
diff --git a/metadata/md5-cache/net-p2p/giftui-0.4.1-r1 b/metadata/md5-cache/net-p2p/giftui-0.4.1-r1
index a8d3a6580539..4aa09527386b 100644
--- a/metadata/md5-cache/net-p2p/giftui-0.4.1-r1
+++ b/metadata/md5-cache/net-p2p/giftui-0.4.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-libs/gtk+-2.4.3:2 net-p2p/gift >=gnome-base/gconf-2.6.0:2 virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.4.3:2 net-p2p/gift >=gnome-base/gconf-2.6.0:2 virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A GTK+2 giFT frontend
 EAPI=1
 HOMEPAGE=http://giftui.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.4.3:2 net-p2p/gift >=gnome-base/gconf-2.6.0:2
 SLOT=0
 SRC_URI=mirror://sourceforge/giftui/giftui-0.4.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=588836ee0f2f52b9d758628872582503
diff --git a/metadata/md5-cache/net-p2p/giftui-0.4.1-r2 b/metadata/md5-cache/net-p2p/giftui-0.4.1-r2
index 45de7478eba7..663946fcf67f 100644
--- a/metadata/md5-cache/net-p2p/giftui-0.4.1-r2
+++ b/metadata/md5-cache/net-p2p/giftui-0.4.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-libs/gtk+-2.4.3:2 net-p2p/gift >=gnome-base/gconf-2.6.0:2 virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.4.3:2 net-p2p/gift >=gnome-base/gconf-2.6.0:2 virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A GTK+2 giFT frontend
 EAPI=1
 HOMEPAGE=http://giftui.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.4.3:2 net-p2p/gift >=gnome-base/gconf-2.6.0:2
 SLOT=0
 SRC_URI=mirror://sourceforge/giftui/giftui-0.4.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=554b71b1df87e2786ab837113ba33a98
diff --git a/metadata/md5-cache/net-p2p/hx-0.4.11 b/metadata/md5-cache/net-p2p/hx-0.4.11
index 2fa55cdffcea..68580f11e642 100644
--- a/metadata/md5-cache/net-p2p/hx-0.4.11
+++ b/metadata/md5-cache/net-p2p/hx-0.4.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) >=sys-libs/zlib-1.1.4 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) >=sys-libs/zlib-1.1.4 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=This is a Hotline 1.5+ compatible *nix Hotline Client in CLI. It supports IRC compatibility.
 HOMEPAGE=http://hotlinex.sf.net/
 IUSE=ssl
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) >=sys-libs/zlib-1.1.4
 SLOT=0
 SRC_URI=http://projects.acidbeats.de/mhxd-0.4.11.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=37589da77b5cd196faa7c3cff1b22943
diff --git a/metadata/md5-cache/net-p2p/lopster-1.2.2-r3 b/metadata/md5-cache/net-p2p/lopster-1.2.2-r3
index 509937e7d1f6..c305560c62b4 100644
--- a/metadata/md5-cache/net-p2p/lopster-1.2.2-r3
+++ b/metadata/md5-cache/net-p2p/lopster-1.2.2-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND==x11-libs/gtk+-1.2* nls? ( sys-devel/gettext ) zlib? ( sys-libs/zlib ) flac? ( media-libs/flac ) vorbis? ( >=media-libs/libvorbis-1.0 ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==x11-libs/gtk+-1.2* nls? ( sys-devel/gettext ) zlib? ( sys-libs/zlib ) flac? ( media-libs/flac ) vorbis? ( >=media-libs/libvorbis-1.0 ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Napster Client using GTK
 HOMEPAGE=http://lopster.sourceforge.net
 IUSE=nls vorbis zlib flac
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==x11-libs/gtk+-1.2* nls? ( sys-devel/gettext ) zlib? ( sys-libs/zlib ) flac? ( media-libs/flac ) vorbis? ( >=media-libs/libvorbis-1.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/lopster/lopster-1.2.2.tar.gz mirror://gentoo/lopster-1.2.2-bugfixes-4.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eac172d3259350cdcec4baa4fe2bd3db
diff --git a/metadata/md5-cache/net-p2p/microdc2-0.15.6-r2 b/metadata/md5-cache/net-p2p/microdc2-0.15.6-r2
index 8cd42fb2becc..672a73f76d0a 100644
--- a/metadata/md5-cache/net-p2p/microdc2-0.15.6-r2
+++ b/metadata/md5-cache/net-p2p/microdc2-0.15.6-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=app-arch/bzip2 >=dev-libs/libxml2-2.6.16 sys-libs/ncurses >=sys-libs/readline-4 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/bzip2 >=dev-libs/libxml2-2.6.16 sys-libs/ncurses >=sys-libs/readline-4 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A small command-line based Direct Connect client
 HOMEPAGE=http://corsair626.no-ip.org/microdc/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 >=dev-libs/libxml2-2.6.16 sys-libs/ncurses >=sys-libs/readline-4
 SLOT=0
 SRC_URI=http://corsair626.no-ip.org/microdc/microdc2-0.15.6.tar.gz mirror://debian/pool/main/m/microdc2/microdc2_0.15.6-1.debian.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4ce69ff1059f221da9a13077dcde21ee
diff --git a/metadata/md5-cache/net-p2p/mldonkey-3.0.5 b/metadata/md5-cache/net-p2p/mldonkey-3.0.5
index a423ecc82822..df05065206d0 100644
--- a/metadata/md5-cache/net-p2p/mldonkey-3.0.5
+++ b/metadata/md5-cache/net-p2p/mldonkey-3.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MLDonkey is a multi-network P2P application written in Ocaml, coming with its own Gtk GUI, web and telnet interface.
 EAPI=2
 HOMEPAGE=http://mldonkey.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mldonkey/mldonkey-3.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3533df05ef88edaf02bc1e3fed6b05bf
diff --git a/metadata/md5-cache/net-p2p/mldonkey-3.0.7 b/metadata/md5-cache/net-p2p/mldonkey-3.0.7
index 15266b14037e..54915eeec3cd 100644
--- a/metadata/md5-cache/net-p2p/mldonkey-3.0.7
+++ b/metadata/md5-cache/net-p2p/mldonkey-3.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MLDonkey is a multi-network P2P application written in Ocaml, coming with its own Gtk GUI, web and telnet interface.
 EAPI=2
 HOMEPAGE=http://mldonkey.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mldonkey/mldonkey-3.0.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d7f39fb52597622367f3e223255d8567
diff --git a/metadata/md5-cache/net-p2p/mldonkey-3.1.0 b/metadata/md5-cache/net-p2p/mldonkey-3.1.0
index 10bed2ff4f38..b2e53a7559fb 100644
--- a/metadata/md5-cache/net-p2p/mldonkey-3.1.0
+++ b/metadata/md5-cache/net-p2p/mldonkey-3.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MLDonkey is a multi-network P2P application written in Ocaml, coming with its own Gtk GUI, web and telnet interface.
 EAPI=2
 HOMEPAGE=http://mldonkey.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mldonkey/mldonkey-3.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ccde0da131747410cf00e08de9f9e3f7
diff --git a/metadata/md5-cache/net-p2p/mldonkey-3.1.3 b/metadata/md5-cache/net-p2p/mldonkey-3.1.3
index a40250381335..67c76593cbc9 100644
--- a/metadata/md5-cache/net-p2p/mldonkey-3.1.3
+++ b/metadata/md5-cache/net-p2p/mldonkey-3.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MLDonkey is a multi-network P2P application written in Ocaml, coming with its own Gtk GUI, web and telnet interface.
 EAPI=2
 HOMEPAGE=http://mldonkey.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mldonkey/mldonkey-3.1.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=95860a0bf92562ed9f979be859695e8d
diff --git a/metadata/md5-cache/net-p2p/ncdc-9999 b/metadata/md5-cache/net-p2p/ncdc-9999
index eac2843e9b37..7bb91e3af9bb 100644
--- a/metadata/md5-cache/net-p2p/ncdc-9999
+++ b/metadata/md5-cache/net-p2p/ncdc-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2:2 net-libs/gnutls sys-libs/gdbm sys-libs/ncurses:5 virtual/pkgconfig dev-util/makeheaders || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2:2 net-libs/gnutls sys-libs/gdbm sys-libs/ncurses:5 virtual/pkgconfig dev-util/makeheaders || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=ncurses directconnect client
 EAPI=4
 HOMEPAGE=http://dev.yorhel.nl/ncdc
 LICENSE=MIT
 RDEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2:2 net-libs/gnutls sys-libs/gdbm sys-libs/ncurses:5
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=54af5af7e49004ea7b5ca9721ca533c0
diff --git a/metadata/md5-cache/net-p2p/opendchub-0.8.2 b/metadata/md5-cache/net-p2p/opendchub-0.8.2
index bd989ef2a3ae..31e7b3008126 100644
--- a/metadata/md5-cache/net-p2p/opendchub-0.8.2
+++ b/metadata/md5-cache/net-p2p/opendchub-0.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=perl? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=perl? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=hub software for Direct Connect
 EAPI=4
 HOMEPAGE=http://opendchub.sf.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=mirror://sourceforge/opendchub/opendchub-0.8.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4c3858351d313aa40c94c831d2df59b6
diff --git a/metadata/md5-cache/net-p2p/rtorrent-0.8.9 b/metadata/md5-cache/net-p2p/rtorrent-0.8.9
index 8cf984acb15c..82fb31c03657 100644
--- a/metadata/md5-cache/net-p2p/rtorrent-0.8.9
+++ b/metadata/md5-cache/net-p2p/rtorrent-0.8.9
@@ -10,5 +10,5 @@ RDEPEND=~net-libs/libtorrent-0.12.9 >=dev-libs/libsigc++-2.2.2:2 >=net-misc/curl
 RESTRICT=test
 SLOT=0
 SRC_URI=http://libtorrent.rakshasa.no/downloads/rtorrent-0.8.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7732c6a9f75c3a912372c58f9bf62a38
diff --git a/metadata/md5-cache/net-p2p/soulseek-qt-20130310 b/metadata/md5-cache/net-p2p/soulseek-qt-20130410
similarity index 66%
rename from metadata/md5-cache/net-p2p/soulseek-qt-20130310
rename to metadata/md5-cache/net-p2p/soulseek-qt-20130410
index eb160253ece4..8b315615b5da 100644
--- a/metadata/md5-cache/net-p2p/soulseek-qt-20130310
+++ b/metadata/md5-cache/net-p2p/soulseek-qt-20130410
@@ -7,5 +7,5 @@ LICENSE=free-noncomm
 RDEPEND=dev-qt/qtgui:4 dev-qt/qtcore:4
 RESTRICT=mirror
 SLOT=0
-SRC_URI=x86? ( http://www.soulseekqt.net/SoulseekQT/Linux/SoulseekQt-2013-3-10.tgz ) amd64? ( http://www.soulseekqt.net/SoulseekQT/Linux/SoulseekQt-2013-3-10-64bit.tgz )
-_md5_=88dbb5dc005331bd4a9fa02f8053d5d5
+SRC_URI=x86? ( http://www.soulseekqt.net/SoulseekQT/Linux/SoulseekQt-2013-4-10.tgz ) amd64? ( http://www.soulseekqt.net/SoulseekQT/Linux/SoulseekQt-2013-4-10-64bit.tgz )
+_md5_=ac24bf8df70df6c6b114f6228be30742
diff --git a/metadata/md5-cache/net-p2p/syrep-0.9 b/metadata/md5-cache/net-p2p/syrep-0.9
index 51abb93c60fd..823c3ecee903 100644
--- a/metadata/md5-cache/net-p2p/syrep-0.9
+++ b/metadata/md5-cache/net-p2p/syrep-0.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/zlib >=sys-libs/db-4.3 doc? ( www-client/lynx ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib >=sys-libs/db-4.3 doc? ( www-client/lynx ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A generic file repository synchronization tool
 EAPI=2
 HOMEPAGE=http://0pointer.de/lennart/projects/syrep/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib >=sys-libs/db-4.3 doc? ( www-client/lynx )
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/syrep/syrep-0.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=52782a8dff9581e0d08478e9e41167ae
diff --git a/metadata/md5-cache/net-p2p/torrentinfo-1.8.4 b/metadata/md5-cache/net-p2p/torrentinfo-1.8.4
new file mode 100644
index 000000000000..465716a017d6
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/torrentinfo-1.8.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-)] test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-)]
+DESCRIPTION=A torrent file parser
+EAPI=5
+HOMEPAGE=https://github.com/ShanaTsunTsunLove/torrentinfo
+IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-)]
+SLOT=0
+SRC_URI=https://github.com/ShanaTsunTsunLove/torrentinfo/archive/v1.8.4.tar.gz -> torrentinfo-1.8.4.tar.gz
+_eclasses_=distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1673d98ece76493b67eed44801c15bfc
diff --git a/metadata/md5-cache/net-p2p/transmission-2.73 b/metadata/md5-cache/net-p2p/transmission-2.73
index 31cd77ead337..5901ff291f86 100644
--- a/metadata/md5-cache/net-p2p/transmission-2.73
+++ b/metadata/md5-cache/net-p2p/transmission-2.73
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-libs/libnatpmp >=net-libs/miniupnpc-1.6.20120509 >=net-misc/curl-7.16.3[ssl] sys-libs/zlib gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.28 >=x11-libs/gtk+-3.4:3 ayatana? ( >=dev-libs/libappindicator-0.4.90:3 ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[dbus] ) >=dev-libs/glib-2 dev-util/intltool virtual/pkgconfig sys-devel/gettext virtual/os-headers xfs? ( sys-fs/xfsprogs ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-libs/libnatpmp >=net-libs/miniupnpc-1.6.20120509 >=net-misc/curl-7.16.3[ssl] sys-libs/zlib gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.28 >=x11-libs/gtk+-3.4:3 ayatana? ( >=dev-libs/libappindicator-0.4.90:3 ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[dbus] ) >=dev-libs/glib-2 dev-util/intltool virtual/pkgconfig sys-devel/gettext virtual/os-headers xfs? ( sys-fs/xfsprogs ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A Fast, Easy and Free BitTorrent client
 EAPI=5
 HOMEPAGE=http://www.transmissionbt.com/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-libs/libnatpmp >=net-l
 REQUIRED_USE=ayatana? ( gtk )
 SLOT=0
 SRC_URI=http://download.transmissionbt.com/transmission/files/transmission-2.73.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3821c2819b58398c7bf96d4bd817992c
diff --git a/metadata/md5-cache/net-p2p/transmission-2.76 b/metadata/md5-cache/net-p2p/transmission-2.76
index 7560d058e2d7..fed102f1f736 100644
--- a/metadata/md5-cache/net-p2p/transmission-2.76
+++ b/metadata/md5-cache/net-p2p/transmission-2.76
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-libs/libnatpmp >=net-libs/miniupnpc-1.6.20120509 >=net-misc/curl-7.16.3[ssl] sys-libs/zlib gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.28 >=x11-libs/gtk+-3.4:3 ayatana? ( >=dev-libs/libappindicator-0.4.90:3 ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[dbus] ) >=dev-libs/glib-2 dev-util/intltool sys-devel/gettext virtual/os-headers virtual/pkgconfig xfs? ( sys-fs/xfsprogs ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-libs/libnatpmp >=net-libs/miniupnpc-1.6.20120509 >=net-misc/curl-7.16.3[ssl] sys-libs/zlib gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.28 >=x11-libs/gtk+-3.4:3 ayatana? ( >=dev-libs/libappindicator-0.4.90:3 ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[dbus] ) >=dev-libs/glib-2 dev-util/intltool sys-devel/gettext virtual/os-headers virtual/pkgconfig xfs? ( sys-fs/xfsprogs ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A Fast, Easy and Free BitTorrent client
 EAPI=5
 HOMEPAGE=http://www.transmissionbt.com/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-libs/libnatpmp >=net-l
 REQUIRED_USE=ayatana? ( gtk )
 SLOT=0
 SRC_URI=http://download.transmissionbt.com/transmission/files/transmission-2.76.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=34d2a94cb4621bb55e13979ebe015efb
diff --git a/metadata/md5-cache/net-p2p/transmission-2.77 b/metadata/md5-cache/net-p2p/transmission-2.77
index 812c8e3f6b45..51f608f65541 100644
--- a/metadata/md5-cache/net-p2p/transmission-2.77
+++ b/metadata/md5-cache/net-p2p/transmission-2.77
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/libevent-2.0.10:= dev-libs/openssl:0= net-libs/libnatpmp:= >=net-libs/miniupnpc-1.6.20120509:= >=net-misc/curl-7.16.3:=[ssl] sys-libs/zlib:= gtk? ( >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.28:2= >=x11-libs/gtk+-3.4:3= ayatana? ( >=dev-libs/libappindicator-0.4.90:3= ) ) qt4? ( dev-qt/qtcore:4= dev-qt/qtgui:4=[dbus] ) dev-libs/glib:2 dev-util/intltool sys-devel/gettext virtual/os-headers virtual/pkgconfig xfs? ( sys-fs/xfsprogs ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=dev-libs/libevent-2.0.10:= dev-libs/openssl:0= net-libs/libnatpmp:= >=net-libs/miniupnpc-1.6.20120509:= >=net-misc/curl-7.16.3:=[ssl] sys-libs/zlib:= gtk? ( >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.28:2= >=x11-libs/gtk+-3.4:3= ayatana? ( >=dev-libs/libappindicator-0.4.90:3= ) ) qt4? ( dev-qt/qtcore:4= dev-qt/qtgui:4=[dbus] ) dev-libs/glib:2 dev-util/intltool sys-devel/gettext virtual/os-headers virtual/pkgconfig xfs? ( sys-fs/xfsprogs ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A Fast, Easy and Free BitTorrent client
 EAPI=5
 HOMEPAGE=http://www.transmissionbt.com/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libevent-2.0.10:= dev-libs/openssl:0= net-libs/libnatpmp:= >=
 REQUIRED_USE=ayatana? ( gtk )
 SLOT=0
 SRC_URI=http://download.transmissionbt.com/transmission/files/transmission-2.77.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6242a2c2d7f6a1d9eb54d6f39e4d3e01
diff --git a/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.1 b/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.1
index 85a19d551d16..8b3bbdf0dd6e 100644
--- a/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.1
+++ b/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32 >=dev-libs/json-glib-0.12.6 net-misc/curl >=x11-libs/gtk+-3.4:3 ayatana? ( dev-libs/libappindicator:3 ) geoip? ( dev-libs/geoip ) libnotify? ( >=x11-libs/libnotify-0.7 ) libproxy? ( net-libs/libproxy ) dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.32 >=dev-libs/json-glib-0.12.6 net-misc/curl >=x11-libs/gtk+-3.4:3 ayatana? ( dev-libs/libappindicator:3 ) geoip? ( dev-libs/geoip ) libnotify? ( >=x11-libs/libnotify-0.7 ) libproxy? ( net-libs/libproxy ) dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=GTK+ client for management of the Transmission BitTorrent client, over HTTP RPC
 EAPI=4
 HOMEPAGE=http://code.google.com/p/transmission-remote-gtk
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.32 >=dev-libs/json-glib-0.12.6 net-misc/curl >=x11-lib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://transmission-remote-gtk.googlecode.com/files/transmission-remote-gtk-1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f04157e6424d311429d222aa5d5f52d9
diff --git a/metadata/md5-cache/net-print/cups-1.5.0 b/metadata/md5-cache/net-print/cups-1.5.0
index dc1ca74e8ed7..3883c9f81fa2 100644
--- a/metadata/md5-cache/net-print/cups-1.5.0
+++ b/metadata/md5-cache/net-print/cups-1.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=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 ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( gnutls? ( dev-libs/libgcrypt >=net-libs/gnutls-2.11 ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) tiff? ( >=media-libs/tiff-3.5.5 ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) !net-print/cupsddk dev-util/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=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 )
+DEPEND=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 ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( gnutls? ( dev-libs/libgcrypt >=net-libs/gnutls-2.11 ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) tiff? ( >=media-libs/tiff-3.5.5 ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) !net-print/cupsddk dev-util/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 )
 DESCRIPTION=The Common Unix Printing System
 EAPI=3
 HOMEPAGE=http://www.cups.org/
@@ -10,5 +10,5 @@ RDEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://easysw/cups/1.5.0/cups-1.5.0-source.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=09444e2bca6b8c48745369483bd1b602
diff --git a/metadata/md5-cache/net-print/cups-1.5.2-r4 b/metadata/md5-cache/net-print/cups-1.5.2-r4
index fa4ce0e879db..ad4c33e992f9 100644
--- a/metadata/md5-cache/net-print/cups-1.5.2-r4
+++ b/metadata/md5-cache/net-print/cups-1.5.2-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) avahi? ( net-dns/avahi ) 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 ) selinux? ( sec-policy/selinux-cups ) 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/cups-filters virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=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* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) avahi? ( net-dns/avahi ) 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 ) selinux? ( sec-policy/selinux-cups ) 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/cups-filters virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=The Common Unix Printing System
 EAPI=4
 HOMEPAGE=http://www.cups.org/
@@ -12,5 +12,5 @@ REQUIRED_USE=gnutls? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=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 http://dev.gentoo.org/~dilfridge/distfiles/cups-1.5.2-avahi.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=73dbc326e37be0e9cd33629135aac4f8
diff --git a/metadata/md5-cache/net-print/cups-1.5.3 b/metadata/md5-cache/net-print/cups-1.5.3
index 315300d1c5ad..4326ec2f6886 100644
--- a/metadata/md5-cache/net-print/cups-1.5.3
+++ b/metadata/md5-cache/net-print/cups-1.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) avahi? ( net-dns/avahi ) 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 ) selinux? ( sec-policy/selinux-cups ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) systemd? ( sys-apps/systemd ) tiff? ( >=media-libs/tiff-3.5.5:0 ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) !net-print/cups-filters virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=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* ) ) java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
+DEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) avahi? ( net-dns/avahi ) 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 ) selinux? ( sec-policy/selinux-cups ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) systemd? ( sys-apps/systemd ) tiff? ( >=media-libs/tiff-3.5.5:0 ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) !net-print/cups-filters virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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* ) ) java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
 DESCRIPTION=The Common Unix Printing System
 EAPI=4
 HOMEPAGE=http://www.cups.org/
@@ -12,5 +12,5 @@ REQUIRED_USE=gnutls? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://easysw/cups/1.5.3/cups-1.5.3-source.tar.bz2 http://dev.gentoo.org/~dilfridge/distfiles/cups-1.5.3-avahi.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=97115beefa50a7fd3197e70daf5c1e51
diff --git a/metadata/md5-cache/net-print/cups-1.6.2-r3 b/metadata/md5-cache/net-print/cups-1.6.2-r3
index ac8b3db7e0c5..07c2995efaae 100644
--- a/metadata/md5-cache/net-print/cups-1.6.2-r3
+++ b/metadata/md5-cache/net-print/cups-1.6.2-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) kerberos? ( virtual/krb5 ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-cups ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( net-dns/avahi ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=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* ) ) java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
+DEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) kerberos? ( virtual/krb5 ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-cups ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( net-dns/avahi ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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* ) ) java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
 DESCRIPTION=The Common Unix Printing System
 EAPI=5
 HOMEPAGE=http://www.cups.org/
@@ -12,5 +12,5 @@ REQUIRED_USE=gnutls? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://easysw/cups/1.6.2/cups-1.6.2-source.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9bc89310dd1f8833704d2bf2a4870983
diff --git a/metadata/md5-cache/net-print/cups-9999 b/metadata/md5-cache/net-print/cups-9999
index 806766bc76f5..8bcae1e90226 100644
--- a/metadata/md5-cache/net-print/cups-9999
+++ b/metadata/md5-cache/net-print/cups-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) kerberos? ( virtual/krb5 ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-cups ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( net-dns/avahi ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=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* ) ) java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) kerberos? ( virtual/krb5 ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-cups ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( net-dns/avahi ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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* ) ) java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=The Common Unix Printing System
 EAPI=5
 HOMEPAGE=http://www.cups.org/
@@ -10,5 +10,5 @@ RDEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 REQUIRED_USE=gnutls? ( ssl )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	subversion	877d251a42b69543c01f6a36b4707b3b	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	subversion	877d251a42b69543c01f6a36b4707b3b	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6ccb916078a73c6810b64d4c6ad65f81
diff --git a/metadata/md5-cache/net-print/cups-filters-1.0.30 b/metadata/md5-cache/net-print/cups-filters-1.0.30
index 400d28e5f5f4..f5a405625a45 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.0.30
+++ b/metadata/md5-cache/net-print/cups-filters-1.0.30
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=app-text/ghostscript-gpl app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)] >=app-text/qpdf-3.0.2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >net-print/cups-1.5.9999 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib jpeg? ( virtual/jpeg ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff ) zeroconf? ( net-dns/avahi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-text/ghostscript-gpl app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)] >=app-text/qpdf-3.0.2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >net-print/cups-1.5.9999 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib jpeg? ( virtual/jpeg ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff ) zeroconf? ( net-dns/avahi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Cups PDF filters
 EAPI=5
 HOMEPAGE=http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat
@@ -9,5 +9,5 @@ LICENSE=MIT GPL-2
 RDEPEND=app-text/ghostscript-gpl app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)] >=app-text/qpdf-3.0.2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >net-print/cups-1.5.9999 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib jpeg? ( virtual/jpeg ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff ) zeroconf? ( net-dns/avahi )
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.0.30.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=21c63e82a2f682e0685e28a0a7bf58ce
diff --git a/metadata/md5-cache/net-print/cups-filters-9999-r1 b/metadata/md5-cache/net-print/cups-filters-9999-r1
index 9411bb7bba37..4284030a8b26 100644
--- a/metadata/md5-cache/net-print/cups-filters-9999-r1
+++ b/metadata/md5-cache/net-print/cups-filters-9999-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=app-text/ghostscript-gpl app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)] >=app-text/qpdf-3.0.2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >net-print/cups-1.5.9999 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib jpeg? ( virtual/jpeg ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff ) zeroconf? ( net-dns/avahi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/bzr-2.0.1
+DEPEND=app-text/ghostscript-gpl app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)] >=app-text/qpdf-3.0.2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >net-print/cups-1.5.9999 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib jpeg? ( virtual/jpeg ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff ) zeroconf? ( net-dns/avahi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/bzr-2.0.1
 DESCRIPTION=Cups PDF filters
 EAPI=5
 HOMEPAGE=http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat
@@ -7,5 +7,5 @@ IUSE=jpeg perl png static-libs tiff zeroconf
 LICENSE=MIT GPL-2
 RDEPEND=app-text/ghostscript-gpl app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)] >=app-text/qpdf-3.0.2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >net-print/cups-1.5.9999 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib jpeg? ( virtual/jpeg ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff ) zeroconf? ( net-dns/avahi )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bzr	876798528c0cd872742b74bf784738cf	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bzr	876798528c0cd872742b74bf784738cf	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4deda64f8dc48abb0f0b51521376819d
diff --git a/metadata/md5-cache/net-print/dymo-cups-drivers-1.2.0 b/metadata/md5-cache/net-print/dymo-cups-drivers-1.2.0
index e206c5ed0757..85e1485d2e33 100644
--- a/metadata/md5-cache/net-print/dymo-cups-drivers-1.2.0
+++ b/metadata/md5-cache/net-print/dymo-cups-drivers-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=net-print/cups test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-print/cups test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Dymo SDK for LabelWriter/LabelManager printers
 EAPI=4
 HOMEPAGE=http://sites.dymo.com/DeveloperProgram/Pages/LW_SDK_Linux.aspx
@@ -10,5 +10,5 @@ RDEPEND=net-print/cups
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.dymo.com/Download%20Drivers/Linux/Download/dymo-cups-drivers-1.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7ef10b8a9fa271cccb6fff864b8f2409
diff --git a/metadata/md5-cache/net-print/dymo-cups-drivers-1.4.0 b/metadata/md5-cache/net-print/dymo-cups-drivers-1.4.0
index 828b3440849f..695e17f4c460 100644
--- a/metadata/md5-cache/net-print/dymo-cups-drivers-1.4.0
+++ b/metadata/md5-cache/net-print/dymo-cups-drivers-1.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=net-print/cups test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-print/cups test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Dymo SDK for LabelWriter/LabelManager printers
 EAPI=5
 HOMEPAGE=http://sites.dymo.com/DeveloperProgram/Pages/LW_SDK_Linux.aspx
@@ -10,5 +10,5 @@ RDEPEND=net-print/cups
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.dymo.com/Download%20Drivers/Linux/Download/dymo-cups-drivers-1.4.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6744b09376ec599d60fcb1d110dc7793
diff --git a/metadata/md5-cache/net-print/foomatic-filters-4.0.17 b/metadata/md5-cache/net-print/foomatic-filters-4.0.17
index 4b2e715bce69..9956f8ec9559 100644
--- a/metadata/md5-cache/net-print/foomatic-filters-4.0.17
+++ b/metadata/md5-cache/net-print/foomatic-filters-4.0.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/perl app-text/ghostscript-gpl cups? ( || ( ( >=net-print/cups-1.6.0 net-print/cups-filters ) <net-print/cups-1.6.0 ) ) !cups? ( || ( app-text/enscript app-text/a2ps app-text/mpage ) ) dbus? ( sys-apps/dbus ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl app-text/ghostscript-gpl cups? ( || ( ( >=net-print/cups-1.6.0 net-print/cups-filters ) <net-print/cups-1.6.0 ) ) !cups? ( || ( app-text/enscript app-text/a2ps app-text/mpage ) ) dbus? ( sys-apps/dbus ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Foomatic wrapper scripts
 EAPI=4
 HOMEPAGE=http://www.linuxprinting.org/foomatic.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl app-text/ghostscript-gpl cups? ( || ( ( >=net-print/cups-1.6.0 net-print/cups-filters ) <net-print/cups-1.6.0 ) ) !cups? ( || ( app-text/enscript app-text/a2ps app-text/mpage ) ) dbus? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/foomatic/foomatic-filters-4.0.17.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1fd9ae941229c2462258aa725ce2598a
diff --git a/metadata/md5-cache/net-print/gtklp-1.2.10 b/metadata/md5-cache/net-print/gtklp-1.2.10
index 40306586b117..391fa2302288 100644
--- a/metadata/md5-cache/net-print/gtklp-1.2.10
+++ b/metadata/md5-cache/net-print/gtklp-1.2.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/gtk+:2 >=net-print/cups-1.6 nls? ( sys-devel/gettext ) ssl? ( dev-libs/openssl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 >=net-print/cups-1.6 nls? ( sys-devel/gettext ) ssl? ( dev-libs/openssl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A GUI for cupsd
 EAPI=5
 HOMEPAGE=http://gtklp.sirtobi.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 >=net-print/cups-1.6 nls? ( sys-devel/gettext ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtklp/gtklp-1.2.10.src.tar.gz mirror://sourceforge/gtklp/logo.xpm.gz -> gtklp-logo.xpm.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ec7b3f2dbd95891e953c1238a774f932
diff --git a/metadata/md5-cache/net-print/gtklp-1.2.9 b/metadata/md5-cache/net-print/gtklp-1.2.9
index f71c5608af20..623451158dff 100644
--- a/metadata/md5-cache/net-print/gtklp-1.2.9
+++ b/metadata/md5-cache/net-print/gtklp-1.2.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/gtk+:2 >=net-print/cups-1.1.12 nls? ( sys-devel/gettext ) ssl? ( dev-libs/openssl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 >=net-print/cups-1.1.12 nls? ( sys-devel/gettext ) ssl? ( dev-libs/openssl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A GUI for cupsd
 EAPI=5
 HOMEPAGE=http://gtklp.sirtobi.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 >=net-print/cups-1.1.12 nls? ( sys-devel/gettext ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtklp/gtklp-1.2.9.src.tar.gz mirror://sourceforge/gtklp/logo.xpm.gz -> gtklp-logo.xpm.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=440ce271fb386f7326ea3b5b0f06666b
diff --git a/metadata/md5-cache/net-print/gutenprint-5.2.7-r1 b/metadata/md5-cache/net-print/gutenprint-5.2.7-r1
index c4a8649108f4..28cbfaecf3e7 100644
--- a/metadata/md5-cache/net-print/gutenprint-5.2.7-r1
+++ b/metadata/md5-cache/net-print/gutenprint-5.2.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-text/ghostscript-gpl dev-lang/perl readline? ( 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? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-text/ghostscript-gpl dev-lang/perl readline? ( 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? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Ghostscript and cups printer drivers
 EAPI=4
 HOMEPAGE=http://gutenprint.sourceforge.net
@@ -10,5 +10,5 @@ RDEPEND=app-text/ghostscript-gpl dev-lang/perl readline? ( sys-libs/readline ) c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/gimp-print/gutenprint-5.2.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=329b9d3a6a99d9674047589308b0e279
diff --git a/metadata/md5-cache/net-print/gutenprint-5.2.8 b/metadata/md5-cache/net-print/gutenprint-5.2.8
index de6c647260e9..94a802aeca47 100644
--- a/metadata/md5-cache/net-print/gutenprint-5.2.8
+++ b/metadata/md5-cache/net-print/gutenprint-5.2.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-text/ghostscript-gpl dev-lang/perl readline? ( 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? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-text/ghostscript-gpl dev-lang/perl readline? ( 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? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Ghostscript and cups printer drivers
 EAPI=4
 HOMEPAGE=http://gutenprint.sourceforge.net
@@ -11,5 +11,5 @@ REQUIRED_USE=gimp? ( gtk )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/gimp-print/gutenprint-5.2.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3301c76f49ef4fb96cc2b609992d00c6
diff --git a/metadata/md5-cache/net-print/gutenprint-5.2.9 b/metadata/md5-cache/net-print/gutenprint-5.2.9
index 439175d47803..6bc7d5ff551f 100644
--- a/metadata/md5-cache/net-print/gutenprint-5.2.9
+++ b/metadata/md5-cache/net-print/gutenprint-5.2.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-text/ghostscript-gpl dev-lang/perl readline? ( 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? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-text/ghostscript-gpl dev-lang/perl readline? ( 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? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Ghostscript and cups printer drivers
 EAPI=4
 HOMEPAGE=http://gutenprint.sourceforge.net
@@ -11,5 +11,5 @@ REQUIRED_USE=gimp? ( gtk )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/gimp-print/gutenprint-5.2.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=df423a73ac4bc5fa1fff22ec2531cbcc
diff --git a/metadata/md5-cache/net-print/hplip-3.12.10a b/metadata/md5-cache/net-print/hplip-3.12.10a
index ec37cbc83a19..a354d891e422 100644
--- a/metadata/md5-cache/net-print/hplip-3.12.10a
+++ b/metadata/md5-cache/net-print/hplip-3.12.10a
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) !minimal? ( >=net-print/cups-1.4.0 !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( sys-apps/dbus ) snmp? ( net-analyzer/net-snmp dev-libs/openssl:0 ) ) virtual/pkgconfig !minimal? ( =dev-lang/python-2* ) !minimal? ( =dev-lang/python-2*[threads,xml] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) !minimal? ( >=net-print/cups-1.4.0 !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( sys-apps/dbus ) snmp? ( net-analyzer/net-snmp dev-libs/openssl:0 ) ) virtual/pkgconfig !minimal? ( =dev-lang/python-2* ) !minimal? ( =dev-lang/python-2*[threads,xml] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools.
 EAPI=4
 HOMEPAGE=http://hplipopensource.com/hplip-web/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) !minimal? ( >=net-print/cups-1.4.0 !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( sys-apps/dbus ) snmp? ( net-analyzer/net-snmp dev-libs/openssl:0 ) ) >=app-text/ghostscript-gpl-8.71-r3 dev-python/dbus-python policykit? ( sys-auth/polkit ) !minimal? ( dev-python/pygobject:2 kernel_linux? ( virtual/udev !<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] )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.12.10a.tar.gz http://dev.gentoo.org/~billie/distfiles/hplip-3.12.10-patches-1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=72cacd47614d6f5ca9dd823cfec383af
diff --git a/metadata/md5-cache/net-print/hplip-3.13.2-r2 b/metadata/md5-cache/net-print/hplip-3.13.2-r2
index 2d25df79dbc0..6cf60cc480d4 100644
--- a/metadata/md5-cache/net-print/hplip-3.13.2-r2
+++ b/metadata/md5-cache/net-print/hplip-3.13.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) !minimal? ( python_single_target_python2_6? ( dev-lang/python:2.6[threads,xml] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=net-print/cups-1.4.0 !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( sys-apps/dbus ) snmp? ( net-analyzer/net-snmp dev-libs/openssl:0 ) ) virtual/pkgconfig virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) !minimal? ( python_single_target_python2_6? ( dev-lang/python:2.6[threads,xml] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=net-print/cups-1.4.0 !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( sys-apps/dbus ) snmp? ( net-analyzer/net-snmp dev-libs/openssl:0 ) ) virtual/pkgconfig virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools.
 EAPI=5
 HOMEPAGE=http://hplipopensource.com/hplip-web/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) !minimal? ( python_single_target_python2_6? ( dev-lang/python:2.6[threads,xml] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=net-print/cups-1.4.0 !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( sys-apps/dbus ) snmp? ( net-analyzer/net-snmp dev-libs/openssl:0 ) ) >=app-text/ghostscript-gpl-8.71-r3 >=dev-python/dbus-python-1.1.1-r1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] policykit? ( sys-auth/polkit ) !minimal? ( >=dev-python/pygobject-2.28.6-r53:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] kernel_linux? ( virtual/udev !<sys-fs/udev-114 ) scanner? ( >=dev-python/reportlab-2.6[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/imaging-1.1.7-r2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) fax? ( >=dev-python/reportlab-2.6[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/dbus-python-1.1.1-r1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) qt4? ( >=dev-python/PyQt4-4.9.6-r2[dbus,X,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] libnotify? ( >=dev-python/notify-python-0.1.1-r3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.13.2.tar.gz http://dev.gentoo.org/~billie/distfiles/hplip-3.12.10-patches-1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=19dab071e871883a561ae12b4872812a
diff --git a/metadata/md5-cache/net-print/hplip-3.13.3 b/metadata/md5-cache/net-print/hplip-3.13.3
index 12a9e245b7e1..6df4cd7916c4 100644
--- a/metadata/md5-cache/net-print/hplip-3.13.3
+++ b/metadata/md5-cache/net-print/hplip-3.13.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) !minimal? ( python_single_target_python2_6? ( dev-lang/python:2.6[threads,xml] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=net-print/cups-1.4.0 !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( >=sys-apps/dbus-1.6.8-r1 ) snmp? ( net-analyzer/net-snmp dev-libs/openssl:0 ) ) virtual/pkgconfig virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) !minimal? ( python_single_target_python2_6? ( dev-lang/python:2.6[threads,xml] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=net-print/cups-1.4.0 !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( >=sys-apps/dbus-1.6.8-r1 ) snmp? ( net-analyzer/net-snmp dev-libs/openssl:0 ) ) virtual/pkgconfig virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools.
 EAPI=5
 HOMEPAGE=http://hplipopensource.com/hplip-web/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) !minimal? ( python_single_target_python2_6? ( dev-lang/python:2.6[threads,xml] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=net-print/cups-1.4.0 !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( >=sys-apps/dbus-1.6.8-r1 ) snmp? ( net-analyzer/net-snmp dev-libs/openssl:0 ) ) >=app-text/ghostscript-gpl-8.71-r3 >=dev-python/dbus-python-1.1.1-r1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] policykit? ( sys-auth/polkit ) !minimal? ( >=dev-python/pygobject-2.28.6-r53:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] kernel_linux? ( virtual/udev !<sys-fs/udev-114 ) scanner? ( >=dev-python/reportlab-2.6[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/imaging-1.1.7-r2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) fax? ( >=dev-python/reportlab-2.6[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/dbus-python-1.1.1-r1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) qt4? ( >=dev-python/PyQt4-4.9.6-r2[dbus,X,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] libnotify? ( >=dev-python/notify-python-0.1.1-r3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.13.3.tar.gz http://dev.gentoo.org/~billie/distfiles/hplip-3.12.10-patches-1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b4337eb5bedcfb03f72b1c9e70db84b9
diff --git a/metadata/md5-cache/net-print/hplip-3.13.4 b/metadata/md5-cache/net-print/hplip-3.13.4
index 189f1910185d..0404274402bb 100644
--- a/metadata/md5-cache/net-print/hplip-3.13.4
+++ b/metadata/md5-cache/net-print/hplip-3.13.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) !minimal? ( python_single_target_python2_6? ( dev-lang/python:2.6[threads,xml] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=net-print/cups-1.4.0 !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( >=sys-apps/dbus-1.6.8-r1 ) snmp? ( net-analyzer/net-snmp dev-libs/openssl:0 ) ) virtual/pkgconfig virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) !minimal? ( python_single_target_python2_6? ( dev-lang/python:2.6[threads,xml] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=net-print/cups-1.4.0 !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( >=sys-apps/dbus-1.6.8-r1 ) snmp? ( net-analyzer/net-snmp dev-libs/openssl:0 ) ) virtual/pkgconfig virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools.
 EAPI=5
 HOMEPAGE=http://hplipopensource.com/hplip-web/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) !minimal? ( python_single_target_python2_6? ( dev-lang/python:2.6[threads,xml] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=net-print/cups-1.4.0 !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( >=sys-apps/dbus-1.6.8-r1 ) snmp? ( net-analyzer/net-snmp dev-libs/openssl:0 ) ) >=app-text/ghostscript-gpl-8.71-r3 >=dev-python/dbus-python-1.1.1-r1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] policykit? ( sys-auth/polkit ) !minimal? ( >=dev-python/pygobject-2.28.6-r53:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] kernel_linux? ( virtual/udev !<sys-fs/udev-114 ) scanner? ( >=dev-python/reportlab-2.6[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/imaging-1.1.7-r2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) fax? ( >=dev-python/reportlab-2.6[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/dbus-python-1.1.1-r1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) qt4? ( >=dev-python/PyQt4-4.9.6-r2[dbus,X,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] libnotify? ( >=dev-python/notify-python-0.1.1-r3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.13.4.tar.gz http://dev.gentoo.org/~billie/distfiles/hplip-3.12.10-patches-1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fbb4fa1aee1a949729ad4085f4c48037
diff --git a/metadata/md5-cache/net-print/libinklevel-0.8.0-r1 b/metadata/md5-cache/net-print/libinklevel-0.8.0-r1
index afaadca6ee9e..10c1c2e3793d 100644
--- a/metadata/md5-cache/net-print/libinklevel-0.8.0-r1
+++ b/metadata/md5-cache/net-print/libinklevel-0.8.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/libieee1284-0.2.11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/libieee1284-0.2.11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library to get the ink level of your printer
 EAPI=2
 HOMEPAGE=http://libinklevel.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/libieee1284-0.2.11
 SLOT=0
 SRC_URI=mirror://sourceforge/libinklevel/libinklevel-0.8.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=72d903bd23ac9d8e83059d66e513b429
diff --git a/metadata/md5-cache/net-proxy/bfilter-1.1.4-r1 b/metadata/md5-cache/net-proxy/bfilter-1.1.4-r1
index 91ea88dc627a..1a76cc471bd1 100644
--- a/metadata/md5-cache/net-proxy/bfilter-1.1.4-r1
+++ b/metadata/md5-cache/net-proxy/bfilter-1.1.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=sys-libs/zlib dev-libs/ace dev-libs/libsigc++:2 X? ( dev-cpp/gtkmm:2.4 ) dev-libs/boost dev-util/scons virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib dev-libs/ace dev-libs/libsigc++:2 X? ( dev-cpp/gtkmm:2.4 ) dev-libs/boost dev-util/scons virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An ad-filtering web proxy featuring an effective heuristic ad-detection algorithm
 EAPI=4
 HOMEPAGE=http://bfilter.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib dev-libs/ace dev-libs/libsigc++:2 X? ( dev-cpp/gtkmm:2.4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/bfilter/bfilter-1.1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=698f725b2d830867c4cf101aff00e0b9
diff --git a/metadata/md5-cache/net-proxy/c-icap-0.2.2 b/metadata/md5-cache/net-proxy/c-icap-0.2.2
index 510a44e5b98a..c8d178d199c1 100644
--- a/metadata/md5-cache/net-proxy/c-icap-0.2.2
+++ b/metadata/md5-cache/net-proxy/c-icap-0.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=berkdb? ( sys-libs/db ) ldap? ( net-nds/openldap ) sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=berkdb? ( sys-libs/db ) ldap? ( net-nds/openldap ) sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C Implementation of an ICAP server
 EAPI=4
 HOMEPAGE=http://c-icap.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=berkdb? ( sys-libs/db ) ldap? ( net-nds/openldap ) sys-libs/zlib sys-apps/openrc
 SLOT=0
 SRC_URI=mirror://sourceforge/c-icap/c_icap-0.2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cbd411cd2cde196e0f0fa07b2be3022a
diff --git a/metadata/md5-cache/net-proxy/dante-1.1.19-r4 b/metadata/md5-cache/net-proxy/dante-1.1.19-r4
index 08c461023908..57be337eb5c9 100644
--- a/metadata/md5-cache/net-proxy/dante-1.1.19-r4
+++ b/metadata/md5-cache/net-proxy/dante-1.1.19-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) selinux? ( sec-policy/selinux-dante ) userland_GNU? ( virtual/shadow ) sys-devel/flex sys-devel/bison >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) selinux? ( sec-policy/selinux-dante ) userland_GNU? ( virtual/shadow ) sys-devel/flex sys-devel/bison >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free socks4,5 and msproxy implementation
 HOMEPAGE=http://www.inet.no/dante/
 IUSE=tcpd debug selinux pam
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2
 RDEPEND=pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) selinux? ( sec-policy/selinux-dante ) userland_GNU? ( virtual/shadow )
 SLOT=0
 SRC_URI=ftp://ftp.inet.no/pub/socks/dante-1.1.19.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d0d3caacd7b6bbfe7a5071788d3d5ecb
diff --git a/metadata/md5-cache/net-proxy/dante-1.3.2 b/metadata/md5-cache/net-proxy/dante-1.3.2
index 3be0b0ec8e15..359c0f502592 100644
--- a/metadata/md5-cache/net-proxy/dante-1.3.2
+++ b/metadata/md5-cache/net-proxy/dante-1.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free socks4,5 and msproxy implementation
 EAPI=4
 HOMEPAGE=http://www.inet.no/dante/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-dante ) tcpd? ( sys-apps/tcp-wrappers ) userland_GNU? ( virtual/shadow )
 SLOT=0
 SRC_URI=ftp://ftp.inet.no/pub/socks/dante-1.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2e03a2fe9e66aac9e0257bad5b30432d
diff --git a/metadata/md5-cache/net-proxy/dante-1.3.2-r1 b/metadata/md5-cache/net-proxy/dante-1.3.2-r1
index 3a00e318b18c..336e145fff86 100644
--- a/metadata/md5-cache/net-proxy/dante-1.3.2-r1
+++ b/metadata/md5-cache/net-proxy/dante-1.3.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free socks4,5 and msproxy implementation
 EAPI=5
 HOMEPAGE=http://www.inet.no/dante/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-dante ) tcpd? ( sys-apps/tcp-wrappers ) userland_GNU? ( virtual/shadow )
 SLOT=0
 SRC_URI=ftp://ftp.inet.no/pub/socks/dante-1.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8647f8d092af9fd17edbf04d723a5db7
diff --git a/metadata/md5-cache/net-proxy/dante-1.4.0_pre1 b/metadata/md5-cache/net-proxy/dante-1.4.0_pre1
index 1ed58638b222..cc99f0ad8eca 100644
--- a/metadata/md5-cache/net-proxy/dante-1.4.0_pre1
+++ b/metadata/md5-cache/net-proxy/dante-1.4.0_pre1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free socks4,5 and msproxy implementation
 EAPI=5
 HOMEPAGE=http://www.inet.no/dante/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-dante ) tcpd? ( sys-apps/tcp-wrappers ) userland_GNU? ( virtual/shadow )
 SLOT=0
 SRC_URI=ftp://ftp.inet.no/pub/socks/dante-1.4.0-pre1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dbf41fe5760d93029777a9e436f10676
diff --git a/metadata/md5-cache/net-proxy/dante-1.4.0_pre1-r1 b/metadata/md5-cache/net-proxy/dante-1.4.0_pre1-r1
index deb2e29553d1..55e44f1a450a 100644
--- a/metadata/md5-cache/net-proxy/dante-1.4.0_pre1-r1
+++ b/metadata/md5-cache/net-proxy/dante-1.4.0_pre1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free socks4,5 and msproxy implementation
 EAPI=5
 HOMEPAGE=http://www.inet.no/dante/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-dante ) tcpd? ( sys-apps/tcp-wrappers ) userland_GNU? ( virtual/shadow )
 SLOT=0
 SRC_URI=ftp://ftp.inet.no/pub/socks/dante-1.4.0-pre1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=73144d82c0cabb49eb89e0bb9fed00d9
diff --git a/metadata/md5-cache/net-proxy/havp-0.92a-r1 b/metadata/md5-cache/net-proxy/havp-0.92a-r1
index a9e020b974da..06a7208943c7 100644
--- a/metadata/md5-cache/net-proxy/havp-0.92a-r1
+++ b/metadata/md5-cache/net-proxy/havp-0.92a-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=clamav? ( app-antivirus/clamav ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=clamav? ( app-antivirus/clamav ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HTTP AntiVirus Proxy
 EAPI=4
 HOMEPAGE=http://www.server-side.de/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=clamav? ( app-antivirus/clamav )
 SLOT=0
 SRC_URI=http://www.server-side.de/download/havp-0.92a.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cf29951c9341792515d9702be5381dde
diff --git a/metadata/md5-cache/net-proxy/nylon-1.21-r1 b/metadata/md5-cache/net-proxy/nylon-1.21-r1
index 1edf5eb2b30c..88f4c6790615 100644
--- a/metadata/md5-cache/net-proxy/nylon-1.21-r1
+++ b/metadata/md5-cache/net-proxy/nylon-1.21-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=dev-libs/libevent-0.6 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libevent-0.6 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A lightweight SOCKS proxy server
 EAPI=4
 HOMEPAGE=http://monkey.org/~marius/nylon/
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2
 RDEPEND=>=dev-libs/libevent-0.6
 SLOT=0
 SRC_URI=http://monkey.org/~marius/nylon/nylon-1.21.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7c4b7f21414aa0ba278e9ab86e82b1bd
diff --git a/metadata/md5-cache/net-proxy/oops-1.5.24_pre20050503-r2 b/metadata/md5-cache/net-proxy/oops-1.5.24_pre20050503-r2
index 30b0374fc8cf..8af51d9962c7 100644
--- a/metadata/md5-cache/net-proxy/oops-1.5.24_pre20050503-r2
+++ b/metadata/md5-cache/net-proxy/oops-1.5.24_pre20050503-r2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre >=sys-libs/db-3
 SLOT=0
 SRC_URI=http://zipper.paco.net/~igor/oops/oops-1.5.23.tar.gz mirror://gentoo/oops-1.5.24_pre20050503.patch.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2f3821db206b85bf2a39e836565d6ce4
diff --git a/metadata/md5-cache/net-proxy/oops-1.5.24_pre20050503-r4 b/metadata/md5-cache/net-proxy/oops-1.5.24_pre20050503-r4
index 31ae632ab88e..2446024333f7 100644
--- a/metadata/md5-cache/net-proxy/oops-1.5.24_pre20050503-r4
+++ b/metadata/md5-cache/net-proxy/oops-1.5.24_pre20050503-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=dev-libs/libpcre >=sys-libs/db-3 sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libpcre >=sys-libs/db-3 sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An advanced multithreaded caching web proxy
 EAPI=2
 HOMEPAGE=http://zipper.paco.net/~igor/oops.eng/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre >=sys-libs/db-3
 SLOT=0
 SRC_URI=http://zipper.paco.net/~igor/oops/oops-1.5.23.tar.gz mirror://gentoo/oops-1.5.24_pre20050503.patch.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bb49b5f61d7175b422e09499fd7445b4
diff --git a/metadata/md5-cache/net-proxy/privoxy-3.0.21 b/metadata/md5-cache/net-proxy/privoxy-3.0.21
index 55593e484b99..5c3900945101 100644
--- a/metadata/md5-cache/net-proxy/privoxy-3.0.21
+++ b/metadata/md5-cache/net-proxy/privoxy-3.0.21
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/libpcre zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libpcre zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A web proxy with advanced filtering capabilities for protecting privacy against Internet junk
 EAPI=4
 HOMEPAGE=http://www.privoxy.org http://sourceforge.net/projects/ijbswa/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-privoxy )
 SLOT=0
 SRC_URI=mirror://sourceforge/ijbswa/privoxy-3.0.21-stable-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=16192cf6bcaf310f78e6a7a980b6f80c
diff --git a/metadata/md5-cache/net-proxy/squid-3.1.23 b/metadata/md5-cache/net-proxy/squid-3.1.23
index f0a88d571d09..b966d89c3130 100644
--- a/metadata/md5-cache/net-proxy/squid-3.1.23
+++ b/metadata/md5-cache/net-proxy/squid-3.1.23
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=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:0 ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-devel/libtool sys-apps/ed test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:0 ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-devel/libtool sys-apps/ed test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A full-featured web proxy cache
 EAPI=4
 HOMEPAGE=http://www.squid-cache.org/
@@ -10,5 +10,5 @@ RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/op
 REQUIRED_USE=tproxy? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.23.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=884462a9a394bfbe194e10237400eb06
diff --git a/metadata/md5-cache/net-proxy/squid-3.2.9 b/metadata/md5-cache/net-proxy/squid-3.2.9
index 283549128513..c8f23b058fcb 100644
--- a/metadata/md5-cache/net-proxy/squid-3.2.9
+++ b/metadata/md5-cache/net-proxy/squid-3.2.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:2 ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 sys-devel/libtool dev-lang/perl sys-devel/libtool sys-apps/ed test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:2 ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 sys-devel/libtool dev-lang/perl sys-devel/libtool sys-apps/ed test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A full-featured web proxy cache
 EAPI=4
 HOMEPAGE=http://www.squid-cache.org/
@@ -10,5 +10,5 @@ RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/op
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.2/squid-3.2.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d18535988e1199b59ea6ddb46798f773
diff --git a/metadata/md5-cache/net-proxy/squid-3.2.9-r1 b/metadata/md5-cache/net-proxy/squid-3.2.9-r1
index eee43ce5db08..207d30572a0e 100644
--- a/metadata/md5-cache/net-proxy/squid-3.2.9-r1
+++ b/metadata/md5-cache/net-proxy/squid-3.2.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:2 ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 sys-devel/libtool dev-lang/perl sys-devel/libtool sys-apps/ed test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:2 ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 sys-devel/libtool dev-lang/perl sys-devel/libtool sys-apps/ed test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A full-featured web proxy cache
 EAPI=4
 HOMEPAGE=http://www.squid-cache.org/
@@ -10,5 +10,5 @@ RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/op
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.2/squid-3.2.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9676019108c43015be23a7a5eaf5ec88
diff --git a/metadata/md5-cache/net-proxy/squid-3.3.3 b/metadata/md5-cache/net-proxy/squid-3.3.3
index 967a62f8333f..ef94c33960bc 100644
--- a/metadata/md5-cache/net-proxy/squid-3.3.3
+++ b/metadata/md5-cache/net-proxy/squid-3.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:2 ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 sys-devel/libtool dev-lang/perl sys-devel/libtool sys-apps/ed test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:2 ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 sys-devel/libtool dev-lang/perl sys-devel/libtool sys-apps/ed test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A full-featured web proxy cache
 EAPI=5
 HOMEPAGE=http://www.squid-cache.org/
@@ -10,5 +10,5 @@ RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/op
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.3/squid-3.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=445f9ffa032b3821574614855e4661e1
diff --git a/metadata/md5-cache/net-proxy/squid-3.3.3-r1 b/metadata/md5-cache/net-proxy/squid-3.3.3-r1
index 2c6847860d52..f04fad7cc4f5 100644
--- a/metadata/md5-cache/net-proxy/squid-3.3.3-r1
+++ b/metadata/md5-cache/net-proxy/squid-3.3.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:2 ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 sys-devel/libtool dev-lang/perl sys-devel/libtool sys-apps/ed test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:2 ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 sys-devel/libtool dev-lang/perl sys-devel/libtool sys-apps/ed test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A full-featured web proxy cache
 EAPI=5
 HOMEPAGE=http://www.squid-cache.org/
@@ -10,5 +10,5 @@ RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/op
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.3/squid-3.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=09f76a20206acab93bb0051fc4c1329f
diff --git a/metadata/md5-cache/net-proxy/squidclamav-6.10 b/metadata/md5-cache/net-proxy/squidclamav-6.10
index 2f9c81fe6d1f..3df6eb68f76c 100644
--- a/metadata/md5-cache/net-proxy/squidclamav-6.10
+++ b/metadata/md5-cache/net-proxy/squidclamav-6.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=net-proxy/c-icap || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-proxy/c-icap || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HTTP Antivirus for Squid based on ClamAv and ICAP
 EAPI=4
 HOMEPAGE=http://squidclamav.darold.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=net-proxy/c-icap
 SLOT=0
 SRC_URI=mirror://sourceforge/squidclamav/squidclamav-6.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=7b130bba69b79938484dd3f3c29ab1aa
diff --git a/metadata/md5-cache/net-proxy/squidclamav-6.8 b/metadata/md5-cache/net-proxy/squidclamav-6.8
index fba16000f424..4fe3ce8f6078 100644
--- a/metadata/md5-cache/net-proxy/squidclamav-6.8
+++ b/metadata/md5-cache/net-proxy/squidclamav-6.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=net-proxy/c-icap || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-proxy/c-icap || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HTTP Antivirus for Squid based on ClamAv and ICAP
 EAPI=4
 HOMEPAGE=http://squidclamav.darold.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=net-proxy/c-icap
 SLOT=0
 SRC_URI=mirror://sourceforge/squidclamav/squidclamav-6.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=98284361374a11dec2f8f02faeed9f59
diff --git a/metadata/md5-cache/net-proxy/squidguard-1.4-r4 b/metadata/md5-cache/net-proxy/squidguard-1.4-r4
index 35d915257214..c1cd2678a2d6 100644
--- a/metadata/md5-cache/net-proxy/squidguard-1.4-r4
+++ b/metadata/md5-cache/net-proxy/squidguard-1.4-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/db-2 ldap? ( net-nds/openldap )
 SLOT=0
 SRC_URI=http://www.squidguard.org/Downloads/squidGuard-1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=99b20c8fae60d600e2b7f3e89e06a05a
diff --git a/metadata/md5-cache/net-proxy/tayga-0.9.2 b/metadata/md5-cache/net-proxy/tayga-0.9.2
index 4bc3aaaef77f..a1185817fb5c 100644
--- a/metadata/md5-cache/net-proxy/tayga-0.9.2
+++ b/metadata/md5-cache/net-proxy/tayga-0.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=out-of-kernel stateless NAT64 implementation based on TUN
 EAPI=3
 HOMEPAGE=http://www.litech.org/tayga/
@@ -7,5 +7,5 @@ KEYWORDS=amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.litech.org/tayga/tayga-0.9.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=8478c926ec61fa53d913ab0f00e4651c
diff --git a/metadata/md5-cache/net-proxy/tinyproxy-1.8.3 b/metadata/md5-cache/net-proxy/tinyproxy-1.8.3
index 014d3aaf31e4..37409d47aea2 100644
--- a/metadata/md5-cache/net-proxy/tinyproxy-1.8.3
+++ b/metadata/md5-cache/net-proxy/tinyproxy-1.8.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=!minimal? ( app-text/asciidoc ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!minimal? ( app-text/asciidoc ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A lightweight HTTP/SSL proxy
 EAPI=4
 HOMEPAGE=http://www.banu.com/tinyproxy/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ia64 ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.banu.com/pub/tinyproxy/1.8/tinyproxy-1.8.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b0293f1b340a99e7babd10a156855462
diff --git a/metadata/md5-cache/net-proxy/torsocks-1.2-r2 b/metadata/md5-cache/net-proxy/torsocks-1.2-r2
index c38cd469b0a4..1432a2d90851 100644
--- a/metadata/md5-cache/net-proxy/torsocks-1.2-r2
+++ b/metadata/md5-cache/net-proxy/torsocks-1.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Use most socks-friendly applications with Tor.
 EAPI=4
 HOMEPAGE=http://code.google.com/p/torsocks
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://torsocks.googlecode.com/files/torsocks-1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=46c99273886a3538243db6cee19762a3
diff --git a/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r3 b/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r3
index 9af2ea9400d5..9d6c44d20a85 100644
--- a/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r3
+++ b/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Transparent SOCKS v4 proxying library
 HOMEPAGE=http://tsocks.sourceforge.net/
 IUSE=tordns
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/tsocks/tsocks-1.8beta5.tar.gz tordns? ( mirror://gentoo/tsocks-1.8b5-tordns1-gentoo-r1.patch.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f1a7645bd828ab56dc9a179b7062ff58
diff --git a/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r4 b/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r4
index 119add574fe1..01b3f0d182b1 100644
--- a/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r4
+++ b/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Transparent SOCKS v4 proxying library
 HOMEPAGE=http://tsocks.sourceforge.net/
 IUSE=tordns
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/tsocks/tsocks-1.8beta5.tar.gz tordns? ( mirror://gentoo/tsocks-1.8b5-tordns1-gentoo-r1.patch.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b1f062308fdcefd2ae0dd298e3d39ca4
diff --git a/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r5 b/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r5
index 30a2cd09c42d..317de2f213fb 100644
--- a/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r5
+++ b/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Transparent SOCKS v4 proxying library
 EAPI=2
 HOMEPAGE=http://tsocks.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/tsocks/tsocks-1.8beta5.tar.gz tordns? ( mirror://gentoo/tsocks-1.8b5-tordns1-gentoo-r1.patch.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f709d8893f5eb1574990d712329c8de3
diff --git a/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r6 b/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r6
index 9919d5bdfe10..c6c90d1687d9 100644
--- a/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r6
+++ b/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Transparent SOCKS v4 proxying library
 EAPI=2
 HOMEPAGE=http://tsocks.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/tsocks/tsocks-1.8beta5.tar.gz tordns? ( http://dev.gentoo.org/~naota/patch/tsocks-1.8b5-tordns1-gentoo-r2.patch.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5418025dbe0ede2fe2a51067d4d1cf0c
diff --git a/metadata/md5-cache/net-proxy/ziproxy-3.1.3 b/metadata/md5-cache/net-proxy/ziproxy-3.1.3
index 302a4ade1f11..f393c7e50c3b 100644
--- a/metadata/md5-cache/net-proxy/ziproxy-3.1.3
+++ b/metadata/md5-cache/net-proxy/ziproxy-3.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=media-libs/giflib media-libs/libpng virtual/jpeg sys-libs/zlib jpeg2k? ( media-libs/jasper ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/giflib media-libs/libpng virtual/jpeg sys-libs/zlib jpeg2k? ( media-libs/jasper ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A forwarding, non-caching, compressing web proxy server
 EAPI=4
 HOMEPAGE=http://ziproxy.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/giflib media-libs/libpng virtual/jpeg sys-libs/zlib jpeg2k? ( media-libs/jasper ) xinetd? ( virtual/inetd )
 SLOT=0
 SRC_URI=mirror://sourceforge/ziproxy/ziproxy-3.1.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4781f0ebbf5886a6448b6823e4ee51ad
diff --git a/metadata/md5-cache/net-voip/linphone-3.1.1 b/metadata/md5-cache/net-voip/linphone-3.1.1
index be49cfd2bdde..ed7202c70a77 100644
--- a/metadata/md5-cache/net-voip/linphone-3.1.1
+++ b/metadata/md5-cache/net-voip/linphone-3.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=media-libs/mediastreamer-2.2.3_p1[video?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 <net-libs/libosip-4 <net-libs/libeXosip-4 >=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 ) virtual/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/mediastreamer-2.2.3_p1[video?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 <net-libs/libosip-4 <net-libs/libeXosip-4 >=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 ) virtual/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Video softphone based on the SIP protocol
 EAPI=2
 HOMEPAGE=http://www.linphone.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/mediastreamer-2.2.3_p1[video?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 <net-libs/libosip-4 <net-libs/libeXosip-4 >=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 )
 SLOT=0
 SRC_URI=http://download.savannah.nongnu.org/releases/linphone/stable/sources/linphone-3.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b2c9089887d57f64dbe7a0f1323ff696
diff --git a/metadata/md5-cache/net-voip/linphone-3.2.1-r2 b/metadata/md5-cache/net-voip/linphone-3.2.1-r2
index 184c20b0d539..ff528dc3d721 100644
--- a/metadata/md5-cache/net-voip/linphone-3.2.1-r2
+++ b/metadata/md5-cache/net-voip/linphone-3.2.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=media-libs/mediastreamer-2.3.0[video?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 <net-libs/libosip-4 <net-libs/libeXosip-4 >=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 ) virtual/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/mediastreamer-2.3.0[video?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 <net-libs/libosip-4 <net-libs/libeXosip-4 >=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 ) virtual/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Video softphone based on the SIP protocol
 EAPI=3
 HOMEPAGE=http://www.linphone.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/mediastreamer-2.3.0[video?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 <net-libs/libosip-4 <net-libs/libeXosip-4 >=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 )
 SLOT=0
 SRC_URI=http://download.savannah.nongnu.org/releases/linphone/stable/sources/linphone-3.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=019570a90dbb71446de06efb5e1d4448
diff --git a/metadata/md5-cache/net-voip/linphone-3.3.2 b/metadata/md5-cache/net-voip/linphone-3.3.2
index 4f954abd2bef..967b8301f127 100644
--- a/metadata/md5-cache/net-voip/linphone-3.3.2
+++ b/metadata/md5-cache/net-voip/linphone-3.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=media-libs/mediastreamer-2.6.0[video?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 <net-libs/libosip-4 <net-libs/libeXosip-4 >=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 ) virtual/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/mediastreamer-2.6.0[video?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 <net-libs/libosip-4 <net-libs/libeXosip-4 >=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 ) virtual/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Video softphone based on the SIP protocol
 EAPI=3
 HOMEPAGE=http://www.linphone.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/mediastreamer-2.6.0[video?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 <net-libs/libosip-4 <net-libs/libeXosip-4 >=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 )
 SLOT=0
 SRC_URI=mirror://nongnu/linphone/3.3.x/sources/linphone-3.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=07c1db56907df6fa0a890c62d17ebbb4
diff --git a/metadata/md5-cache/net-voip/linphone-3.4.3 b/metadata/md5-cache/net-voip/linphone-3.4.3
index db8c4a98d21b..03182e8b2b95 100644
--- a/metadata/md5-cache/net-voip/linphone-3.4.3
+++ b/metadata/md5-cache/net-voip/linphone-3.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=media-libs/mediastreamer-2.7.3[video?,ipv6?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 <net-libs/libosip-4 <net-libs/libeXosip-4 >=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 ) virtual/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/mediastreamer-2.7.3[video?,ipv6?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 <net-libs/libosip-4 <net-libs/libeXosip-4 >=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 ) virtual/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Video softphone based on the SIP protocol
 EAPI=4
 HOMEPAGE=http://www.linphone.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/mediastreamer-2.7.3[video?,ipv6?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 <net-libs/libosip-4 <net-libs/libeXosip-4 >=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 )
 SLOT=0
 SRC_URI=mirror://nongnu/linphone/3.4.x/sources/linphone-3.4.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7e13d06afca0f08cbff2d93386392261
diff --git a/metadata/md5-cache/net-voip/linphone-3.4.3-r1 b/metadata/md5-cache/net-voip/linphone-3.4.3-r1
index 3ef66ec89b05..6d529dc7ef80 100644
--- a/metadata/md5-cache/net-voip/linphone-3.4.3-r1
+++ b/metadata/md5-cache/net-voip/linphone-3.4.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=media-libs/mediastreamer-2.7.3[video?,ipv6?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 <net-libs/libosip-4 <net-libs/libeXosip-4 >=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 ) virtual/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/mediastreamer-2.7.3[video?,ipv6?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 <net-libs/libosip-4 <net-libs/libeXosip-4 >=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 ) virtual/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Video softphone based on the SIP protocol
 EAPI=4
 HOMEPAGE=http://www.linphone.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/mediastreamer-2.7.3[video?,ipv6?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 <net-libs/libosip-4 <net-libs/libeXosip-4 >=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 )
 SLOT=0
 SRC_URI=mirror://nongnu/linphone/3.4.x/sources/linphone-3.4.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1d60b218f5ea5e1ebece5e7166a4da7f
diff --git a/metadata/md5-cache/net-voip/linphone-3.5.2 b/metadata/md5-cache/net-voip/linphone-3.5.2
index 916dd413e145..230a0bd4382d 100644
--- a/metadata/md5-cache/net-voip/linphone-3.5.2
+++ b/metadata/md5-cache/net-voip/linphone-3.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=media-libs/mediastreamer-2.8.2[video?,ipv6?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 <net-libs/libosip-4 <net-libs/libeXosip-4 >=net-libs/libsoup-2.26 >=net-libs/ortp-0.20.0 gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 x11-libs/libnotify ) gsm-nonstandard? ( >=media-libs/mediastreamer-2.8.2[gsm] ) ncurses? ( sys-libs/readline sys-libs/ncurses ) ssl? ( dev-libs/openssl ) virtual/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/mediastreamer-2.8.2[video?,ipv6?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 <net-libs/libosip-4 <net-libs/libeXosip-4 >=net-libs/libsoup-2.26 >=net-libs/ortp-0.20.0 gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 x11-libs/libnotify ) gsm-nonstandard? ( >=media-libs/mediastreamer-2.8.2[gsm] ) ncurses? ( sys-libs/readline sys-libs/ncurses ) ssl? ( dev-libs/openssl ) virtual/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Video softphone based on the SIP protocol
 EAPI=4
 HOMEPAGE=http://www.linphone.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/mediastreamer-2.8.2[video?,ipv6?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 <net-libs/libosip-4 <net-libs/libeXosip-4 >=net-libs/libsoup-2.26 >=net-libs/ortp-0.20.0 gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 x11-libs/libnotify ) gsm-nonstandard? ( >=media-libs/mediastreamer-2.8.2[gsm] ) ncurses? ( sys-libs/readline sys-libs/ncurses ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://nongnu/linphone/3.5.x/sources/linphone-3.5.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6cb7ed3850bb43b0381d3c6b5dd2579f
diff --git a/metadata/md5-cache/net-voip/sflphone-0.9.8.4 b/metadata/md5-cache/net-voip/sflphone-0.9.8.4
index 29505295e590..03dbfd1930b0 100644
--- a/metadata/md5-cache/net-voip/sflphone-0.9.8.4
+++ b/metadata/md5-cache/net-voip/sflphone-0.9.8.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=SFLphone is a robust standards-compliant enterprise softphone, for desktop and embedded systems.
 EAPI=2
 HOMEPAGE=http://www.sflphone.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://www.elvanor.net/files/gentoo/sflphone-0.9.8.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=85186f065a2f0b85a9553269a0634420
diff --git a/metadata/md5-cache/net-voip/sflphone-1.0.1 b/metadata/md5-cache/net-voip/sflphone-1.0.1
index 38694a3ebccb..92e0c6925ed0 100644
--- a/metadata/md5-cache/net-voip/sflphone-1.0.1
+++ b/metadata/md5-cache/net-voip/sflphone-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=SFLphone is a robust standards-compliant enterprise softphone, for desktop and embedded systems.
 EAPI=3
 HOMEPAGE=http://www.sflphone.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://www.elvanor.net/files/gentoo/sflphone-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3af6831ac1d763bd50d88411c438c13c
diff --git a/metadata/md5-cache/net-voip/sflphone-1.0.1-r1 b/metadata/md5-cache/net-voip/sflphone-1.0.1-r1
index e369521a7a18..f2739e612c9f 100644
--- a/metadata/md5-cache/net-voip/sflphone-1.0.1-r1
+++ b/metadata/md5-cache/net-voip/sflphone-1.0.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=SFLphone is a robust standards-compliant enterprise softphone, for desktop and embedded systems.
 EAPI=3
 HOMEPAGE=http://www.sflphone.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://www.elvanor.net/files/gentoo/sflphone-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=da4e7cb475175beccfb84640c0db9b78
diff --git a/metadata/md5-cache/net-voip/telepathy-rakia-0.7.4 b/metadata/md5-cache/net-voip/telepathy-rakia-0.7.4
index 57704abedfc5..1a5126a7ebe2 100644
--- a/metadata/md5-cache/net-voip/telepathy-rakia-0.7.4
+++ b/metadata/md5-cache/net-voip/telepathy-rakia-0.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare setup
-DEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.30:2 >=net-libs/sofia-sip-1.12.11 >=net-libs/telepathy-glib-0.17.6 >=dev-libs/glib-2.30:2 sys-apps/dbus dev-libs/libxslt test? ( dev-python/twisted ) dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.30:2 >=net-libs/sofia-sip-1.12.11 >=net-libs/telepathy-glib-0.17.6 >=dev-libs/glib-2.30:2 sys-apps/dbus dev-libs/libxslt test? ( dev-python/twisted ) dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=A SIP connection manager for Telepathy based around the Sofia-SIP library
 EAPI=4
 HOMEPAGE=http://telepathy.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.30:2 >=net-libs/sofia-sip-1.12.11 >=net-libs/telepathy-glib-0.17.6 >=dev-libs/glib-2.30:2 sys-apps/dbus !net-voip/telepathy-sofiasip =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-rakia/telepathy-rakia-0.7.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=51192dad3a874a9eb0c233de1b3abd2c
diff --git a/metadata/md5-cache/net-voip/yate-2.0.0 b/metadata/md5-cache/net-voip/yate-2.0.0
index 8b6225b2d562..9314b6dbfd79 100644
--- a/metadata/md5-cache/net-voip/yate-2.0.0
+++ b/metadata/md5-cache/net-voip/yate-2.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=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? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) spandsp? ( >=media-libs/spandsp-0.0.3 ) speex? ( media-libs/speex ) ssl? ( dev-libs/openssl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) spandsp? ( >=media-libs/spandsp-0.0.3 ) speex? ( media-libs/speex ) ssl? ( dev-libs/openssl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Yet Another Telephony Engine
 EAPI=2
 HOMEPAGE=http://yate.null.ro/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) spandsp? ( >=media-libs/spandsp-0.0.3 ) speex? ( media-libs/speex ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=http://yate.null.ro/tarballs/yate2/yate-2.0.0-1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bbc930eedf2ff8b4e4f87a13665be207
diff --git a/metadata/md5-cache/net-wireless/gnome-bluetooth-2.32.0-r1 b/metadata/md5-cache/net-wireless/gnome-bluetooth-2.32.0-r1
index 1b838838abe7..e9fb7353763e 100644
--- a/metadata/md5-cache/net-wireless/gnome-bluetooth-2.32.0-r1
+++ b/metadata/md5-cache/net-wireless/gnome-bluetooth-2.32.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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:2 dev-util/intltool virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=>=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:2 dev-util/intltool virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Fork of bluez-gnome focused on integration with GNOME
 EAPI=4
 HOMEPAGE=http://live.gnome.org/GnomeBluetooth
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.26.1-r1:2 >=x11-libs/gtk+-2.19.1:2 >=x11-libs/libnotif
 REQUIRED_USE=test? ( !doc )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-bluetooth/2.32/gnome-bluetooth-2.32.0.tar.bz2 mirror://gentoo/introspection.m4.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7d315c4154bc68fd1517ea40a7300d02
diff --git a/metadata/md5-cache/net-wireless/gr-baz-9999 b/metadata/md5-cache/net-wireless/gr-baz-9999
index e89cc002097c..90e00b172acf 100644
--- a/metadata/md5-cache/net-wireless/gr-baz-9999
+++ b/metadata/md5-cache/net-wireless/gr-baz-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=net-wireless/gnuradio || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git =dev-lang/python-2*
+DEPEND=net-wireless/gnuradio || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git =dev-lang/python-2*
 DESCRIPTION=Gnuradio baz
 EAPI=4
 HOMEPAGE=http://wiki.spench.net/wiki/Gr-baz
 LICENSE=GPL-3
 RDEPEND=net-wireless/gnuradio =dev-lang/python-2*
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=e7680afc683a19837f0a8c1d7bf767db
diff --git a/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1 b/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1
index f3e6d2d6119a..b4afcbf551f3 100644
--- a/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1
+++ b/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=virtual/libusb:1 virtual/pkgconfig doc? ( app-text/asciidoc app-text/docbook2X ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=virtual/libusb:1 virtual/pkgconfig doc? ( app-text/asciidoc app-text/docbook2X ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=A reverse-engineered Linux driver for mobile WiMAX devices based on Samsung CMC-730 chip.
 EAPI=5
 HOMEPAGE=http://code.google.com/p/madwimax/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=http://madwimax.googlecode.com/files/madwimax-0.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3a9ca75a58cd706515edfa77e710e8dc
diff --git a/metadata/md5-cache/net-wireless/reaver-1.4 b/metadata/md5-cache/net-wireless/reaver-1.4
index 0cc5597f583a..d2e58f5744bd 100644
--- a/metadata/md5-cache/net-wireless/reaver-1.4
+++ b/metadata/md5-cache/net-wireless/reaver-1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libpcap dev-db/sqlite:3
 SLOT=0
 SRC_URI=http://reaver-wps.googlecode.com/files/reaver-1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=57a7857cf1d1201340a3aaf05753242c
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-9999 b/metadata/md5-cache/net-wireless/rtl-sdr-9999
index b48f0b4e1f34..89f3c8a9fbc8 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-9999
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=virtual/libusb:1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=virtual/libusb:1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=turns your Realtek RTL2832 based DVB dongle into a SDR receiver
 EAPI=4
 HOMEPAGE=http://sdr.osmocom.org/trac/wiki/rtl-sdr
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=67e7c06950a2575d52d3652ee654a68f
diff --git a/metadata/md5-cache/net-wireless/wavemon-0.7.5 b/metadata/md5-cache/net-wireless/wavemon-0.7.5
index 684419856ea2..c17e14ece088 100644
--- a/metadata/md5-cache/net-wireless/wavemon-0.7.5
+++ b/metadata/md5-cache/net-wireless/wavemon-0.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses caps? ( sys-libs/libcap ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses caps? ( sys-libs/libcap ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Ncurses based monitor for IEEE 802.11 wireless LAN cards
 EAPI=4
 HOMEPAGE=http://eden-feed.erg.abdn.ac.uk/wavemon/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses caps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/wavemon-0.7.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=980144923f1486302b7faf0fb13f1d77
diff --git a/metadata/md5-cache/net-wireless/wimax-1.5.2 b/metadata/md5-cache/net-wireless/wimax-1.5.2
index 6f15f3cbe0b2..f9ab9049a559 100644
--- a/metadata/md5-cache/net-wireless/wimax-1.5.2
+++ b/metadata/md5-cache/net-wireless/wimax-1.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=dev-libs/libnl:1.1 >=sys-kernel/linux-headers-2.6.34 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libnl:1.1 >=sys-kernel/linux-headers-2.6.34 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Intel WiMAX daemon used to interface to the hardware
 EAPI=3
 HOMEPAGE=http://www.linuxwimax.org/
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libnl:1.1 >=sys-kernel/linux-headers-2.6.34 net-wireless/wimax-tools net-wireless/wpa_supplicant[wimax]
 SLOT=0
 SRC_URI=http://www.linuxwimax.org/Download?action=AttachFile&do=get&target=wimax-1.5.2.tar.gz -> wimax-1.5.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3bd77986321406be7263bcf768aef3f0
diff --git a/metadata/md5-cache/rox-base/mime-editor-0.5-r2 b/metadata/md5-cache/rox-base/mime-editor-0.5-r2
index 0a385f05e240..0ac7bf1626dd 100644
--- a/metadata/md5-cache/rox-base/mime-editor-0.5-r2
+++ b/metadata/md5-cache/rox-base/mime-editor-0.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/zeroinstall-injector-0.31
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/zeroinstall-injector-0.31
 DESCRIPTION=MIME-Editor is editor for the Shared MIME Database for ROX Desktop
 HOMEPAGE=http://rox.sourceforge.net/
 KEYWORDS=alpha amd64 ppc sparc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-2.0.4-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/rox/mime-editor-0.5.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	rox-0install	31fdc1bb54c9be03778e9c9f5d692ddd	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	rox-0install	31fdc1bb54c9be03778e9c9f5d692ddd	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e436d06e6104d5642da0da023590c845
diff --git a/metadata/md5-cache/rox-base/mime-editor-0.6 b/metadata/md5-cache/rox-base/mime-editor-0.6
index fe3402bd7b2b..8269b7ed86f6 100644
--- a/metadata/md5-cache/rox-base/mime-editor-0.6
+++ b/metadata/md5-cache/rox-base/mime-editor-0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/zeroinstall-injector-0.31
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/zeroinstall-injector-0.31
 DESCRIPTION=MIME-Editor is editor for the Shared MIME Database for ROX Desktop
 HOMEPAGE=http://rox.sourceforge.net/
 KEYWORDS=~alpha amd64 ~ppc ~sparc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-2.0.4-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/rox/mime-editor-0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	rox-0install	31fdc1bb54c9be03778e9c9f5d692ddd	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	rox-0install	31fdc1bb54c9be03778e9c9f5d692ddd	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cf2e6e2124fcae86a233e5ad240d775a
diff --git a/metadata/md5-cache/rox-base/oroborox-0.9.8-r1 b/metadata/md5-cache/rox-base/oroborox-0.9.8-r1
index dfa8b5d69c38..59dd88048fb8 100644
--- a/metadata/md5-cache/rox-base/oroborox-0.9.8-r1
+++ b/metadata/md5-cache/rox-base/oroborox-0.9.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=media-libs/freetype-2.0 x11-proto/xproto x11-proto/xextproto x11-proto/xf86vidmodeproto x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender x11-libs/libXcomposite x11-libs/libXdamage xinerama? ( x11-proto/xineramaproto ) =dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/freetype-2.0 x11-proto/xproto x11-proto/xextproto x11-proto/xf86vidmodeproto x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender x11-libs/libXcomposite x11-libs/libXdamage xinerama? ( x11-proto/xineramaproto ) =dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OroboROX is a small window manager for the ROX Desktop.
 HOMEPAGE=http://rox.sourceforge.net/
 IUSE=xinerama
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/freetype-2.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender x11-libs/libXxf86vm xinerama? ( x11-libs/libXinerama ) =dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-1.9.14
 SLOT=0
 SRC_URI=http://roxos.sunsite.dk/dev-contrib/guido/OroboROX-0.9.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c61c85fadd77e804f788c352caa1daeb
diff --git a/metadata/md5-cache/rox-base/pager-1.1-r2 b/metadata/md5-cache/rox-base/pager-1.1-r2
index d0c7145f76e9..1a2382c3e9bc 100644
--- a/metadata/md5-cache/rox-base/pager-1.1-r2
+++ b/metadata/md5-cache/rox-base/pager-1.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=>=x11-libs/libwnck-2.4.0:1 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/rox-clib-2.1.9-r2 virtual/pkgconfig >=rox-base/zeroinstall-injector-0.31
+DEPEND=>=x11-libs/libwnck-2.4.0:1 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/rox-clib-2.1.9-r2 virtual/pkgconfig >=rox-base/zeroinstall-injector-0.31
 DESCRIPTION=Pager - A pager applet for ROX-Filer
 EAPI=1
 HOMEPAGE=http://rox.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/libwnck-2.4.0:1 >=rox-base/rox-2.1.0 >=rox-base/rox-clib-2.1.9-r2
 SLOT=0
 SRC_URI=mirror://sourceforge/rox/pager-1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	rox-0install	31fdc1bb54c9be03778e9c9f5d692ddd	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	rox-0install	31fdc1bb54c9be03778e9c9f5d692ddd	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=56417c854871944aac6eb426bec360e8
diff --git a/metadata/md5-cache/rox-base/rox-autostart-1.1 b/metadata/md5-cache/rox-base/rox-autostart-1.1
index a2abbf7aac84..d9cd2f919a52 100644
--- a/metadata/md5-cache/rox-base/rox-autostart-1.1
+++ b/metadata/md5-cache/rox-base/rox-autostart-1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Autostart manages FreeDesktop.org autostart items.
 HOMEPAGE=http://roscidus.com/desktop/node/430
 KEYWORDS=~amd64 ~x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-python/pyxdg =dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-1.9.6
 SLOT=0
 SRC_URI=http://users.unet.net.ph/~lars/rox/Autostart/Autostart-1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=54ec53bb53203924934332dcc1e93db1
diff --git a/metadata/md5-cache/rox-base/rox-launch-0.3.2 b/metadata/md5-cache/rox-base/rox-launch-0.3.2
index 4022321a9b6a..e0196b898a3f 100644
--- a/metadata/md5-cache/rox-base/rox-launch-0.3.2
+++ b/metadata/md5-cache/rox-base/rox-launch-0.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/zeroinstall-injector-0.31
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/zeroinstall-injector-0.31
 DESCRIPTION=Launch provides facilities for launching URLs and configuring the applications used to launch them.
 HOMEPAGE=http://www.kerofin.demon.co.uk/rox/launch.html
 KEYWORDS=amd64 x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-2.0.2
 SLOT=0
 SRC_URI=http://www.kerofin.demon.co.uk/rox/Launch-0.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	rox-0install	31fdc1bb54c9be03778e9c9f5d692ddd	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	rox-0install	31fdc1bb54c9be03778e9c9f5d692ddd	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fa58f4c920299e38be40830fcf3f57e8
diff --git a/metadata/md5-cache/rox-base/rox-media-0.0.3-r1 b/metadata/md5-cache/rox-base/rox-media-0.0.3-r1
index 1e0ce5893310..502f231329e5 100644
--- a/metadata/md5-cache/rox-base/rox-media-0.0.3-r1
+++ b/metadata/md5-cache/rox-base/rox-media-0.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=x11-libs/libX11 gnome-base/gconf:2 || ( gnome-base/libgdu =sys-apps/gnome-disk-utility-3.0.2-r300 <=sys-apps/gnome-disk-utility-3.0.2-r200 ) x11-libs/gtk+:2 dev-util/scons || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 gnome-base/gconf:2 || ( gnome-base/libgdu =sys-apps/gnome-disk-utility-3.0.2-r300 <=sys-apps/gnome-disk-utility-3.0.2-r200 ) x11-libs/gtk+:2 dev-util/scons || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Manage removable drives for ROX and other lightweight desktops
 EAPI=3
 HOMEPAGE=http://rox.sourceforge.net
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libX11 gnome-base/gconf:2 || ( gnome-base/libgdu =sys-apps/gnome-disk-utility-3.0.2-r300 <=sys-apps/gnome-disk-utility-3.0.2-r200 ) x11-libs/gtk+:2 >=rox-base/rox-2.1.0
 SLOT=0
 SRC_URI=mirror://gentoo/Media-0.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bff72a0a7d8d16fbab67d05f9dc892ef
diff --git a/metadata/md5-cache/rox-base/rox-session-0.30-r4 b/metadata/md5-cache/rox-base/rox-session-0.30-r4
index fc6cda3fa41c..177de92d335a 100644
--- a/metadata/md5-cache/rox-base/rox-session-0.30-r4
+++ b/metadata/md5-cache/rox-base/rox-session-0.30-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/zeroinstall-injector-0.31
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/zeroinstall-injector-0.31
 DESCRIPTION=Rox-Session is a really simple session manager
 HOMEPAGE=http://rox.sourceforge.net/rox_session.html
 KEYWORDS=amd64 ppc sparc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-python/dbus-python-0.71 x11-apps/xgamma x11-apps/xset =dev-lang/python-2* >=rox-base/rox-2.7-r1 >=rox-base/rox-lib-2.0.4-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/rox/rox-session-0.30.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	rox-0install	31fdc1bb54c9be03778e9c9f5d692ddd	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	rox-0install	31fdc1bb54c9be03778e9c9f5d692ddd	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d62eb9f3aa84a31d8cde9a7a78f25897
diff --git a/metadata/md5-cache/rox-base/systemtrayn-0.3.2 b/metadata/md5-cache/rox-base/systemtrayn-0.3.2
index 902e1c0eae93..7d67141116f6 100644
--- a/metadata/md5-cache/rox-base/systemtrayn-0.3.2
+++ b/metadata/md5-cache/rox-base/systemtrayn-0.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/rox-clib-2.1.7 virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/rox-clib-2.1.7 virtual/pkgconfig
 DESCRIPTION=SystemTrayN is an updated notification area applet for ROX-Filer
 HOMEPAGE=http://www.kerofin.demon.co.uk/rox/systemtrayn.html
 KEYWORDS=amd64 sparc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=rox-base/rox-2.1.0 >=rox-base/rox-clib-2.1.7
 SLOT=0
 SRC_URI=http://www.kerofin.demon.co.uk/rox/SystemTrayN-0.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=04d30d60744430bc24ebe11178f98f55
diff --git a/metadata/md5-cache/rox-base/tasklist-0.5 b/metadata/md5-cache/rox-base/tasklist-0.5
index 9133ae53e46a..c4d96e41744a 100644
--- a/metadata/md5-cache/rox-base/tasklist-0.5
+++ b/metadata/md5-cache/rox-base/tasklist-0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=x11-libs/libwnck:1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/rox-clib-2.1.10 virtual/pkgconfig >=rox-base/zeroinstall-injector-0.31
+DEPEND=x11-libs/libwnck:1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/rox-clib-2.1.10 virtual/pkgconfig >=rox-base/zeroinstall-injector-0.31
 DESCRIPTION=Tasklist is a ROX applet which shows a list of running applications
 EAPI=1
 HOMEPAGE=http://rox.sourceforge.net/phpwiki/index.php/Tasklist
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libwnck:1 >=rox-base/rox-2.1.0 >=rox-base/rox-clib-2.1.10
 SLOT=0
 SRC_URI=ftp://ftp.berlios.de/pub/rox4debian/apps/Tasklist-0.5.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	rox-0install	31fdc1bb54c9be03778e9c9f5d692ddd	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	rox-0install	31fdc1bb54c9be03778e9c9f5d692ddd	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e8100b0c5b3825051f16f55db0f535b5
diff --git a/metadata/md5-cache/rox-base/tasktray-0.7-r1 b/metadata/md5-cache/rox-base/tasktray-0.7-r1
index c8354a56fe4c..ca3b95068789 100644
--- a/metadata/md5-cache/rox-base/tasktray-0.7-r1
+++ b/metadata/md5-cache/rox-base/tasktray-0.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=TaskTray is a rox panel applet to show running applications.
 HOMEPAGE=http://rox4debian.berlios.de
 KEYWORDS=amd64 sparc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-python/libwnck-python >=rox-base/traylib-0.3.2.1 =dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-1.9.6
 SLOT=0
 SRC_URI=ftp://ftp.berlios.de/pub/rox4debian/apps/TaskTray-0.7.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d94c466e9e5b6c1550e1efd2f8254388
diff --git a/metadata/md5-cache/rox-base/thumbs-0.1.4 b/metadata/md5-cache/rox-base/thumbs-0.1.4
index b34977f0bd3d..e16134897ae9 100644
--- a/metadata/md5-cache/rox-base/thumbs-0.1.4
+++ b/metadata/md5-cache/rox-base/thumbs-0.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/zeroinstall-injector-0.31
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/zeroinstall-injector-0.31
 DESCRIPTION=A very simple Rox thumbnail image manager
 HOMEPAGE=http://www.kerofin.demon.co.uk/rox/thumbs.html
 KEYWORDS=alpha amd64 ppc sparc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-2.0.4-r1
 SLOT=0
 SRC_URI=http://www.kerofin.demon.co.uk/rox/Thumbs-0.1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	rox-0install	31fdc1bb54c9be03778e9c9f5d692ddd	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	rox-0install	31fdc1bb54c9be03778e9c9f5d692ddd	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e09e6156e1ab0438bc0cccb3840bb99
diff --git a/metadata/md5-cache/rox-base/volume-009-r1 b/metadata/md5-cache/rox-base/volume-009-r1
index 1bc849999b9a..7eb9b59eaa3d 100644
--- a/metadata/md5-cache/rox-base/volume-009-r1
+++ b/metadata/md5-cache/rox-base/volume-009-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Volume is a ROX Panel Applet that puts a popup volume control in your panel.
 HOMEPAGE=http://rox-volume.googlecode.com
 KEYWORDS=amd64 ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-python/pyalsaaudio-0.2 =dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-2.0.0
 SLOT=0
 SRC_URI=http://rox-volume.googlecode.com/files/Volume-009.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aa289c963a5e786e9387fbb6948b7174
diff --git a/metadata/md5-cache/rox-base/xdg-menu-1.5 b/metadata/md5-cache/rox-base/xdg-menu-1.5
index 374f999edea1..80d94e2a45cb 100644
--- a/metadata/md5-cache/rox-base/xdg-menu-1.5
+++ b/metadata/md5-cache/rox-base/xdg-menu-1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=sys-devel/gettext =dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-devel/gettext =dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=XDG-Menu is a ROX Menu Application that is XDG Compliant.
 HOMEPAGE=http://xdg-menu.sourceforge.net/
 KEYWORDS=amd64 ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-python/pyxdg-0.14 >=dev-python/dbus-python-0.80.2 gnome-base/gnome-menus =dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-2.0.0
 SLOT=0
 SRC_URI=mirror://sourceforge/xdg-menu/XDG-Menu-1.5.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8b3b3b4f7aebae1b1f53cc222f8f1bdc
diff --git a/metadata/md5-cache/rox-extra/archive-2.2 b/metadata/md5-cache/rox-extra/archive-2.2
index 3e1dd993a53b..fd98009c55dc 100644
--- a/metadata/md5-cache/rox-extra/archive-2.2
+++ b/metadata/md5-cache/rox-extra/archive-2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/zeroinstall-injector-0.31
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/zeroinstall-injector-0.31
 DESCRIPTION=Archive is a simple archiver for ROX Desktop
 HOMEPAGE=http://rox.sourceforge.net/
 IUSE=bzip2 compress rar uuencode zip ace rpm cpio
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/gzip app-arch/tar || ( app-arch/xz-utils app-arch/lzma-utils ) bzip2? ( app-arch/bzip2 ) compress? ( app-arch/ncompress ) rar? ( || ( app-arch/unrar app-arch/rar ) ) uuencode? ( app-arch/sharutils ) zip? ( app-arch/unzip app-arch/zip ) ace? ( app-arch/unace ) rpm? ( app-arch/rpm app-arch/cpio ) cpio? ( app-arch/cpio ) =dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-2.0.0
 SLOT=0
 SRC_URI=mirror://sourceforge/rox/archive-2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	rox-0install	31fdc1bb54c9be03778e9c9f5d692ddd	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	rox-0install	31fdc1bb54c9be03778e9c9f5d692ddd	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=846837e23d6209e2e062821666058f8c
diff --git a/metadata/md5-cache/rox-extra/clock-2.1.7 b/metadata/md5-cache/rox-extra/clock-2.1.7
index f130bcd41b47..64cbe43e32a8 100644
--- a/metadata/md5-cache/rox-extra/clock-2.1.7
+++ b/metadata/md5-cache/rox-extra/clock-2.1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/rox-clib-2.1.8 virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/rox-clib-2.1.8 virtual/pkgconfig
 DESCRIPTION=Clock - a clock for the ROX Desktop
 HOMEPAGE=http://www.kerofin.demon.co.uk/rox/clock.html
 KEYWORDS=amd64 ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=rox-base/rox-2.1.0 >=rox-base/rox-clib-2.1.8
 SLOT=0
 SRC_URI=http://www.kerofin.demon.co.uk/rox/Clock-2.1.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9cbacdbd4f6c3e8f20181e3ebdde1f64
diff --git a/metadata/md5-cache/rox-extra/comicthumb-0.1 b/metadata/md5-cache/rox-extra/comicthumb-0.1
index bcc9f7ae50c8..6d0f06f14b8b 100644
--- a/metadata/md5-cache/rox-extra/comicthumb-0.1
+++ b/metadata/md5-cache/rox-extra/comicthumb-0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Thumbnailer for rox, which generates thumbnails for archived comix files.
 HOMEPAGE=http://www.theli.ho.com.ua/
 IUSE=rar
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=rar? ( || ( app-arch/unrar app-arch/rar ) ) dev-python/imaging =dev-lang/python-2* >=rox-base/rox-2.1.1 >=rox-base/rox-lib-2.0.2
 SLOT=0
 SRC_URI=http://www.theli.ho.com.ua/ComicThumb-0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f9b97bc9c730cf1ae2ec9c4148d8040d
diff --git a/metadata/md5-cache/rox-extra/contacts-0.8.3-r1 b/metadata/md5-cache/rox-extra/contacts-0.8.3-r1
index c5cc32d58a86..bbaea0181e00 100644
--- a/metadata/md5-cache/rox-extra/contacts-0.8.3-r1
+++ b/metadata/md5-cache/rox-extra/contacts-0.8.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Contacts - The ROX Contact Manager
 HOMEPAGE=http://roxos.sunsite.dk/dev-contrib/guido/Contacts/
 KEYWORDS=amd64 ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-1.9.17
 SLOT=0
 SRC_URI=http://roxos.sunsite.dk/dev-contrib/guido/Contacts/Contacts-0.8.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fe8f3110beba5db169cab43ed810a276
diff --git a/metadata/md5-cache/rox-extra/diff-2.1.4 b/metadata/md5-cache/rox-extra/diff-2.1.4
index 9cadae7942a0..d4edd1800137 100644
--- a/metadata/md5-cache/rox-extra/diff-2.1.4
+++ b/metadata/md5-cache/rox-extra/diff-2.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/rox-clib-2.1.8 virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/rox-clib-2.1.8 virtual/pkgconfig
 DESCRIPTION=This diff program for ROX that provides DND functionality. By Stephen Watson
 HOMEPAGE=http://www.kerofin.demon.co.uk/rox/diff.html
 KEYWORDS=amd64 x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=rox-base/rox-2.1.0 >=rox-base/rox-clib-2.1.8
 SLOT=0
 SRC_URI=http://www.kerofin.demon.co.uk/rox/Diff-2.1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=60e413f98c31d0fa862569879acfb5c4
diff --git a/metadata/md5-cache/rox-extra/downloadmanager-0.1.4 b/metadata/md5-cache/rox-extra/downloadmanager-0.1.4
index d93a49f426dc..12d78374efee 100644
--- a/metadata/md5-cache/rox-extra/downloadmanager-0.1.4
+++ b/metadata/md5-cache/rox-extra/downloadmanager-0.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Download Manager - a downloader for the Fetch and the ROX Desktop
 HOMEPAGE=http://www.kerofin.demon.co.uk/rox/downloadmanager.html
 KEYWORDS=amd64 x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=rox-extra/fetch-0.3.3 >=dev-python/dbus-python-0.71 =dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-2.0.0
 SLOT=0
 SRC_URI=http://www.kerofin.demon.co.uk/rox/DownloadManager-0.1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=86a653893050ef1c4567673fbbadcc13
diff --git a/metadata/md5-cache/rox-extra/edit-2.1 b/metadata/md5-cache/rox-extra/edit-2.1
index be44cb97b78a..5adf6645a324 100644
--- a/metadata/md5-cache/rox-extra/edit-2.1
+++ b/metadata/md5-cache/rox-extra/edit-2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Edit is a simple text editor for ROX Desktop
 HOMEPAGE=http://rox.sourceforge.net/
 KEYWORDS=amd64 ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-1.9.14
 SLOT=0
 SRC_URI=mirror://sourceforge/rox/edit-2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c76f8f4d5fc74179c4f8c50008f1f8fc
diff --git a/metadata/md5-cache/rox-extra/fetch-0.3.3 b/metadata/md5-cache/rox-extra/fetch-0.3.3
index 7d70fdfc9f36..1d489b5ef264 100644
--- a/metadata/md5-cache/rox-extra/fetch-0.3.3
+++ b/metadata/md5-cache/rox-extra/fetch-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Fetch - a downloader for the ROX Desktop
 HOMEPAGE=http://www.kerofin.demon.co.uk/rox/fetch.html
 KEYWORDS=amd64 ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* >=rox-base/rox-2.1.2 >=rox-base/rox-lib-2.0.2
 SLOT=0
 SRC_URI=http://www.kerofin.demon.co.uk/rox/Fetch-0.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=418428fcf2c210d94de380b181870723
diff --git a/metadata/md5-cache/rox-extra/find-007-r1 b/metadata/md5-cache/rox-extra/find-007-r1
index 229a451133cf..0aa9b9d09d5f 100644
--- a/metadata/md5-cache/rox-extra/find-007-r1
+++ b/metadata/md5-cache/rox-extra/find-007-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Find - A file Finder utility for ROX by Ken Hayber.
 HOMEPAGE=http://rox-find.googlecode.com
 KEYWORDS=amd64 x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-2.0.0
 SLOT=0
 SRC_URI=http://rox-find.googlecode.com/files/Find-007.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=253855a48dffd1000070164b7256b79f
diff --git a/metadata/md5-cache/rox-extra/gnome-thumbnailer-0.3 b/metadata/md5-cache/rox-extra/gnome-thumbnailer-0.3
index 27f04045afcf..686708d7818e 100644
--- a/metadata/md5-cache/rox-extra/gnome-thumbnailer-0.3
+++ b/metadata/md5-cache/rox-extra/gnome-thumbnailer-0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Generates thumbnails for ROX-Filer using GNOME's thumbnailers
 HOMEPAGE=http://denver.sociol.unimi.it/~yuri/index-eng.html
 KEYWORDS=amd64 x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* >=rox-base/rox-2.1.1 >=rox-base/rox-lib-2.0.2
 SLOT=0
 SRC_URI=http://denver.sociol.unimi.it/~yuri/rox/ROX-GNOME-thumbnailer-0.3.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=21fb7baee6dc752e2c6f38005cf2b4b4
diff --git a/metadata/md5-cache/rox-extra/lithium-006 b/metadata/md5-cache/rox-extra/lithium-006
index 383bd9e68f94..59956f8f1ca1 100644
--- a/metadata/md5-cache/rox-extra/lithium-006
+++ b/metadata/md5-cache/rox-extra/lithium-006
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Lithium - A battery-status applet for ROX.
 HOMEPAGE=http://rox-lithium.googlecode.com
 KEYWORDS=amd64 x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-2.0.0
 SLOT=0
 SRC_URI=http://rox-lithium.googlecode.com/files/Lithium-006.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c153f14a14d344807873ecfa6779927f
diff --git a/metadata/md5-cache/rox-extra/magickthumbnail-0.5.2 b/metadata/md5-cache/rox-extra/magickthumbnail-0.5.2
index baf132beb8c8..714503e5e73c 100644
--- a/metadata/md5-cache/rox-extra/magickthumbnail-0.5.2
+++ b/metadata/md5-cache/rox-extra/magickthumbnail-0.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MagickThumbnail can generate thumbnails of many files many types in your ROX-Filer window.
 HOMEPAGE=http://rox.maczewski.dyndns.org/
 IUSE=xcf
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-gfx/imagemagick xcf? ( media-gfx/gimp ) >=rox-base/rox-2.1.0
 SLOT=0
 SRC_URI=http://rox.maczewski.dyndns.org/prog/MagickThumbnail-0.5.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=18bb871a53517d44f443ee50581c60ce
diff --git a/metadata/md5-cache/rox-extra/memo-2.1 b/metadata/md5-cache/rox-extra/memo-2.1
index b8b35ee3d28c..d71041739ebc 100644
--- a/metadata/md5-cache/rox-extra/memo-2.1
+++ b/metadata/md5-cache/rox-extra/memo-2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* =dev-lang/python-2*[xml] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* =dev-lang/python-2*[xml] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Memo is a simple alarm clock and clock applet for the ROX Desktop.
 EAPI=2
 HOMEPAGE=http://rox.sourceforge.net/phpwiki/index.php/Memo
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=mirror://sourceforge/rox/memo-2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=31b216abb2c16627662f92533e627949
diff --git a/metadata/md5-cache/rox-extra/mp3ogg2wav-1.0 b/metadata/md5-cache/rox-extra/mp3ogg2wav-1.0
index 5e6f88c88136..f49847c797e6 100644
--- a/metadata/md5-cache/rox-extra/mp3ogg2wav-1.0
+++ b/metadata/md5-cache/rox-extra/mp3ogg2wav-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Mp3Ogg2Wav: A small rox utility to convert .ogg and .mp3 files to .wav files.
 HOMEPAGE=http://kymatica.com/index.php/Software
 KEYWORDS=amd64 ~ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-python/pyogg-1.3 >=dev-python/pyvorbis-1.3 >=dev-python/pymad-0.5.2 =dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-1.9.13
 SLOT=0
 SRC_URI=http://kymatica.com/uploads/Software/Mp3Ogg2Wav-1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c104486bf674d2b3a1c7b8c9cf803bc1
diff --git a/metadata/md5-cache/rox-extra/musicbox-027-r2 b/metadata/md5-cache/rox-extra/musicbox-027-r2
index f18421f3fd4c..d7314a85c06a 100644
--- a/metadata/md5-cache/rox-extra/musicbox-027-r2
+++ b/metadata/md5-cache/rox-extra/musicbox-027-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=dev-python/pyao-0.81 alsa? ( >=dev-python/pyalsaaudio-0.2 ) mp3? ( >=dev-python/pymad-0.4.1 >=dev-python/pyid3lib-0.5.1 ) vorbis? ( >=dev-python/pyvorbis-1.1 ) =dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-python/pyao-0.81 alsa? ( >=dev-python/pyalsaaudio-0.2 ) mp3? ( >=dev-python/pymad-0.4.1 >=dev-python/pyid3lib-0.5.1 ) vorbis? ( >=dev-python/pyvorbis-1.1 ) =dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MusicBox - an MP3/OGG Player for the ROX Desktop
 HOMEPAGE=http://code.google.com/p/rox-musicbox/
 IUSE=mp3 vorbis alsa
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-python/pyao-0.81 alsa? ( >=dev-python/pyalsaaudio-0.2 ) mp3? ( >=dev-python/pymad-0.4.1 >=dev-python/pyid3lib-0.5.1 ) vorbis? ( >=dev-python/pyvorbis-1.1 ) =dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-2.0.0
 SLOT=0
 SRC_URI=http://rox-musicbox.googlecode.com/files/MusicBox-027.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ece6457961e42b42feb467d8fbaf2a92
diff --git a/metadata/md5-cache/rox-extra/picky-0.4.5-r1 b/metadata/md5-cache/rox-extra/picky-0.4.5-r1
index 5b00fb287924..16dc8cfe6d0c 100644
--- a/metadata/md5-cache/rox-extra/picky-0.4.5-r1
+++ b/metadata/md5-cache/rox-extra/picky-0.4.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Picky - an image viewer/slideshow app for the ROX Desktop
 HOMEPAGE=http://www.rdsarts.com/code/picky/
 KEYWORDS=amd64 ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-1.9.12
 SLOT=0
 SRC_URI=http://www.rdsarts.com/code/picky/Picky-0.4.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c2d22b4fe1a6be4b14accf60d2fdf1f5
diff --git a/metadata/md5-cache/rox-extra/resolution-0.2-r1 b/metadata/md5-cache/rox-extra/resolution-0.2-r1
index 3a3778684ce6..1aaad4715401 100644
--- a/metadata/md5-cache/rox-extra/resolution-0.2-r1
+++ b/metadata/md5-cache/rox-extra/resolution-0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=This rox program allows you to change the screen resolution at any time. It is non-permanent
 HOMEPAGE=http://rox.sourceforge.net/
 KEYWORDS=amd64 ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=x11-apps/xrandr =dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-1.9.3
 SLOT=0
 SRC_URI=http://rox.sourceforge.net/resolution-0.2.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e6bb3576533b9bf13bcebcd1c94a556c
diff --git a/metadata/md5-cache/rox-extra/resolution-0.3 b/metadata/md5-cache/rox-extra/resolution-0.3
index ea0bd6c0cab7..d38ab64991cf 100644
--- a/metadata/md5-cache/rox-extra/resolution-0.3
+++ b/metadata/md5-cache/rox-extra/resolution-0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Change the screen resolution using xrandr
 HOMEPAGE=http://rox.sourceforge.net/
 KEYWORDS=amd64 ~ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=x11-apps/xrandr =dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-1.9.3
 SLOT=0
 SRC_URI=mirror://sourceforge/rox/resolution-0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f27a24c40400b6c679f12dfb466cc1ec
diff --git a/metadata/md5-cache/rox-extra/reticker-0.4.5k-r1 b/metadata/md5-cache/rox-extra/reticker-0.4.5k-r1
index dcbe20f035fb..3eaee1251362 100644
--- a/metadata/md5-cache/rox-extra/reticker-0.4.5k-r1
+++ b/metadata/md5-cache/rox-extra/reticker-0.4.5k-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=RETicker - an RSS/RDF reader for ROX
 HOMEPAGE=http://absorb.it/tikiwiki/tiki-index.php?page=RETicker
 KEYWORDS=amd64 x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-1.9.13
 SLOT=0
 SRC_URI=http://absorb.it/RETicker/RETicker_0.4.5k.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d9b4f7e1c3174c50cb44c0a272488730
diff --git a/metadata/md5-cache/rox-extra/ripper-007-r1 b/metadata/md5-cache/rox-extra/ripper-007-r1
index 82e5a2284677..f0c93d0757cf 100644
--- a/metadata/md5-cache/rox-extra/ripper-007-r1
+++ b/metadata/md5-cache/rox-extra/ripper-007-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Ripper - A MP3/OGG ripper/encoder for the ROX Desktop
 HOMEPAGE=http://rox-ripper.googlecode.com
 IUSE=mp3 ogg cdparanoia
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/cdrtools cdparanoia? ( media-sound/cdparanoia ) mp3? ( media-sound/lame ) ogg? ( media-sound/vorbis-tools ) =dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-2.0.0
 SLOT=0
 SRC_URI=http://rox-ripper.googlecode.com/files/Ripper-007.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=917a3d35eef186a61c8914d3296ed7de
diff --git a/metadata/md5-cache/rox-extra/rox-rename-1.0.1 b/metadata/md5-cache/rox-extra/rox-rename-1.0.1
index 2683e39c5348..4fccad7aea21 100644
--- a/metadata/md5-cache/rox-extra/rox-rename-1.0.1
+++ b/metadata/md5-cache/rox-extra/rox-rename-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Rename can rename multiple files based on a regular expression.
 HOMEPAGE=http://php.apsique.com/project/rox-rename
 KEYWORDS=amd64 x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/ruby-1.8 dev-ruby/ruby-libglade2 >=rox-base/rox-2.1.0
 SLOT=0
 SRC_URI=http://php.apsique.com/files/rox-rename-1.0.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c05b220fb858bd0ba378c7eb13ed4f29
diff --git a/metadata/md5-cache/rox-extra/rox-tail-2.1.4 b/metadata/md5-cache/rox-extra/rox-tail-2.1.4
index 3a05e4b07b62..84f25f629c28 100644
--- a/metadata/md5-cache/rox-extra/rox-tail-2.1.4
+++ b/metadata/md5-cache/rox-extra/rox-tail-2.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/rox-clib-2.1.8 virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/rox-clib-2.1.8 virtual/pkgconfig
 DESCRIPTION=Tail is a ROX Application to monitor file changes a la `tail -f'
 HOMEPAGE=http://www.kerofin.demon.co.uk/rox/tail.html
 KEYWORDS=amd64 x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=rox-base/rox-2.1.0 >=rox-base/rox-clib-2.1.8
 SLOT=0
 SRC_URI=http://www.kerofin.demon.co.uk/rox/Tail-2.1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2b7b149f19fcab57f5b9b2a4386b3037
diff --git a/metadata/md5-cache/rox-extra/rox-wifi-003 b/metadata/md5-cache/rox-extra/rox-wifi-003
index 61d84906051a..7f56ad6ef253 100644
--- a/metadata/md5-cache/rox-extra/rox-wifi-003
+++ b/metadata/md5-cache/rox-extra/rox-wifi-003
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=WiFi - A wireless signal monitor applet for ROX.
 HOMEPAGE=http://code.google.com/p/rox-wifi/wiki/WiFi
 KEYWORDS=amd64 x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-2.0.0
 SLOT=0
 SRC_URI=http://rox-wifi.googlecode.com/files/WiFi-003.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5a6afa4393112d73405f4ec3fac8cccc
diff --git a/metadata/md5-cache/rox-extra/rox-xplanet-0.0.2 b/metadata/md5-cache/rox-extra/rox-xplanet-0.0.2
index 0e018cb38255..62267c5524aa 100644
--- a/metadata/md5-cache/rox-extra/rox-xplanet-0.0.2
+++ b/metadata/md5-cache/rox-extra/rox-xplanet-0.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ROX wrapper for xplanet by Stephen Watson
 HOMEPAGE=http://www.kerofin.demon.co.uk/rox/xplanet.html
 KEYWORDS=amd64 x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-misc/xplanet-1 =dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-2.0.3
 SLOT=0
 SRC_URI=http://www.kerofin.demon.co.uk/rox/XPlanet-0.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ddd55e2682e37557d0c644b9c13d980e
diff --git a/metadata/md5-cache/rox-extra/roxcd-0.5.4-r2 b/metadata/md5-cache/rox-extra/roxcd-0.5.4-r2
index d862c38f637a..4d9ede85c1b5 100644
--- a/metadata/md5-cache/rox-extra/roxcd-0.5.4-r2
+++ b/metadata/md5-cache/rox-extra/roxcd-0.5.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=RoxCD - A CD Player/Ripper for the ROX Desktop
 HOMEPAGE=http://www.rdsarts.com/code/roxcd
 KEYWORDS=amd64 ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-1.9.14
 SLOT=0
 SRC_URI=http://www.rdsarts.com/code/roxcd/files/RoxCD-0.5.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=385383e72ab7e521cddb2a5b1cfc6938
diff --git a/metadata/md5-cache/rox-extra/roxdao-0.4-r1 b/metadata/md5-cache/rox-extra/roxdao-0.4-r1
index fa355206f000..ac7b201b9207 100644
--- a/metadata/md5-cache/rox-extra/roxdao-0.4-r1
+++ b/metadata/md5-cache/rox-extra/roxdao-0.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=app-cdr/cdrdao rox-extra/mp3ogg2wav =dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-cdr/cdrdao rox-extra/mp3ogg2wav =dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=RoxDAO: A graphical frontend to cdrdao for the ROX Desktop.
 HOMEPAGE=http://kymatica.com/index.php/Software
 KEYWORDS=amd64 ~ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=app-cdr/cdrdao rox-extra/mp3ogg2wav =dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-2.0.3
 SLOT=0
 SRC_URI=http://kymatica.com/uploads/Software/RoxDAO-0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=21a2e447d57a1148d576aebc7477a575
diff --git a/metadata/md5-cache/rox-extra/roxget-0.0.5c b/metadata/md5-cache/rox-extra/roxget-0.0.5c
index 0aa94cf60eb3..80da6cafb617 100644
--- a/metadata/md5-cache/rox-extra/roxget-0.0.5c
+++ b/metadata/md5-cache/rox-extra/roxget-0.0.5c
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=dev-python/urlgrabber =dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-python/urlgrabber =dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ROXget - Download Handler for the ROX Desktop
 HOMEPAGE=http://nipul.digitillogic.net/
 KEYWORDS=amd64 ~ppc x86
@@ -7,5 +7,5 @@ LICENSE=MIT
 RDEPEND=dev-python/urlgrabber =dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-1.9.16
 SLOT=0
 SRC_URI=http://nipul.digitillogic.net/ROXget-005c.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=45a975e46c7a7d41b032a0fe29c35a6b
diff --git a/metadata/md5-cache/rox-extra/roxiso-061007-r1 b/metadata/md5-cache/rox-extra/roxiso-061007-r1
index 2a77d6333d98..3bc48be792d7 100644
--- a/metadata/md5-cache/rox-extra/roxiso-061007-r1
+++ b/metadata/md5-cache/rox-extra/roxiso-061007-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=RoxISO. A graphical frontend to mkisofs and cdrecord.
 HOMEPAGE=http://kymatica.com/index.php/Software
 KEYWORDS=amd64 ~ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/cdrtools =dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-1.9.13
 SLOT=0
 SRC_URI=http://kymatica.com/uploads/Software/RoxISO-061007.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2adee9367e2423507f6073dbd32e43e0
diff --git a/metadata/md5-cache/rox-extra/songer-0.1.2 b/metadata/md5-cache/rox-extra/songer-0.1.2
index d6ee4d0f1f16..7764a0ce789b 100644
--- a/metadata/md5-cache/rox-extra/songer-0.1.2
+++ b/metadata/md5-cache/rox-extra/songer-0.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Songer - An ID3 tag editor for the ROX Desktop
 HOMEPAGE=http://songer.sf.net
 KEYWORDS=ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-1.9.10
 SLOT=0
 SRC_URI=mirror://sourceforge/songer/songer-0.1.2.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d37d707cc571af77714b6f2d03c1524e
diff --git a/metadata/md5-cache/rox-extra/videothumbnail-0.1.14 b/metadata/md5-cache/rox-extra/videothumbnail-0.1.14
index 8ff0ef4dbc13..50616581ee2c 100644
--- a/metadata/md5-cache/rox-extra/videothumbnail-0.1.14
+++ b/metadata/md5-cache/rox-extra/videothumbnail-0.1.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/zeroinstall-injector-0.31
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/zeroinstall-injector-0.31
 DESCRIPTION=This is a helper program for ROX-Filer. It provides images for video files. By Stephen Watson
 HOMEPAGE=http://www.kerofin.demon.co.uk/rox/VideoThumbnail.html
 KEYWORDS=alpha amd64 ppc sparc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=media-video/mplayer-0.9.0 >=media-video/totem-1.4.2 ) =dev-lang/python-2* >=rox-base/rox-2.3 >=rox-base/rox-lib-2.0.4-r1
 SLOT=0
 SRC_URI=http://www.kerofin.demon.co.uk/rox/VideoThumbnail-0.1.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	rox-0install	31fdc1bb54c9be03778e9c9f5d692ddd	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	rox-0install	31fdc1bb54c9be03778e9c9f5d692ddd	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e27799dba252d2a15f20f7ac5873af6
diff --git a/metadata/md5-cache/rox-extra/wallpaper-2.1 b/metadata/md5-cache/rox-extra/wallpaper-2.1
index 9e5efc53d489..3b3040c0d1ab 100644
--- a/metadata/md5-cache/rox-extra/wallpaper-2.1
+++ b/metadata/md5-cache/rox-extra/wallpaper-2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Wallpaper - For setting the backdrop for the ROX Desktop
 HOMEPAGE=http://rox.sourceforge.net/
 KEYWORDS=amd64 ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-1.9.8
 SLOT=0
 SRC_URI=mirror://sourceforge/rox/wallpaper-2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=76f9fb49cf11c2cf6ab6540e69c07004
diff --git a/metadata/md5-cache/rox-extra/weather-0.3.1 b/metadata/md5-cache/rox-extra/weather-0.3.1
index 490ac9bbde22..f9a07eb48420 100644
--- a/metadata/md5-cache/rox-extra/weather-0.3.1
+++ b/metadata/md5-cache/rox-extra/weather-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/python-2* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Weather is a panel applet for Rox
 HOMEPAGE=http://rox4debian.berlios.de
 KEYWORDS=amd64 ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-1.9.6
 SLOT=0
 SRC_URI=ftp://ftp.berlios.de/pub/rox4debian/apps/Weather-0.3.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	rox	673b6c35a38ec70fa57c5e8f0c13127e	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=281ce08968c33295b9f2c5df8809efd3
diff --git a/metadata/md5-cache/sci-astronomy/aatm-0.4.3.1 b/metadata/md5-cache/sci-astronomy/aatm-0.4.3.1
index aa4d19b2b6f1..9139d2bb1ff2 100644
--- a/metadata/md5-cache/sci-astronomy/aatm-0.4.3.1
+++ b/metadata/md5-cache/sci-astronomy/aatm-0.4.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/boost || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Atmospheric Modelling for ALMA Observatory
 EAPI=4
 HOMEPAGE=http://www.mrao.cam.ac.uk/~bn204/alma/atmomodel.html
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/boost
 SLOT=0
 SRC_URI=http://launchpad.net/aatm/trunk/0.4.3.1/+download/aatm-0.4.3.1.tar.gz http://dev.gentoo.org/~bicatali/distfiles/aatm-0.4.3.1-ac-boost.patch.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4d5819fcc0179738a2aaa3241091e6d8
diff --git a/metadata/md5-cache/sci-astronomy/celestia-1.6.1-r1 b/metadata/md5-cache/sci-astronomy/celestia-1.6.1-r1
index fea48ca1731f..51204b34e225 100644
--- a/metadata/md5-cache/sci-astronomy/celestia-1.6.1-r1
+++ b/metadata/md5-cache/sci-astronomy/celestia-1.6.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/opengl virtual/jpeg media-libs/libpng:0= <dev-lang/lua-5.2 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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/celestia/celestia-1.6.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ef7ee8360449b888c6f4ccbd98701680
diff --git a/metadata/md5-cache/sci-astronomy/cpl-6.1.1 b/metadata/md5-cache/sci-astronomy/cpl-6.1.1
index 0e8f5adc049a..f290151b9f2b 100644
--- a/metadata/md5-cache/sci-astronomy/cpl-6.1.1
+++ b/metadata/md5-cache/sci-astronomy/cpl-6.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=sci-astronomy/wcslib-4.8.4 >=sci-libs/cfitsio-3.270 >=sci-libs/fftw-3.1.2 gasgano? ( sci-astronomy/gasgano ) doc? ( app-doc/doxygen ) gasgano? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sci-astronomy/wcslib-4.8.4 >=sci-libs/cfitsio-3.270 >=sci-libs/fftw-3.1.2 gasgano? ( sci-astronomy/gasgano ) doc? ( app-doc/doxygen ) gasgano? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ESO common pipeline library for astronomical data reduction
 EAPI=4
 HOMEPAGE=http://www.eso.org/sci/software/cpl/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sci-astronomy/wcslib-4.8.4 >=sci-libs/cfitsio-3.270 >=sci-libs/fftw-3.1.2 gasgano? ( sci-astronomy/gasgano ) gasgano? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=ftp://ftp.eso.org/pub/dfs/pipelines/libraries/cpl/cpl-6.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bae4d16d34160f74b4a4771bc7687fd5
diff --git a/metadata/md5-cache/sci-astronomy/cpl-6.2 b/metadata/md5-cache/sci-astronomy/cpl-6.2
index f00ab180f8b9..b07194d42b6c 100644
--- a/metadata/md5-cache/sci-astronomy/cpl-6.2
+++ b/metadata/md5-cache/sci-astronomy/cpl-6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=sci-astronomy/wcslib-4.8.4 >=sci-libs/cfitsio-3.270 >=sci-libs/fftw-3.1.2 gasgano? ( sci-astronomy/gasgano ) doc? ( app-doc/doxygen ) gasgano? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sci-astronomy/wcslib-4.8.4 >=sci-libs/cfitsio-3.270 >=sci-libs/fftw-3.1.2 gasgano? ( sci-astronomy/gasgano ) doc? ( app-doc/doxygen ) gasgano? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ESO common pipeline library for astronomical data reduction
 EAPI=4
 HOMEPAGE=http://www.eso.org/sci/software/cpl/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sci-astronomy/wcslib-4.8.4 >=sci-libs/cfitsio-3.270 >=sci-libs/fftw-3.1.2 gasgano? ( sci-astronomy/gasgano ) gasgano? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=ftp://ftp.eso.org/pub/dfs/pipelines/libraries/cpl/cpl-6.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aaf5752c2a5a2435619ba0c0ab8d9783
diff --git a/metadata/md5-cache/sci-astronomy/ds9-bin-7.0.2 b/metadata/md5-cache/sci-astronomy/ds9-bin-7.2
similarity index 74%
rename from metadata/md5-cache/sci-astronomy/ds9-bin-7.0.2
rename to metadata/md5-cache/sci-astronomy/ds9-bin-7.2
index 84572dab1d6e..bf6952bc496a 100644
--- a/metadata/md5-cache/sci-astronomy/ds9-bin-7.0.2
+++ b/metadata/md5-cache/sci-astronomy/ds9-bin-7.2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
 DESCRIPTION=Data visualization application for astronomical FITS images
-EAPI=4
+EAPI=5
 HOMEPAGE=http://hea-www.harvard.edu/RD/ds9
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 media-libs/fontconfig media-libs/freetype x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXft x11-libs/libXrandr x11-libs/libXrender x11-libs/xpa
 SLOT=0
-SRC_URI=http://dev.gentoo.org/~jlec/distfiles/ds9.png.tar amd64? ( http://hea-www.harvard.edu/saord/download/ds9/linux64/ds9.linux64.7.0.2.tar.gz ) x86? ( http://hea-www.harvard.edu/saord/download/ds9/linux/ds9.linux.7.0.2.tar.gz )
+SRC_URI=http://dev.gentoo.org/~jlec/distfiles/ds9.png.tar amd64? ( http://hea-www.harvard.edu/RD/ds9/download/linux64/ds9.linux64.7.2.tar.gz ) x86? ( http://hea-www.harvard.edu/RD/ds9/download/linux/ds9.linux.7.2.tar.gz )
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d74e3047424776efd43c7c960c31df6f
+_md5_=64dd1f818d5ddb1b32b1c793b94b0f9c
diff --git a/metadata/md5-cache/sci-astronomy/esorex-3.9.6-r1 b/metadata/md5-cache/sci-astronomy/esorex-3.9.6-r1
index a67a529685ff..ad30d24f4634 100644
--- a/metadata/md5-cache/sci-astronomy/esorex-3.9.6-r1
+++ b/metadata/md5-cache/sci-astronomy/esorex-3.9.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sci-astronomy/cpl-6 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sci-astronomy/cpl-6 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ESO Recipe Execution Tool to exec cpl scripts
 EAPI=4
 HOMEPAGE=http://www.eso.org/sci/software/cpl/esorex.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sci-astronomy/cpl-6
 SLOT=0
 SRC_URI=ftp://ftp.eso.org/pub/dfs/pipelines/libraries/esorex/esorex-3.9.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=82a546ce4574c7e96e886d25f4b34fc6
diff --git a/metadata/md5-cache/sci-astronomy/predict-2.2.3-r1 b/metadata/md5-cache/sci-astronomy/predict-2.2.3-r1
index d42cb92287e2..89a216bf2175 100644
--- a/metadata/md5-cache/sci-astronomy/predict-2.2.3-r1
+++ b/metadata/md5-cache/sci-astronomy/predict-2.2.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=sys-libs/ncurses gtk? ( x11-libs/gtk+:2 ) xforms? ( x11-libs/xforms ) xplanet? ( x11-misc/xplanet ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses gtk? ( x11-libs/gtk+:2 ) xforms? ( x11-libs/xforms ) xplanet? ( x11-misc/xplanet ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Satellite tracking and orbital prediction
 EAPI=4
 HOMEPAGE=http://www.qsl.net/kd2bd/predict.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses gtk? ( x11-libs/gtk+:2 ) xforms? ( x11-libs/xforms ) xplanet? ( x11-misc/xplanet )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/predict/predict_2.2.3.orig.tar.gz mirror://debian/pool/main/p/predict/predict_2.2.3-3.1.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7beed137de14a2b1cea3d3d68e1db2b3
diff --git a/metadata/md5-cache/sci-astronomy/skycat-3.1.2-r1 b/metadata/md5-cache/sci-astronomy/skycat-3.1.2-r1
index e9f557295ea4..57fa6aae4d53 100644
--- a/metadata/md5-cache/sci-astronomy/skycat-3.1.2-r1
+++ b/metadata/md5-cache/sci-astronomy/skycat-3.1.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ESO astronomical image visualizer with catalog access.
 EAPI=4
 HOMEPAGE=http://archive.eso.org/skycat
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=http://archive.eso.org/cms/tools-documentation/skycat-download/skycat-3.1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e6af185f6adfdbd539d53390ae81e640
diff --git a/metadata/md5-cache/sci-astronomy/sofa_c-20120301a b/metadata/md5-cache/sci-astronomy/sofa_c-20120301a
new file mode 100644
index 000000000000..e43fcdde6b39
--- /dev/null
+++ b/metadata/md5-cache/sci-astronomy/sofa_c-20120301a
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Library for algorithms for models in fundamental astronomy
+EAPI=5
+HOMEPAGE=http://www.iausofa.org/current_C.html
+IUSE=doc
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=SOFA
+SLOT=0
+SRC_URI=http://www.iausofa.org/2012_0301_C/sofa_c-20120301_a.tar.gz
+_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d9d9094dd082731418745bdf73227f11
diff --git a/metadata/md5-cache/sci-astronomy/swarp-2.19.1 b/metadata/md5-cache/sci-astronomy/swarp-2.19.1
index 0472a7dd00d5..49a4dfc13d83 100644
--- a/metadata/md5-cache/sci-astronomy/swarp-2.19.1
+++ b/metadata/md5-cache/sci-astronomy/swarp-2.19.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Resample and coadd astronomical FITS images
 EAPI=4
 HOMEPAGE=http://astromatic.iap.fr/software/swarp
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=CeCILL-2
 SLOT=0
 SRC_URI=ftp://ftp.iap.fr/pub/from_users/bertin/swarp/swarp-2.19.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=55acb2f13c536ed811777ae248379335
diff --git a/metadata/md5-cache/sci-astronomy/wcstools-3.8.4 b/metadata/md5-cache/sci-astronomy/wcstools-3.8.4
index 1663088863a3..ec60804e6d38 100644
--- a/metadata/md5-cache/sci-astronomy/wcstools-3.8.4
+++ b/metadata/md5-cache/sci-astronomy/wcstools-3.8.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=World Coordinate System library for astronomical FITS images
 EAPI=4
 HOMEPAGE=http://tdc-www.harvard.edu/software/wcstools
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=http://tdc-www.harvard.edu/software/wcstools/wcstools-3.8.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1f2187748ae34eb7527e188a82441841
diff --git a/metadata/md5-cache/sci-astronomy/wcstools-3.8.5 b/metadata/md5-cache/sci-astronomy/wcstools-3.8.5
index 7a8dbfcc6a55..75796b798787 100644
--- a/metadata/md5-cache/sci-astronomy/wcstools-3.8.5
+++ b/metadata/md5-cache/sci-astronomy/wcstools-3.8.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=World Coordinate System library for astronomical FITS images
 EAPI=4
 HOMEPAGE=http://tdc-www.harvard.edu/software/wcstools
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=http://tdc-www.harvard.edu/software/wcstools/wcstools-3.8.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9661772859814dafb98cd0c552bc8eee
diff --git a/metadata/md5-cache/sci-astronomy/wcstools-3.8.6 b/metadata/md5-cache/sci-astronomy/wcstools-3.8.6
index 96351365f849..7dec8614a89a 100644
--- a/metadata/md5-cache/sci-astronomy/wcstools-3.8.6
+++ b/metadata/md5-cache/sci-astronomy/wcstools-3.8.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=World Coordinate System library for astronomical FITS images
 EAPI=4
 HOMEPAGE=http://tdc-www.harvard.edu/software/wcstools
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=http://tdc-www.harvard.edu/software/wcstools/wcstools-3.8.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=270cd4ca56382942a83d15db1361a528
diff --git a/metadata/md5-cache/sci-astronomy/wcstools-3.8.7 b/metadata/md5-cache/sci-astronomy/wcstools-3.8.7
index 6e26f790acf7..40b3dfa0e08b 100644
--- a/metadata/md5-cache/sci-astronomy/wcstools-3.8.7
+++ b/metadata/md5-cache/sci-astronomy/wcstools-3.8.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=World Coordinate System library for astronomical FITS images
 EAPI=4
 HOMEPAGE=http://tdc-www.harvard.edu/software/wcstools
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=http://tdc-www.harvard.edu/software/wcstools/wcstools-3.8.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=21c0c1c4c5f0b5373616af9469e75c10
diff --git a/metadata/md5-cache/sci-biology/abyss-1.2.7 b/metadata/md5-cache/sci-biology/abyss-1.2.7
index caca080c346c..1b9cb1286762 100644
--- a/metadata/md5-cache/sci-biology/abyss-1.2.7
+++ b/metadata/md5-cache/sci-biology/abyss-1.2.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-cpp/sparsehash mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-cpp/sparsehash mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Assembly By Short Sequences - a de novo, parallel, paired-end sequence assembler
 EAPI=4
 HOMEPAGE=http://www.bcgsc.ca/platform/bioinfo/software/abyss/
@@ -9,5 +9,5 @@ LICENSE=abyss
 RDEPEND=dev-cpp/sparsehash mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.bcgsc.ca/downloads/abyss/abyss-1.2.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=a9c6dd339882657e7027aad541ddd3c8
diff --git a/metadata/md5-cache/sci-biology/abyss-1.3.0 b/metadata/md5-cache/sci-biology/abyss-1.3.0
index bfa6ddbc5d92..aeefd942dd5a 100644
--- a/metadata/md5-cache/sci-biology/abyss-1.3.0
+++ b/metadata/md5-cache/sci-biology/abyss-1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-cpp/sparsehash mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-cpp/sparsehash mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Assembly By Short Sequences - a de novo, parallel, paired-end sequence assembler
 EAPI=4
 HOMEPAGE=http://www.bcgsc.ca/platform/bioinfo/software/abyss/
@@ -9,5 +9,5 @@ LICENSE=abyss
 RDEPEND=dev-cpp/sparsehash mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.bcgsc.ca/downloads/abyss/abyss-1.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=dc84eeba4b61f4588c27c1500703cea6
diff --git a/metadata/md5-cache/sci-biology/abyss-1.3.3 b/metadata/md5-cache/sci-biology/abyss-1.3.3
index 1fc958921930..ae4b65473726 100644
--- a/metadata/md5-cache/sci-biology/abyss-1.3.3
+++ b/metadata/md5-cache/sci-biology/abyss-1.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-cpp/sparsehash mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-cpp/sparsehash mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Assembly By Short Sequences - a de novo, parallel, paired-end sequence assembler
 EAPI=4
 HOMEPAGE=http://www.bcgsc.ca/platform/bioinfo/software/abyss/
@@ -9,5 +9,5 @@ LICENSE=abyss
 RDEPEND=dev-cpp/sparsehash mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.bcgsc.ca/downloads/abyss/abyss-1.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2c7430df773fc71b85d47751c200891c
diff --git a/metadata/md5-cache/sci-biology/abyss-1.3.4 b/metadata/md5-cache/sci-biology/abyss-1.3.4
index 7c450552490a..7f9a00043efd 100644
--- a/metadata/md5-cache/sci-biology/abyss-1.3.4
+++ b/metadata/md5-cache/sci-biology/abyss-1.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-cpp/sparsehash mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-cpp/sparsehash mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Assembly By Short Sequences - a de novo, parallel, paired-end sequence assembler
 EAPI=4
 HOMEPAGE=http://www.bcgsc.ca/platform/bioinfo/software/abyss/
@@ -9,5 +9,5 @@ LICENSE=abyss
 RDEPEND=dev-cpp/sparsehash mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.bcgsc.ca/downloads/abyss/abyss-1.3.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=216aa490dd44eccbd891e4ec9a83edf5
diff --git a/metadata/md5-cache/sci-biology/allpathslg-42337 b/metadata/md5-cache/sci-biology/allpathslg-42337
index c9cc76ded512..f08b26c6d89a 100644
--- a/metadata/md5-cache/sci-biology/allpathslg-42337
+++ b/metadata/md5-cache/sci-biology/allpathslg-42337
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/boost !sci-biology/allpaths sci-biology/vaal || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/boost !sci-biology/allpaths sci-biology/vaal || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=De novo assembly of whole-genome shotgun microreads
 EAPI=4
 HOMEPAGE=http://www.broadinstitute.org/science/programs/genome-biology/crd
@@ -7,5 +7,5 @@ KEYWORDS=amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=ftp://ftp.broadinstitute.org/pub/crd/ALLPATHS/Release-LG/latest_source_code/allpathslg-42337.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=da7a61a06517102ad5fe77e1a1f55a58
diff --git a/metadata/md5-cache/sci-biology/bfast-0.7.0a b/metadata/md5-cache/sci-biology/bfast-0.7.0a
index c9f04b1ade24..c64dba3e743d 100644
--- a/metadata/md5-cache/sci-biology/bfast-0.7.0a
+++ b/metadata/md5-cache/sci-biology/bfast-0.7.0a
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Blat-like Fast Accurate Search Tool
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/bfast/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/XML-Simple
 SLOT=0
 SRC_URI=mirror://sourceforge/bfast/bfast-0.7.0a.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=74c168bfeeb97d70c3a79ccb7ca60288
diff --git a/metadata/md5-cache/sci-biology/blossoc-1.4.0 b/metadata/md5-cache/sci-biology/blossoc-1.4.0
index ec5617b76a61..ccf86414da85 100644
--- a/metadata/md5-cache/sci-biology/blossoc-1.4.0
+++ b/metadata/md5-cache/sci-biology/blossoc-1.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=sci-libs/gsl dev-libs/boost sci-biology/snpfile || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/gsl dev-libs/boost sci-biology/snpfile || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A linkage disequilibrium association mapping tool
 EAPI=2
 HOMEPAGE=http://www.daimi.au.dk/~mailund/Blossoc/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=sci-libs/gsl dev-libs/boost sci-biology/snpfile
 SLOT=0
 SRC_URI=http://www.daimi.au.dk/~mailund/Blossoc/download/blossoc-1.4.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e2aa6d9214b29faee84cce7a6154683e
diff --git a/metadata/md5-cache/sci-biology/cufflinks-1.3.0 b/metadata/md5-cache/sci-biology/cufflinks-1.3.0
index e8231c34dce8..025c7b5f02ed 100644
--- a/metadata/md5-cache/sci-biology/cufflinks-1.3.0
+++ b/metadata/md5-cache/sci-biology/cufflinks-1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-biology/samtools dev-libs/boost || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-biology/samtools dev-libs/boost || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Transcript assembly, differential expression, and differential regulation for RNA-Seq
 EAPI=4
 HOMEPAGE=http://cufflinks.cbcb.umd.edu/
@@ -9,5 +9,5 @@ LICENSE=Artistic
 RDEPEND=sci-biology/samtools dev-libs/boost
 SLOT=0
 SRC_URI=http://cufflinks.cbcb.umd.edu/downloads/cufflinks-1.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9c9db38aa4834b2d39702c5c30673aa9
diff --git a/metadata/md5-cache/sci-biology/emboss-6.3.1_p4 b/metadata/md5-cache/sci-biology/emboss-6.3.1_p4
index f413d305d436..d7f5d834996a 100644
--- a/metadata/md5-cache/sci-biology/emboss-6.3.1_p4
+++ b/metadata/md5-cache/sci-biology/emboss-6.3.1_p4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The European Molecular Biology Open Software Suite - A sequence analysis package
 EAPI=4
 HOMEPAGE=http://emboss.sourceforge.net/
@@ -10,5 +10,5 @@ PDEPEND=!minimal? ( sci-biology/aaindex sci-biology/cutg sci-biology/prints sci-
 RDEPEND=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
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=853a83d61df5548278b77eb81768c6b1
diff --git a/metadata/md5-cache/sci-biology/emboss-6.3.1_p4-r1 b/metadata/md5-cache/sci-biology/emboss-6.3.1_p4-r1
index 9fe2cfabf876..5da525fe4415 100644
--- a/metadata/md5-cache/sci-biology/emboss-6.3.1_p4-r1
+++ b/metadata/md5-cache/sci-biology/emboss-6.3.1_p4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The European Molecular Biology Open Software Suite - A sequence analysis package
 EAPI=4
 HOMEPAGE=http://emboss.sourceforge.net/
@@ -10,5 +10,5 @@ PDEPEND=!minimal? ( sci-biology/aaindex sci-biology/cutg sci-biology/prints sci-
 RDEPEND=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
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db4e2d95e4a73682507fc42dbeeed291
diff --git a/metadata/md5-cache/sci-biology/eugene-3.5g b/metadata/md5-cache/sci-biology/eugene-3.5g
index 9003ba04708e..99652392a6cb 100644
--- a/metadata/md5-cache/sci-biology/eugene-3.5g
+++ b/metadata/md5-cache/sci-biology/eugene-3.5g
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Eukaryotic gene predictor
 EAPI=2
 HOMEPAGE=http://www.inra.fr/mia/T/EuGene/
@@ -10,5 +10,5 @@ RDEPEND=media-libs/gd[png] media-libs/libpng doc? ( dev-lang/tcl dev-texlive/tex
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/eugene-3.5g.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=506c78a41d0a7af8da3631510241f27a
diff --git a/metadata/md5-cache/sci-biology/eugene-3.6-r1 b/metadata/md5-cache/sci-biology/eugene-3.6-r1
index 9b0ef8c51c4f..a5df11ed7c63 100644
--- a/metadata/md5-cache/sci-biology/eugene-3.6-r1
+++ b/metadata/md5-cache/sci-biology/eugene-3.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Eukaryotic gene predictor
 EAPI=2
 HOMEPAGE=http://www.inra.fr/mia/T/EuGene/
@@ -10,5 +10,5 @@ RDEPEND=media-libs/gd[png] media-libs/libpng doc? ( dev-lang/tcl dev-texlive/tex
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/eugene-3.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6da493e85b87902c2f6290479b4b00a4
diff --git a/metadata/md5-cache/sci-biology/eugene-4.1 b/metadata/md5-cache/sci-biology/eugene-4.1
index 550b732e897f..0aea60b1ca94 100644
--- a/metadata/md5-cache/sci-biology/eugene-4.1
+++ b/metadata/md5-cache/sci-biology/eugene-4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Eukaryotic gene predictor
 EAPI=5
 HOMEPAGE=http://www.inra.fr/mia/T/EuGene/
@@ -10,5 +10,5 @@ RDEPEND=media-libs/gd[png] media-libs/libpng doc? ( dev-lang/tcl dev-texlive/tex
 RESTRICT=test
 SLOT=0
 SRC_URI=https://mulcyber.toulouse.inra.fr/frs/download.php/1157/eugene-4.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a46a4d378a7abc8c2b0f20c12254cdd7
diff --git a/metadata/md5-cache/sci-biology/exonerate-2.2.0-r1 b/metadata/md5-cache/sci-biology/exonerate-2.2.0-r1
index 960a95f99013..4721db64c5c1 100644
--- a/metadata/md5-cache/sci-biology/exonerate-2.2.0-r1
+++ b/metadata/md5-cache/sci-biology/exonerate-2.2.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Generic tool for pairwise sequence comparison
 EAPI=4
 HOMEPAGE=http://www.ebi.ac.uk/~guy/exonerate/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2
 REQUIRED_USE=test? ( utils )
 SLOT=0
 SRC_URI=http://www.ebi.ac.uk/~guy/exonerate/exonerate-2.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dfa2d02950b165b28c1b22c68026ce9d
diff --git a/metadata/md5-cache/sci-biology/gibbs-3.1 b/metadata/md5-cache/sci-biology/gibbs-3.1
index da273f123e9d..e079826350ab 100644
--- a/metadata/md5-cache/sci-biology/gibbs-3.1
+++ b/metadata/md5-cache/sci-biology/gibbs-3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=mpi? ( virtual/mpi sys-cluster/mpe2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mpi? ( virtual/mpi sys-cluster/mpe2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Identify motifs, conserved regions, in DNA or protein sequences
 EAPI=4
 HOMEPAGE=http://bayesweb.wadsworth.org/gibbs/gibbs.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi sys-cluster/mpe2 )
 SLOT=0
 SRC_URI=mirror://gentoo/gibbs-3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a198aeb6a6ea2de9a4ae6a4c4900a16c
diff --git a/metadata/md5-cache/sci-biology/goby-cpp-1.9.7.3 b/metadata/md5-cache/sci-biology/goby-cpp-1.9.7.3
index 27daab36a46b..f518d3c8b64b 100644
--- a/metadata/md5-cache/sci-biology/goby-cpp-1.9.7.3
+++ b/metadata/md5-cache/sci-biology/goby-cpp-1.9.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=>=dev-libs/protobuf-2.4.1 >=dev-libs/libpcre-8.12 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/protobuf-2.4.1 >=dev-libs/libpcre-8.12 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A DNA sequencing data management framework - C/C++ API
 EAPI=4
 HOMEPAGE=http://campagnelab.org/software/goby/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/protobuf-2.4.1 >=dev-libs/libpcre-8.12
 SLOT=0
 SRC_URI=http://chagall.med.cornell.edu/goby/releases/archive/release-goby_1.9.7.3/goby_1.9.7.3-cpp.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=ba808d57f6a466a9b2eec67178fcf171
diff --git a/metadata/md5-cache/sci-biology/goby-cpp-1.9.8.1 b/metadata/md5-cache/sci-biology/goby-cpp-1.9.8.1
index 4ed5dc5dd015..b43f4a95df2b 100644
--- a/metadata/md5-cache/sci-biology/goby-cpp-1.9.8.1
+++ b/metadata/md5-cache/sci-biology/goby-cpp-1.9.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=>=dev-libs/protobuf-2.4.1 >=dev-libs/libpcre-8.12 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/protobuf-2.4.1 >=dev-libs/libpcre-8.12 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A DNA sequencing data management framework - C/C++ API
 EAPI=4
 HOMEPAGE=http://campagnelab.org/software/goby/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/protobuf-2.4.1 >=dev-libs/libpcre-8.12
 SLOT=0
 SRC_URI=http://chagall.med.cornell.edu/goby/releases/archive/release-goby_1.9.8.1/goby_1.9.8.1-cpp.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=87f140558319a20696921394ec8872b8
diff --git a/metadata/md5-cache/sci-biology/goby-cpp-2.0.1 b/metadata/md5-cache/sci-biology/goby-cpp-2.0.1
index cba22d732efc..1d60873d25c6 100644
--- a/metadata/md5-cache/sci-biology/goby-cpp-2.0.1
+++ b/metadata/md5-cache/sci-biology/goby-cpp-2.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/protobuf-2.4.1 >=dev-libs/libpcre-8.12 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/protobuf-2.4.1 >=dev-libs/libpcre-8.12 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A DNA sequencing data management framework - C/C++ API
 EAPI=4
 HOMEPAGE=http://campagnelab.org/software/goby/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/protobuf-2.4.1 >=dev-libs/libpcre-8.12
 SLOT=0
 SRC_URI=http://chagall.med.cornell.edu/goby/releases/archive/release-goby_2.0.1/goby_2.0.1-cpp.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ea9726e1f1c0d6bbd35d1a157949f80b
diff --git a/metadata/md5-cache/sci-biology/mammoth-1.0 b/metadata/md5-cache/sci-biology/mammoth-1.0
index c33044009f91..206eccf06d2b 100644
--- a/metadata/md5-cache/sci-biology/mammoth-1.0
+++ b/metadata/md5-cache/sci-biology/mammoth-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install nofetch setup unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=MAtching Molecular Models Obtained from THeory
 HOMEPAGE=http://ub.cbm.uam.es/software.php
 KEYWORDS=~amd64 ~x86
@@ -8,5 +8,5 @@ RDEPEND=virtual/fortran
 RESTRICT=fetch
 SLOT=0
 SRC_URI=mammoth-1.0-src.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bd4a5605bc5e1741d0cb359d2cbdd561
diff --git a/metadata/md5-cache/sci-biology/maq-0.7.1-r1 b/metadata/md5-cache/sci-biology/maq-0.7.1-r1
index e47408ff7bee..7a8ccc780903 100644
--- a/metadata/md5-cache/sci-biology/maq-0.7.1-r1
+++ b/metadata/md5-cache/sci-biology/maq-0.7.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Mapping and Assembly with Qualities - mapping Solexa and SOLiD reads to reference sequences
 EAPI=4
 HOMEPAGE=http://maq.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/maq/maq-0.7.1.tar.bz2 mirror://sourceforge/maq/calib-36.dat.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b9a11faf7a12ea5b9e04a1339fe12f0c
diff --git a/metadata/md5-cache/sci-biology/maqview-0.2.5 b/metadata/md5-cache/sci-biology/maqview-0.2.5
index 7d9935769480..d46275e694d1 100644
--- a/metadata/md5-cache/sci-biology/maqview-0.2.5
+++ b/metadata/md5-cache/sci-biology/maqview-0.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=media-libs/freeglut || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/freeglut || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GUI for sci-biology/maq, a short read mapping assembler
 HOMEPAGE=http://maq.sourceforge.net/
 KEYWORDS=amd64 x86
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/freeglut sci-biology/maq
 SLOT=0
 SRC_URI=mirror://sourceforge/maq/maqview-0.2.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=f14ccb94c1e155b77c528b8ed7ab8087
diff --git a/metadata/md5-cache/sci-biology/maqview-0.2.5-r1 b/metadata/md5-cache/sci-biology/maqview-0.2.5-r1
index ba308e363b38..f47f8f09b765 100644
--- a/metadata/md5-cache/sci-biology/maqview-0.2.5-r1
+++ b/metadata/md5-cache/sci-biology/maqview-0.2.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=media-libs/freeglut sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/freeglut sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GUI for sci-biology/maq, a short read mapping assembler
 EAPI=4
 HOMEPAGE=http://maq.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/freeglut sys-libs/zlib sci-biology/maq
 SLOT=0
 SRC_URI=mirror://sourceforge/maq/maqview-0.2.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=66a34bc03c910ec7adb0e5c7ff2a1e08
diff --git a/metadata/md5-cache/sci-biology/maqview-0.2.5-r2 b/metadata/md5-cache/sci-biology/maqview-0.2.5-r2
index 015141186269..cdf8f99d781e 100644
--- a/metadata/md5-cache/sci-biology/maqview-0.2.5-r2
+++ b/metadata/md5-cache/sci-biology/maqview-0.2.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/freeglut sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/freeglut sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GUI for sci-biology/maq, a short read mapping assembler
 EAPI=5
 HOMEPAGE=http://maq.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/freeglut sys-libs/zlib sci-biology/maq
 SLOT=0
 SRC_URI=mirror://sourceforge/maq/maqview-0.2.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=70e2f327787381f260a0e79248a00588
diff --git a/metadata/md5-cache/sci-biology/mauvealigner-9999 b/metadata/md5-cache/sci-biology/mauvealigner-9999
index 44c674d8096c..a43bff629a73 100644
--- a/metadata/md5-cache/sci-biology/mauvealigner-9999
+++ b/metadata/md5-cache/sci-biology/mauvealigner-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install preinst prepare unpack
-DEPEND=sci-libs/libgenome sci-libs/libmuscle sci-libs/libmems doc? ( app-doc/doxygen ) || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/libgenome sci-libs/libmuscle sci-libs/libmems doc? ( app-doc/doxygen ) || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Multiple genome alignment with large-scale evolutionary events (aligner component)
 EAPI=2
 HOMEPAGE=http://gel.ahabs.wisc.edu/mauve/
@@ -7,5 +7,5 @@ IUSE=doc
 LICENSE=GPL-2
 RDEPEND=sci-libs/libgenome sci-libs/libmuscle sci-libs/libmems
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ee194c47441e8bdad805879f01d15834
diff --git a/metadata/md5-cache/sci-biology/mcl-08.312 b/metadata/md5-cache/sci-biology/mcl-08.312
index 6532d2f6acd2..f53da17ea351 100644
--- a/metadata/md5-cache/sci-biology/mcl-08.312
+++ b/metadata/md5-cache/sci-biology/mcl-08.312
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Markov Cluster Algorithm implementation
 EAPI=4
 HOMEPAGE=http://micans.org/mcl/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://micans.org/mcl/src/mcl-08-312.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9f659bf0e29a0298229dbc060cf2aa80
diff --git a/metadata/md5-cache/sci-biology/mcl-12.135 b/metadata/md5-cache/sci-biology/mcl-12.135
index eed3562e4a44..1a3998d67e8a 100644
--- a/metadata/md5-cache/sci-biology/mcl-12.135
+++ b/metadata/md5-cache/sci-biology/mcl-12.135
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Markov Cluster Algorithm implementation
 EAPI=4
 HOMEPAGE=http://micans.org/mcl/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://micans.org/mcl/src/mcl-12-135.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cfc86ace6f0c029f1d24e9e2d327ee21
diff --git a/metadata/md5-cache/sci-biology/meme-4.8.1-r2 b/metadata/md5-cache/sci-biology/meme-4.8.1-r2
index d323605b2c71..dc5b47e810a6 100644
--- a/metadata/md5-cache/sci-biology/meme-4.8.1-r2
+++ b/metadata/md5-cache/sci-biology/meme-4.8.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=app-shells/tcsh dev-libs/libxml2:2 dev-libs/libxslt mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=app-shells/tcsh dev-libs/libxml2:2 dev-libs/libxslt mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=The MEME/MAST system - Motif discovery and search
 EAPI=4
 HOMEPAGE=http://meme.sdsc.edu/meme
@@ -9,5 +9,5 @@ LICENSE=meme
 RDEPEND=app-shells/tcsh dev-libs/libxml2:2 dev-libs/libxslt mpi? ( virtual/mpi ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://meme.nbcr.net/downloads/meme_4.8.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f6043ae17bfd7e5d26b3162408c8005a
diff --git a/metadata/md5-cache/sci-biology/mira-3.2.1 b/metadata/md5-cache/sci-biology/mira-3.2.1
index 156004ba0471..204ff805dc23 100644
--- a/metadata/md5-cache/sci-biology/mira-3.2.1
+++ b/metadata/md5-cache/sci-biology/mira-3.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=dev-libs/boost dev-util/google-perftools dev-libs/expat || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/boost dev-util/google-perftools dev-libs/expat || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Whole Genome Shotgun and EST Sequence Assembler for Sanger, 454 and Solexa / Illumina
 EAPI=3
 HOMEPAGE=http://www.chevreux.org/projects_mira.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost dev-util/google-perftools
 SLOT=0
 SRC_URI=mirror://sourceforge/mira-assembler/mira-3.2.1.tar.bz2 mirror://sourceforge/mira-assembler/mira_3rdparty_17-04-2010.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bee3e2e2104846fe49e258be4b840798
diff --git a/metadata/md5-cache/sci-biology/mira-3.2.1-r1 b/metadata/md5-cache/sci-biology/mira-3.2.1-r1
index 41285b3fd55e..979325d3bdaa 100644
--- a/metadata/md5-cache/sci-biology/mira-3.2.1-r1
+++ b/metadata/md5-cache/sci-biology/mira-3.2.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=dev-libs/boost dev-util/google-perftools dev-libs/expat || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/boost dev-util/google-perftools dev-libs/expat || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Whole Genome Shotgun and EST Sequence Assembler for Sanger, 454 and Solexa / Illumina
 EAPI=4
 HOMEPAGE=http://www.chevreux.org/projects_mira.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost dev-util/google-perftools
 SLOT=0
 SRC_URI=mirror://sourceforge/mira-assembler/mira-3.2.1.tar.bz2 mirror://sourceforge/mira-assembler/mira_3rdparty_17-04-2010.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c8e8dfeea8d25962bbffabc4ef3fa680
diff --git a/metadata/md5-cache/sci-biology/mira-3.4.0.2 b/metadata/md5-cache/sci-biology/mira-3.4.0.2
index d4c41bb42983..c8cd5ace7d6d 100644
--- a/metadata/md5-cache/sci-biology/mira-3.4.0.2
+++ b/metadata/md5-cache/sci-biology/mira-3.4.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=dev-libs/boost dev-util/google-perftools app-editors/vim-core dev-libs/expat || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/boost dev-util/google-perftools app-editors/vim-core dev-libs/expat || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Whole Genome Shotgun and EST Sequence Assembler for Sanger, 454 and Solexa / Illumina
 EAPI=4
 HOMEPAGE=http://www.chevreux.org/projects_mira.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost dev-util/google-perftools
 SLOT=0
 SRC_URI=mirror://sourceforge/mira-assembler/mira-3.4.0.2.tar.bz2 mirror://sourceforge/mira-assembler/mira_3rdparty_06-07-2012.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=524c9482a0f2786a257d7154a9079507
diff --git a/metadata/md5-cache/sci-biology/snpfile-2.0.1-r1 b/metadata/md5-cache/sci-biology/snpfile-2.0.1-r1
index affaa8fa5b52..3a847ea9bd8c 100644
--- a/metadata/md5-cache/sci-biology/snpfile-2.0.1-r1
+++ b/metadata/md5-cache/sci-biology/snpfile-2.0.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/boost || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/boost || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library and API for manipulating large SNP datasets
 EAPI=4
 HOMEPAGE=http://www.birc.au.dk/~mailund/SNPFile/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/boost
 SLOT=0
 SRC_URI=http://www.birc.au.dk/~mailund/SNPFile/download/snpfile-2.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b8a191cb72043e0b9c6ca80a08907292
diff --git a/metadata/md5-cache/sci-biology/tophat-1.0.12 b/metadata/md5-cache/sci-biology/tophat-1.0.12
index 62a2b1ad294f..75d8c22da3df 100644
--- a/metadata/md5-cache/sci-biology/tophat-1.0.12
+++ b/metadata/md5-cache/sci-biology/tophat-1.0.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fast splice junction mapper for RNA-Seq reads
 EAPI=2
 HOMEPAGE=http://tophat.cbcb.umd.edu/
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=sci-biology/bowtie
 SLOT=0
 SRC_URI=http://tophat.cbcb.umd.edu/downloads/tophat-1.0.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=bed3238655d3ca64cfcdfe0275783ed3
diff --git a/metadata/md5-cache/sci-biology/tophat-1.4.1 b/metadata/md5-cache/sci-biology/tophat-1.4.1
index a1668d56010f..0da698b8fdae 100644
--- a/metadata/md5-cache/sci-biology/tophat-1.4.1
+++ b/metadata/md5-cache/sci-biology/tophat-1.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=bam? ( sci-biology/samtools ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=bam? ( sci-biology/samtools ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fast splice junction mapper for RNA-Seq reads
 EAPI=4
 HOMEPAGE=http://tophat.cbcb.umd.edu/
@@ -9,5 +9,5 @@ LICENSE=Artistic
 RDEPEND=bam? ( sci-biology/samtools ) sci-biology/bowtie
 SLOT=0
 SRC_URI=http://tophat.cbcb.umd.edu/downloads/tophat-1.4.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a1469fef2e6e2b7a07f2ef195333be58
diff --git a/metadata/md5-cache/sci-biology/tophat-2.0.0 b/metadata/md5-cache/sci-biology/tophat-2.0.0
index fc1a7de7cdbc..56e573befbc9 100644
--- a/metadata/md5-cache/sci-biology/tophat-2.0.0
+++ b/metadata/md5-cache/sci-biology/tophat-2.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost bam? ( sci-biology/samtools ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/boost bam? ( sci-biology/samtools ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fast splice junction mapper for RNA-Seq reads
 EAPI=4
 HOMEPAGE=http://tophat.cbcb.umd.edu/
@@ -9,5 +9,5 @@ LICENSE=Artistic
 RDEPEND=dev-libs/boost bam? ( sci-biology/samtools ) sci-biology/bowtie
 SLOT=0
 SRC_URI=http://tophat.cbcb.umd.edu/downloads/tophat-2.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a3df878309c9dce16ef49799ba0d8b43
diff --git a/metadata/md5-cache/sci-biology/tophat-2.0.2 b/metadata/md5-cache/sci-biology/tophat-2.0.2
index 72c9300d5d8b..d124b1393752 100644
--- a/metadata/md5-cache/sci-biology/tophat-2.0.2
+++ b/metadata/md5-cache/sci-biology/tophat-2.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost bam? ( sci-biology/samtools ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/boost bam? ( sci-biology/samtools ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fast splice junction mapper for RNA-Seq reads
 EAPI=4
 HOMEPAGE=http://tophat.cbcb.umd.edu/
@@ -9,5 +9,5 @@ LICENSE=Artistic
 RDEPEND=dev-libs/boost bam? ( sci-biology/samtools ) sci-biology/bowtie
 SLOT=0
 SRC_URI=http://tophat.cbcb.umd.edu/downloads/tophat-2.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c6d8e13fd4ca894e09468afd5f5e4d59
diff --git a/metadata/md5-cache/sci-biology/tophat-2.0.8 b/metadata/md5-cache/sci-biology/tophat-2.0.8
index 81ee93160c10..04c0702898eb 100644
--- a/metadata/md5-cache/sci-biology/tophat-2.0.8
+++ b/metadata/md5-cache/sci-biology/tophat-2.0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost sci-biology/samtools sci-biology/seqan || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/boost sci-biology/samtools sci-biology/seqan || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fast splice junction mapper for RNA-Seq reads
 EAPI=5
 HOMEPAGE=http://tophat.cbcb.umd.edu/
@@ -9,5 +9,5 @@ LICENSE=Artistic
 RDEPEND=dev-libs/boost sci-biology/samtools sci-biology/seqan sci-biology/bowtie
 SLOT=0
 SRC_URI=http://tophat.cbcb.umd.edu/downloads/tophat-2.0.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1d48e4984bedfec372d3b0784fec76ce
diff --git a/metadata/md5-cache/sci-biology/vaal-1.6 b/metadata/md5-cache/sci-biology/vaal-1.6
index c670a8207c13..818165d4002c 100644
--- a/metadata/md5-cache/sci-biology/vaal-1.6
+++ b/metadata/md5-cache/sci-biology/vaal-1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.41.0-r3 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/boost-1.41.0-r3 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A variant ascertainment algorithm that can be used to detect SNPs, indels, and other polymorphisms
 EAPI=4
 HOMEPAGE=http://www.broadinstitute.org/science/programs/genome-biology/crd/
@@ -9,5 +9,5 @@ LICENSE=Whitehead-MIT
 RDEPEND=>=dev-libs/boost-1.41.0-r3
 SLOT=0
 SRC_URI=ftp://ftp.broad.mit.edu/pub/crd/VAAL/VAAL.1.6.tgz ftp://ftp.broad.mit.edu/pub/crd/VAAL/VAAL_manual.doc
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6b02578d19c73ba408f51a19a779f2e8
diff --git a/metadata/md5-cache/sci-biology/vaal-42179 b/metadata/md5-cache/sci-biology/vaal-42179
index 520fb7375e1a..c7bdad1fc954 100644
--- a/metadata/md5-cache/sci-biology/vaal-42179
+++ b/metadata/md5-cache/sci-biology/vaal-42179
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.41.0-r3 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/boost-1.41.0-r3 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A variant ascertainment algorithm that can be used to detect SNPs, indels, and other polymorphisms
 EAPI=4
 HOMEPAGE=http://www.broadinstitute.org/science/programs/genome-biology/crd/
@@ -9,5 +9,5 @@ LICENSE=Whitehead-MIT
 RDEPEND=>=dev-libs/boost-1.41.0-r3
 SLOT=0
 SRC_URI=ftp://ftp.broad.mit.edu/pub/crd/VAAL/latest_source_code/vaal-42179.tar.gz ftp://ftp.broad.mit.edu/pub/crd/VAAL/VAAL_manual.doc
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=42b83d90e337ce3f49ae8264f61ec40d
diff --git a/metadata/md5-cache/sci-biology/vaal-45166 b/metadata/md5-cache/sci-biology/vaal-45166
index e12a2549b839..ffdaa375b9d2 100644
--- a/metadata/md5-cache/sci-biology/vaal-45166
+++ b/metadata/md5-cache/sci-biology/vaal-45166
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.41.0-r3 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/boost-1.41.0-r3 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A variant ascertainment algorithm that can be used to detect SNPs, indels, and other polymorphisms
 EAPI=5
 HOMEPAGE=http://www.broadinstitute.org/science/programs/genome-biology/crd/
@@ -9,5 +9,5 @@ LICENSE=Whitehead-MIT
 RDEPEND=>=dev-libs/boost-1.41.0-r3
 SLOT=0
 SRC_URI=ftp://ftp.broad.mit.edu/pub/crd/VAAL/latest_source_code/vaal-45166.tar.gz ftp://ftp.broad.mit.edu/pub/crd/VAAL/VAAL_manual.doc
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e7cd5a5bd75f68593ef44ef2e25de6ee
diff --git a/metadata/md5-cache/sci-biology/vienna-rna-1.8.5 b/metadata/md5-cache/sci-biology/vienna-rna-1.8.5
index b1930ab8fbd9..3f3c4c47a153 100644
--- a/metadata/md5-cache/sci-biology/vienna-rna-1.8.5
+++ b/metadata/md5-cache/sci-biology/vienna-rna-1.8.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-lang/perl media-libs/gd python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) dev-lang/perl[-build]
+DEPEND=dev-lang/perl media-libs/gd python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) dev-lang/perl[-build]
 DESCRIPTION=RNA secondary structure prediction and comparison
 EAPI=3
 HOMEPAGE=http://www.tbi.univie.ac.at/~ivo/RNA/
@@ -9,5 +9,5 @@ LICENSE=vienna-rna
 RDEPEND=dev-lang/perl media-libs/gd python? ( dev-lang/swig ) python? ( =dev-lang/python-2* ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://www.tbi.univie.ac.at/~ivo/RNA/ViennaRNA-1.8.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=925906e002852f8795103abcc95f63b4
diff --git a/metadata/md5-cache/sci-biology/vienna-rna-2.1.1 b/metadata/md5-cache/sci-biology/vienna-rna-2.1.1
index 2a3cb485582c..e292c77f43c4 100644
--- a/metadata/md5-cache/sci-biology/vienna-rna-2.1.1
+++ b/metadata/md5-cache/sci-biology/vienna-rna-2.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl media-libs/gd doc? ( dev-texlive/texlive-latex ) python? ( python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-lang/swig ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+DEPEND=dev-lang/perl media-libs/gd doc? ( dev-texlive/texlive-latex ) python? ( python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-lang/swig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 DESCRIPTION=RNA secondary structure prediction and comparison
 EAPI=5
 HOMEPAGE=http://www.tbi.univie.ac.at/~ivo/RNA/
@@ -9,5 +9,5 @@ LICENSE=vienna-rna
 RDEPEND=dev-lang/perl media-libs/gd doc? ( dev-texlive/texlive-latex ) python? ( python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-lang/swig ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://www.tbi.univie.ac.at/~ronny/RNA/ViennaRNA-2.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f80e5c05237f47476d0ba11da421144d
diff --git a/metadata/md5-cache/sci-biology/yass-1.14-r1 b/metadata/md5-cache/sci-biology/yass-1.14-r1
index 674443c45773..fc5a6aeca239 100644
--- a/metadata/md5-cache/sci-biology/yass-1.14-r1
+++ b/metadata/md5-cache/sci-biology/yass-1.14-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dmalloc? ( dev-libs/dmalloc ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dmalloc? ( dev-libs/dmalloc ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Genomic similarity search with multiple transition constrained spaced seeds
 EAPI=2
 HOMEPAGE=http://bioinfo.lifl.fr/yass/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dmalloc? ( dev-libs/dmalloc )
 SLOT=0
 SRC_URI=http://bioinfo.lifl.fr/yass/files/yass-1.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f0415d430a6165ae967c4f0e9cec24a0
diff --git a/metadata/md5-cache/sci-calculators/calcoo-1.3.18 b/metadata/md5-cache/sci-calculators/calcoo-1.3.18
index 1046c2119e43..96b9542d2ef2 100644
--- a/metadata/md5-cache/sci-calculators/calcoo-1.3.18
+++ b/metadata/md5-cache/sci-calculators/calcoo-1.3.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Scientific calculator designed to provide maximum usability
 EAPI=4
 HOMEPAGE=http://calcoo.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/calcoo/calcoo-1.3.18.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fb2930f941933fcbcfe0bf2a80143a16
diff --git a/metadata/md5-cache/sci-calculators/calculator-1.6.36 b/metadata/md5-cache/sci-calculators/calculator-1.6.36
index 297ea68eb591..bb8ca80f3697 100644
--- a/metadata/md5-cache/sci-calculators/calculator-1.6.36
+++ b/metadata/md5-cache/sci-calculators/calculator-1.6.36
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 DESCRIPTION=Scientific calculator based on the FOX Toolkit
 EAPI=1
 HOMEPAGE=http://www.fox-toolkit.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/fox:1.6
 SLOT=0
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.6.36.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e6eae37f834393271bd46700f24d3710
diff --git a/metadata/md5-cache/sci-calculators/calculator-1.6.43 b/metadata/md5-cache/sci-calculators/calculator-1.6.43
index 9f3ef341b933..75565cf4a548 100644
--- a/metadata/md5-cache/sci-calculators/calculator-1.6.43
+++ b/metadata/md5-cache/sci-calculators/calculator-1.6.43
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 DESCRIPTION=Scientific calculator based on the FOX Toolkit
 EAPI=4
 HOMEPAGE=http://www.fox-toolkit.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/fox:1.6
 SLOT=0
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.6.43.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7f17c6c22ac2361272c612f9212153b7
diff --git a/metadata/md5-cache/sci-calculators/calculator-1.7.32 b/metadata/md5-cache/sci-calculators/calculator-1.7.32
index 0fdc329c769c..e41ed420db5f 100644
--- a/metadata/md5-cache/sci-calculators/calculator-1.7.32
+++ b/metadata/md5-cache/sci-calculators/calculator-1.7.32
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=~x11-libs/fox-1.7.32 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+DEPEND=~x11-libs/fox-1.7.32 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 DESCRIPTION=Scientific calculator based on the FOX Toolkit
 EAPI=4
 HOMEPAGE=http://www.fox-toolkit.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=~x11-libs/fox-1.7.32
 SLOT=0
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.32.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8c463ed1d3d7fa4b72217836c8d41522
diff --git a/metadata/md5-cache/sci-calculators/calculator-1.7.33 b/metadata/md5-cache/sci-calculators/calculator-1.7.33
index e033e8adac52..5558bdbb7403 100644
--- a/metadata/md5-cache/sci-calculators/calculator-1.7.33
+++ b/metadata/md5-cache/sci-calculators/calculator-1.7.33
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=~x11-libs/fox-1.7.33 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+DEPEND=~x11-libs/fox-1.7.33 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 DESCRIPTION=Scientific calculator based on the FOX Toolkit
 EAPI=4
 HOMEPAGE=http://www.fox-toolkit.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=~x11-libs/fox-1.7.33
 SLOT=0
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.33.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=96d41d2427e7f7d9dd9d27fd60456552
diff --git a/metadata/md5-cache/sci-calculators/calculator-1.7.37 b/metadata/md5-cache/sci-calculators/calculator-1.7.37
index 19bf46ed1f17..585bce51b892 100644
--- a/metadata/md5-cache/sci-calculators/calculator-1.7.37
+++ b/metadata/md5-cache/sci-calculators/calculator-1.7.37
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=~x11-libs/fox-1.7.37 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+DEPEND=~x11-libs/fox-1.7.37 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 DESCRIPTION=Scientific calculator based on the FOX Toolkit
 EAPI=4
 HOMEPAGE=http://www.fox-toolkit.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=~x11-libs/fox-1.7.37
 SLOT=0
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.37.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7fba45f631eccf27d49fd0f93a392c16
diff --git a/metadata/md5-cache/sci-calculators/galculator-1.3.4 b/metadata/md5-cache/sci-calculators/galculator-1.3.4
index 3372e6c111d3..464aadcce13c 100644
--- a/metadata/md5-cache/sci-calculators/galculator-1.3.4
+++ b/metadata/md5-cache/sci-calculators/galculator-1.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=dev-libs/glib:2 gnome-base/libglade:2.0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango gnome-base/libglade:2.0 dev-util/intltool sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 gnome-base/libglade:2.0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango gnome-base/libglade:2.0 dev-util/intltool sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK+ based algebraic and RPN calculator.
 EAPI=4
 HOMEPAGE=http://galculator.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gnome-base/libglade:2.0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango gnome-base/libglade:2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/galculator/galculator-1.3.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3c45a240ea2c2ec70cf6ced7049725f3
diff --git a/metadata/md5-cache/sci-calculators/orpie-1.5.1-r1 b/metadata/md5-cache/sci-calculators/orpie-1.5.1-r1
index e56303841050..adbdf122037c 100644
--- a/metadata/md5-cache/sci-calculators/orpie-1.5.1-r1
+++ b/metadata/md5-cache/sci-calculators/orpie-1.5.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-ml/ocamlgsl sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-ml/ocamlgsl sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fullscreen RPN calculator for the console
 EAPI=4
 HOMEPAGE=http://pessimization.com/software/orpie/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-ml/ocamlgsl sys-libs/ncurses
 SLOT=0
 SRC_URI=http://pessimization.com/software/orpie/orpie-1.5.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f53e1d2a64685687af611fc275f9ca6c
diff --git a/metadata/md5-cache/sci-calculators/qalculate-bases-0.9.4-r2 b/metadata/md5-cache/sci-calculators/qalculate-bases-0.9.4-r2
index ff74e560ecca..e2df7b6d9d0e 100644
--- a/metadata/md5-cache/sci-calculators/qalculate-bases-0.9.4-r2
+++ b/metadata/md5-cache/sci-calculators/qalculate-bases-0.9.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=sci-libs/libqalculate x11-libs/gtk+:2 nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/libqalculate x11-libs/gtk+:2 nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK+ base conversion tool
 EAPI=4
 HOMEPAGE=http://qalculate.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-libs/libqalculate x11-libs/gtk+:2 nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=mirror://sourceforge/qalculate/qalculate-bases-0.9.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c24c8cf4bf71f32052868936fafadd0a
diff --git a/metadata/md5-cache/sci-calculators/qalculate-currency-0.9.4-r2 b/metadata/md5-cache/sci-calculators/qalculate-currency-0.9.4-r2
index 297545a630ce..1abdf5015d72 100644
--- a/metadata/md5-cache/sci-calculators/qalculate-currency-0.9.4-r2
+++ b/metadata/md5-cache/sci-calculators/qalculate-currency-0.9.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=sci-libs/libqalculate x11-libs/gtk+:2 nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/libqalculate x11-libs/gtk+:2 nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A GTK+ currency converter
 EAPI=4
 HOMEPAGE=http://qalculate.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-libs/libqalculate x11-libs/gtk+:2 nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=mirror://sourceforge/qalculate/qalculate-currency-0.9.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b58358c8e07cddfc128c4398cd4bd29b
diff --git a/metadata/md5-cache/sci-calculators/qalculate-units-0.9.4-r2 b/metadata/md5-cache/sci-calculators/qalculate-units-0.9.4-r2
index d57e19779689..2cd923d247a0 100644
--- a/metadata/md5-cache/sci-calculators/qalculate-units-0.9.4-r2
+++ b/metadata/md5-cache/sci-calculators/qalculate-units-0.9.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=sci-libs/libqalculate x11-libs/gtk+:2 nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/libqalculate x11-libs/gtk+:2 nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A GTK+ unit conversion tool
 EAPI=4
 HOMEPAGE=http://qalculate.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-libs/libqalculate x11-libs/gtk+:2 nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=mirror://sourceforge/qalculate/qalculate-units-0.9.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a11a625d1853d241e29dcb76e41ac63d
diff --git a/metadata/md5-cache/sci-calculators/units-2.01 b/metadata/md5-cache/sci-calculators/units-2.01
index 12257f570734..b605e4a3f498 100644
--- a/metadata/md5-cache/sci-calculators/units-2.01
+++ b/metadata/md5-cache/sci-calculators/units-2.01
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=>=sys-libs/readline-4.1-r2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/readline-4.1-r2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Unit conversion program
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/units/units.html
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( dev-lang/python:2.5 dev-lang/python:2.6 dev-lang/python:2.7 ) >=sys-libs/readline-4.1-r2
 SLOT=0
 SRC_URI=mirror://gnu/units/units-2.01.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=720a6e328eea5f744af83d2cfedaead3
diff --git a/metadata/md5-cache/sci-chemistry/apbs-1.2.1b-r4 b/metadata/md5-cache/sci-chemistry/apbs-1.2.1b-r4
index 47462e7b69be..683e395e46f1 100644
--- a/metadata/md5-cache/sci-chemistry/apbs-1.2.1b-r4
+++ b/metadata/md5-cache/sci-chemistry/apbs-1.2.1b-r4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup test
-DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran python? ( =dev-lang/python-2* )
-DESCRIPTION=Software for evaluating the electrostatic properties of nanoscale biomolecular systems
+DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran python? ( =dev-lang/python-2* )
+DESCRIPTION=Evaluation of electrostatic properties of nanoscale biomolecular systems
 EAPI=3
-HOMEPAGE=http://apbs.sourceforge.net/
+HOMEPAGE=http://www.poissonboltzmann.org/apbs/
 IUSE=arpack doc mpi openmp python tools
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-libs/maloc[mpi=] virtual/blas sys-libs/readline arpack? ( sci-libs/arpack ) tools? ( !sci-libs/gts ) mpi? ( virtual/mpi ) virtual/fortran python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/apbs/apbs-1.2.1b-source.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d56f523d68977be039234705902c88f7
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=19ed78a63b32bc9acd82a9d3d0044890
diff --git a/metadata/md5-cache/sci-chemistry/apbs-1.3-r3 b/metadata/md5-cache/sci-chemistry/apbs-1.3-r3
index df2ea94f92d3..91a6bf55ffbc 100644
--- a/metadata/md5-cache/sci-chemistry/apbs-1.3-r3
+++ b/metadata/md5-cache/sci-chemistry/apbs-1.3-r3
@@ -1,8 +1,8 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=virtual/pkgconfig virtual/fortran python? ( =dev-lang/python-2* )
-DESCRIPTION=For evaluation of electrostatic properties of nanoscale biomolecular systems
+DESCRIPTION=Evaluation of electrostatic properties of nanoscale biomolecular systems
 EAPI=4
-HOMEPAGE=http://apbs.sourceforge.net/
+HOMEPAGE=http://www.poissonboltzmann.org/apbs/
 IUSE=arpack doc examples fetk mpi openmp python static-libs tools
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/maloc[mpi=] virtual/blas sys-libs/readline arpack? ( sci-libs/a
 REQUIRED_USE=mpi? ( !python )
 SLOT=0
 SRC_URI=mirror://sourceforge/apbs/apbs-1.3-source.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6bdcba8fed9ff47658b145b92a70c24e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=13d1c34e42d35301126b972aa707bb25
diff --git a/metadata/md5-cache/sci-chemistry/autodock-4.2.3-r1 b/metadata/md5-cache/sci-chemistry/autodock-4.2.3-r1
index 849f1f78c942..17eea990617c 100644
--- a/metadata/md5-cache/sci-chemistry/autodock-4.2.3-r1
+++ b/metadata/md5-cache/sci-chemistry/autodock-4.2.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( =dev-lang/python-2* )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( =dev-lang/python-2* )
 DESCRIPTION=A suite of automated docking tools
 EAPI=3
 HOMEPAGE=http://autodock.scripps.edu/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=test? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://gentoo/autodocksuite/autodocksuite-4.2.3-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b285e290ca8915fc7fdebd9d60785fd7
diff --git a/metadata/md5-cache/sci-chemistry/burrow-owl-1.5.1 b/metadata/md5-cache/sci-chemistry/burrow-owl-1.5.1
index 03159aca484d..8f12aa4423f3 100644
--- a/metadata/md5-cache/sci-chemistry/burrow-owl-1.5.1
+++ b/metadata/md5-cache/sci-chemistry/burrow-owl-1.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=mirror://sourceforge/burrow-owl/burrow-owl-1.5.1.tar.gz examples? ( mirror://sourceforge/burrow-owl/burrow-demos.tar )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=12f1f533d8d94c12349c011f29006166
diff --git a/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r11 b/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r11
index 2b0fa625c68e..11a16a5d3bdb 100644
--- a/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r11
+++ b/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=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 !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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran sys-devel/gnuconfig =dev-lang/python-2*
+DEPEND=>=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 !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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran sys-devel/gnuconfig =dev-lang/python-2*
 DESCRIPTION=Protein X-ray crystallography toolkit
 EAPI=3
 HOMEPAGE=http://www.ccp4.ac.uk/
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/tk-8.3 >=dev-tcltk/blt-2.4 dev-tcltk/iwidgets dev-tcltk/itcl
 RESTRICT=mirror
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=934945428a0a7668fc9d25f6f48b7b48
diff --git a/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r12 b/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r12
index a51421a611c8..3ea70c757b99 100644
--- a/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r12
+++ b/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=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 !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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran sys-devel/gnuconfig =dev-lang/python-2*
+DEPEND=>=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 !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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran sys-devel/gnuconfig =dev-lang/python-2*
 DESCRIPTION=Protein X-ray crystallography toolkit
 EAPI=3
 HOMEPAGE=http://www.ccp4.ac.uk/
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/tk-8.3 >=dev-tcltk/blt-2.4 dev-tcltk/iwidgets dev-tcltk/itcl
 RESTRICT=mirror
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0b047b0525ce036c757c0b4825394b77
diff --git a/metadata/md5-cache/sci-chemistry/chemtool-1.6.12-r1 b/metadata/md5-cache/sci-chemistry/chemtool-1.6.12-r1
index 20d2a3c5c5e5..4e9201444c0a 100644
--- a/metadata/md5-cache/sci-chemistry/chemtool-1.6.12-r1
+++ b/metadata/md5-cache/sci-chemistry/chemtool-1.6.12-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A GTK program for drawing organic molecules
 EAPI=4
 HOMEPAGE=http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf )
 SLOT=0
 SRC_URI=http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool-1.6.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a68292681b4e53acf406ea9d482bcf98
diff --git a/metadata/md5-cache/sci-chemistry/chemtool-1.6.13 b/metadata/md5-cache/sci-chemistry/chemtool-1.6.13
index e2c1c8ab8f81..c792e3cc246e 100644
--- a/metadata/md5-cache/sci-chemistry/chemtool-1.6.13
+++ b/metadata/md5-cache/sci-chemistry/chemtool-1.6.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A GTK program for drawing organic molecules
 EAPI=4
 HOMEPAGE=http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf )
 SLOT=0
 SRC_URI=http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool-1.6.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ff69e256a0c2c398ab72bcc3a8e32952
diff --git a/metadata/md5-cache/sci-chemistry/coot-0.6.2 b/metadata/md5-cache/sci-chemistry/coot-0.6.2
index f01a5da3008d..1d3ea5271388 100644
--- a/metadata/md5-cache/sci-chemistry/coot-0.6.2
+++ b/metadata/md5-cache/sci-chemistry/coot-0.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=Crystallographic Object-Oriented Toolkit for model building, completion and validation
 EAPI=3
 HOMEPAGE=http://www.biop.ox.ac.uk/coot/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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*
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aed2d51047e96f0287a371d160b48573
diff --git a/metadata/md5-cache/sci-chemistry/coot-0.6.2-r1 b/metadata/md5-cache/sci-chemistry/coot-0.6.2-r1
index b158b8060387..44c94ca38917 100644
--- a/metadata/md5-cache/sci-chemistry/coot-0.6.2-r1
+++ b/metadata/md5-cache/sci-chemistry/coot-0.6.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=Crystallographic Object-Oriented Toolkit for model building, completion and validation
 EAPI=3
 HOMEPAGE=http://www.biop.ox.ac.uk/coot/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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*
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a680346a7f4308767f7b0c3d820703ab
diff --git a/metadata/md5-cache/sci-chemistry/coot-0.7 b/metadata/md5-cache/sci-chemistry/coot-0.7
index 6502cd9f1f67..006cbb27ec17 100644
--- a/metadata/md5-cache/sci-chemistry/coot-0.7
+++ b/metadata/md5-cache/sci-chemistry/coot-0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=Crystallographic Object-Oriented Toolkit for model building, completion and validation
 EAPI=4
 HOMEPAGE=http://www.biop.ox.ac.uk/coot/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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*
 SLOT=0
 SRC_URI=http://www.biop.ox.ac.uk/coot/software/source/releases/coot-0.7.tar.gz test? ( http://dev.gentoo.org/~jlec/distfiles/greg-data-0.7.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=092ea069b39fa7afa1846735e96f0f41
diff --git a/metadata/md5-cache/sci-chemistry/gelemental-1.2.0 b/metadata/md5-cache/sci-chemistry/gelemental-1.2.0
index b4281568e41a..1c95c06905a4 100644
--- a/metadata/md5-cache/sci-chemistry/gelemental-1.2.0
+++ b/metadata/md5-cache/sci-chemistry/gelemental-1.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3 MIT
 RDEPEND=dev-cpp/gtkmm:2.4 dev-cpp/glibmm:2
 SLOT=0
 SRC_URI=http://www.kdau.com/files/gelemental-1.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3a9c884ca54a0defddbf8a623a33aefc
diff --git a/metadata/md5-cache/sci-chemistry/gelemental-1.2.0-r1 b/metadata/md5-cache/sci-chemistry/gelemental-1.2.0-r1
index e0dacb336960..51cfe1ee5817 100644
--- a/metadata/md5-cache/sci-chemistry/gelemental-1.2.0-r1
+++ b/metadata/md5-cache/sci-chemistry/gelemental-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 MIT
 RDEPEND=dev-cpp/gtkmm:2.4 dev-cpp/glibmm:2
 SLOT=0
 SRC_URI=http://www.kdau.com/files/gelemental-1.2.0.tar.bz2 mirror://debian/pool/main/g/gelemental/gelemental_1.2.0-8.debian.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=62c74e742ea3dfc5d9c99cf5dfd99bfb
diff --git a/metadata/md5-cache/sci-chemistry/ghemical-2.99.2-r2 b/metadata/md5-cache/sci-chemistry/ghemical-2.99.2-r2
index 6bf826712eb8..13147d8c75af 100644
--- a/metadata/md5-cache/sci-chemistry/ghemical-2.99.2-r2
+++ b/metadata/md5-cache/sci-chemistry/ghemical-2.99.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Chemical quantum mechanics and molecular mechanics
 EAPI=3
 HOMEPAGE=http://bioinformatics.org/ghemical/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://bioinformatics.org/ghemical/download/current/ghemical-2.99.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d8aae5f5fdeee7fe0227b72610e551f0
diff --git a/metadata/md5-cache/sci-chemistry/ghemical-3.0.0 b/metadata/md5-cache/sci-chemistry/ghemical-3.0.0
index 957d3e55d7d4..5d953f237d73 100644
--- a/metadata/md5-cache/sci-chemistry/ghemical-3.0.0
+++ b/metadata/md5-cache/sci-chemistry/ghemical-3.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 gnome-base/libglade:2.0 sci-chemistry/mpqc >=sci-libs/libghemical-3.0.0 >=x11-libs/liboglappth-1.0.0 virtual/opengl x11-libs/pango x11-libs/gtk+:2 x11-libs/gtkglext openbabel? ( sci-chemistry/openbabel ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 gnome-base/libglade:2.0 sci-chemistry/mpqc >=sci-libs/libghemical-3.0.0 >=x11-libs/liboglappth-1.0.0 virtual/opengl x11-libs/pango x11-libs/gtk+:2 x11-libs/gtkglext openbabel? ( sci-chemistry/openbabel ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Chemical quantum mechanics and molecular mechanics
 EAPI=3
 HOMEPAGE=http://bioinformatics.org/ghemical/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gnome-base/libglade:2.0 sci-chemistry/mpqc >=sci-libs/libghemical-3.0.0 >=x11-libs/liboglappth-1.0.0 virtual/opengl x11-libs/pango x11-libs/gtk+:2 x11-libs/gtkglext openbabel? ( sci-chemistry/openbabel )
 SLOT=0
 SRC_URI=http://bioinformatics.org/ghemical/download/current/ghemical-3.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e21acfa78efa1bf5bea89f75cb50156
diff --git a/metadata/md5-cache/sci-chemistry/mopac7-1.10-r1 b/metadata/md5-cache/sci-chemistry/mopac7-1.10-r1
index 4a1aaf6cba3e..720d7f79f3fa 100644
--- a/metadata/md5-cache/sci-chemistry/mopac7-1.10-r1
+++ b/metadata/md5-cache/sci-chemistry/mopac7-1.10-r1
@@ -7,5 +7,5 @@ LICENSE=mopac7
 RDEPEND=dev-libs/libf2c virtual/fortran
 SLOT=0
 SRC_URI=mirror://sourceforge/mopac7/mopac7-1.10.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=77a37e4e19a3fc60c80d9e8d066a9f2c
diff --git a/metadata/md5-cache/sci-chemistry/mopac7-1.15 b/metadata/md5-cache/sci-chemistry/mopac7-1.15
index 3bbaa54eb3eb..11d7975f3bf8 100644
--- a/metadata/md5-cache/sci-chemistry/mopac7-1.15
+++ b/metadata/md5-cache/sci-chemistry/mopac7-1.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/libf2c || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=dev-libs/libf2c || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Autotooled, updated version of a powerful, fast semi-empirical package
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/mopac7/
@@ -9,5 +9,5 @@ LICENSE=mopac7
 RDEPEND=dev-libs/libf2c virtual/fortran
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e3c0f2fbb8871211f8b96be77f494b2
diff --git a/metadata/md5-cache/sci-chemistry/mpqc-2.3.1-r2 b/metadata/md5-cache/sci-chemistry/mpqc-2.3.1-r2
index 4e1daaab6ce7..257c2e459501 100644
--- a/metadata/md5-cache/sci-chemistry/mpqc-2.3.1-r2
+++ b/metadata/md5-cache/sci-chemistry/mpqc-2.3.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare test
-DEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[cxx] ) tk? ( dev-lang/tk ) dev-lang/perl sys-devel/flex sys-apps/sed virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[cxx] ) tk? ( dev-lang/tk ) dev-lang/perl sys-devel/flex sys-apps/sed virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Massively Parallel Quantum Chemistry Program
 EAPI=2
 HOMEPAGE=http://www.mpqc.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[cxx] ) tk? ( dev-lang/tk )
 SLOT=0
 SRC_URI=mirror://sourceforge/mpqc/mpqc-2.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f322c827ea5d7732b89cc66f7f02d820
diff --git a/metadata/md5-cache/sci-chemistry/mpqc-2.3.1-r3 b/metadata/md5-cache/sci-chemistry/mpqc-2.3.1-r3
index 9bcedd262a72..97eb86a9a2d2 100644
--- a/metadata/md5-cache/sci-chemistry/mpqc-2.3.1-r3
+++ b/metadata/md5-cache/sci-chemistry/mpqc-2.3.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[cxx] ) tk? ( dev-lang/tk ) dev-lang/perl sys-devel/flex sys-apps/sed virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[cxx] ) tk? ( dev-lang/tk ) dev-lang/perl sys-devel/flex sys-apps/sed virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Massively Parallel Quantum Chemistry Program
 EAPI=4
 HOMEPAGE=http://www.mpqc.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[cxx] ) tk? ( dev-lang/tk )
 SLOT=0
 SRC_URI=mirror://sourceforge/mpqc/mpqc-2.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d44a89983db3eda43fe1be98d66d1563
diff --git a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.5.0-r2 b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.5.0-r2
index cf8530001448..da491c861463 100644
--- a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.5.0-r2
+++ b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.5.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+DEPEND=dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 DESCRIPTION=An automated pipeline for performing Poisson-Boltzmann electrostatics calculations
 EAPI=3
 HOMEPAGE=http://pdb2pqr.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) virtual/fortran || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=mirror://sourceforge/pdb2pqr/pdb2pqr-1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c452b1c979e799b09dfe883ca7d047b3
diff --git a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.7.0 b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.7.0
index 9d27756416d8..68fc6b65b61c 100644
--- a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.7.0
+++ b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+DEPEND=dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 DESCRIPTION=An automated pipeline for performing Poisson-Boltzmann electrostatics calculations
 EAPI=3
 HOMEPAGE=http://pdb2pqr.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) virtual/fortran || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=mirror://sourceforge/pdb2pqr/pdb2pqr-1.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=653d9ae5cfcc9cabd334c80a8566d7bd
diff --git a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.7.0-r2 b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.7.0-r2
index 18ea2e3401f7..e0c25832dda1 100644
--- a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.7.0-r2
+++ b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.7.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) pdb2pka? ( sci-chemistry/apbs[python,-mpi] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+DEPEND=dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) pdb2pka? ( sci-chemistry/apbs[python,-mpi] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 DESCRIPTION=An automated pipeline for performing Poisson-Boltzmann electrostatics calculations
 EAPI=4
 HOMEPAGE=http://pdb2pqr.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) pdb2pka? ( sci-chemistry/apbs[python,-mpi] ) virtual/fortran || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=mirror://sourceforge/pdb2pqr/pdb2pqr-1.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aa6bf48e07bfada7c6af5406d99bebd6
diff --git a/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2 b/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2
index 302f030a23ef..833ede83885b 100644
--- a/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2
+++ b/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sci-visualization/extrema virtual/blas virtual/lapack >=sci-libs/libint-1.1.4 virtual/fortran
 SLOT=0
 SRC_URI=mirror://sourceforge/psicode/psi-3.4.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9436a5af8a510f7235e1a31ef27cf4dc
diff --git a/metadata/md5-cache/sci-chemistry/scala-3.3.20 b/metadata/md5-cache/sci-chemistry/scala-3.3.20
index 7298ac8e3857..ab53e81a51a6 100644
--- a/metadata/md5-cache/sci-chemistry/scala-3.3.20
+++ b/metadata/md5-cache/sci-chemistry/scala-3.3.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare setup
-DEPEND=!<sci-chemistry/ccp4-6.1.2 sci-libs/ccp4-libs virtual/lapack virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=!<sci-chemistry/ccp4-6.1.2 sci-libs/ccp4-libs virtual/lapack virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Scale together multiple observations of reflections
 EAPI=4
 HOMEPAGE=http://www.ccp4.ac.uk/dist/html/scala.html
@@ -8,5 +8,5 @@ LICENSE=ccp4
 RDEPEND=!<sci-chemistry/ccp4-6.1.2 sci-libs/ccp4-libs virtual/lapack virtual/fortran
 SLOT=0
 SRC_URI=ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/scala-3.3.20.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8cc76c3bc2667f56df704743cfc3f6db
diff --git a/metadata/md5-cache/sci-chemistry/shelx-20060317-r1 b/metadata/md5-cache/sci-chemistry/shelx-20060317-r1
index 66cb1cfa51b3..739d6a470db8 100644
--- a/metadata/md5-cache/sci-chemistry/shelx-20060317-r1
+++ b/metadata/md5-cache/sci-chemistry/shelx-20060317-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile info install nofetch postinst setup unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Programs for crystal structure determination from single-crystal diffraction data
 HOMEPAGE=http://shelx.uni-ac.gwdg.de/SHELX/
 IUSE=dosformat openmp
@@ -9,5 +9,5 @@ RDEPEND=virtual/fortran
 RESTRICT=fetch
 SLOT=0
 SRC_URI=shelx-20060317.tgz openmp? ( shelx-20060317-mp.tgz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a6a0ad712cdfc62e8d75a848f5f65f6f
diff --git a/metadata/md5-cache/sci-chemistry/wxmacmolplt-7.4.2 b/metadata/md5-cache/sci-chemistry/wxmacmolplt-7.4.2
index 67072ba6b1ca..7d44b84b2779 100644
--- a/metadata/md5-cache/sci-chemistry/wxmacmolplt-7.4.2
+++ b/metadata/md5-cache/sci-chemistry/wxmacmolplt-7.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=media-libs/glew-1.5.3 media-libs/mesa x11-libs/wxGTK:2.8[X,opengl] flash? ( media-libs/ming ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/glew-1.5.3 media-libs/mesa x11-libs/wxGTK:2.8[X,opengl] flash? ( media-libs/ming ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Chemical 3D graphics program with GAMESS input builder
 EAPI=3
 HOMEPAGE=http://www.scl.ameslab.gov/MacMolPlt/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/glew-1.5.3 media-libs/mesa x11-libs/wxGTK:2.8[X,opengl] flash? ( media-libs/ming )
 SLOT=0
 SRC_URI=http://www.scl.ameslab.gov/MacMolPlt/download/wxmacmolplt-7.4.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=2d3ce1d6e6afccea66e6b24333439f26
diff --git a/metadata/md5-cache/sci-electronics/balsa-4.0 b/metadata/md5-cache/sci-electronics/balsa-4.0
index caa3a5cbe577..e73e105feb64 100644
--- a/metadata/md5-cache/sci-electronics/balsa-4.0
+++ b/metadata/md5-cache/sci-electronics/balsa-4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=dev-lang/perl dev-libs/gmp sci-electronics/gplcver sci-electronics/iverilog x11-libs/gtk+:2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl dev-libs/gmp sci-electronics/gplcver sci-electronics/iverilog x11-libs/gtk+:2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Balsa asynchronous synthesis system
 EAPI=1
 HOMEPAGE=http://www.cs.manchester.ac.uk/apt/projects/tools/balsa/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=460d87d38e155e11c789c4f740ebaffe
diff --git a/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r2 b/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r2
index 46a9c0814ef5..93ba981a45c4 100644
--- a/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r2
+++ b/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2*
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2*
 DESCRIPTION=A graphical front-end for the gschem -> pcb workflow
 EAPI=3
 HOMEPAGE=http://www.gpleda.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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*
 SLOT=0
 SRC_URI=http://geda.seul.org/dist/geda-xgsch2pcb-0.1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b823252dfe4d34149bcdf224b8938a2e
diff --git a/metadata/md5-cache/sci-electronics/gsmc-1.1-r1 b/metadata/md5-cache/sci-electronics/gsmc-1.1-r1
index 61209382e73a..65df20e40afb 100644
--- a/metadata/md5-cache/sci-electronics/gsmc-1.1-r1
+++ b/metadata/md5-cache/sci-electronics/gsmc-1.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A GTK program for doing Smith Chart calculations
 EAPI=2
 HOMEPAGE=http://www.qsl.net/ik5nax/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://www.qsl.net/ik5nax/gsmc-1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4965dbad01246b364e0f7d828d51fe3e
diff --git a/metadata/md5-cache/sci-electronics/gspeakers-0.11-r1 b/metadata/md5-cache/sci-electronics/gspeakers-0.11-r1
index 21ea4e9f9a62..0838a6b604f4 100644
--- a/metadata/md5-cache/sci-electronics/gspeakers-0.11-r1
+++ b/metadata/md5-cache/sci-electronics/gspeakers-0.11-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-cpp/gtkmm:2.4 dev-libs/libxml2:2 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-cpp/gtkmm:2.4 dev-libs/libxml2:2 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK based loudspeaker enclosure and crossovernetwork designer
 EAPI=4
 HOMEPAGE=http://gspeakers.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-cpp/gtkmm:2.4 dev-libs/libxml2:2 || ( sci-electronics/gnucap sci-electronics/ngspice sci-electronics/spice )
 SLOT=0
 SRC_URI=mirror://sourceforge/gspeakers/gspeakers-0.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eb3f5345c14c770619ad3e970038eea9
diff --git a/metadata/md5-cache/sci-electronics/gtkwave-3.3.42 b/metadata/md5-cache/sci-electronics/gtkwave-3.3.42
index bf80553c8bbf..32ab1e1061a1 100644
--- a/metadata/md5-cache/sci-electronics/gtkwave-3.3.42
+++ b/metadata/md5-cache/sci-electronics/gtkwave-3.3.42
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/pango sys-libs/zlib judy? ( dev-libs/judy ) tcl? ( dev-lang/tcl dev-lang/tk ) lzma? ( app-arch/xz-utils ) virtual/pkgconfig dev-util/gperf || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/pango sys-libs/zlib judy? ( dev-libs/judy ) tcl? ( dev-lang/tcl dev-lang/tk ) lzma? ( app-arch/xz-utils ) virtual/pkgconfig dev-util/gperf || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files
 EAPI=4
 HOMEPAGE=http://gtkwave.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 MIT
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/pango sys-libs/zlib judy? ( dev-libs/judy ) tcl? ( dev-lang/tcl dev-lang/tk ) lzma? ( app-arch/xz-utils )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtkwave/gtkwave-3.3.42.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8a6979c01098e746785da035b0d67571
diff --git a/metadata/md5-cache/sci-electronics/gwave-20090213-r1 b/metadata/md5-cache/sci-electronics/gwave-20090213-r1
index 5ae26e0cb267..64e1663a7191 100644
--- a/metadata/md5-cache/sci-electronics/gwave-20090213-r1
+++ b/metadata/md5-cache/sci-electronics/gwave-20090213-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND==dev-scheme/guile-1.8*[networking] =dev-scheme/guile-gnome-platform-2.16* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND==dev-scheme/guile-1.8*[networking] =dev-scheme/guile-gnome-platform-2.16* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Analog waveform viewer for SPICE-like simulations
 EAPI=2
 HOMEPAGE=http://gwave.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gwave/gwave2-20090213.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aef7a00704c9e90506c14c8e99b649c6
diff --git a/metadata/md5-cache/sci-electronics/linsmith-0.99.21 b/metadata/md5-cache/sci-electronics/linsmith-0.99.21
index 87f4de75f77b..8f8d3278641f 100644
--- a/metadata/md5-cache/sci-electronics/linsmith-0.99.21
+++ b/metadata/md5-cache/sci-electronics/linsmith-0.99.21
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Smith charting program, mainly designed for educational use.
 EAPI=2
 HOMEPAGE=http://www.jcoppens.com/soft/linsmith/index.en.php
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui
 SLOT=0
 SRC_URI=mirror://sourceforge/linsmith/linsmith-0.99.21.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a3a84a69b78b2124189c9184ec7937fc
diff --git a/metadata/md5-cache/sci-electronics/linsmith-0.99.22 b/metadata/md5-cache/sci-electronics/linsmith-0.99.22
index 207b57609d04..83bc899dc2e2 100644
--- a/metadata/md5-cache/sci-electronics/linsmith-0.99.22
+++ b/metadata/md5-cache/sci-electronics/linsmith-0.99.22
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Smith charting program, mainly designed for educational use.
 EAPI=2
 HOMEPAGE=http://www.jcoppens.com/soft/linsmith/index.en.php
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui
 SLOT=0
 SRC_URI=mirror://sourceforge/linsmith/linsmith-0.99.22.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b7ab28a569d9eb641fde355b2b8582b6
diff --git a/metadata/md5-cache/sci-electronics/linsmith-0.99.24 b/metadata/md5-cache/sci-electronics/linsmith-0.99.24
index 37ae8b9b2dfd..017677d1778b 100644
--- a/metadata/md5-cache/sci-electronics/linsmith-0.99.24
+++ b/metadata/md5-cache/sci-electronics/linsmith-0.99.24
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Smith charting program, mainly designed for educational use.
 EAPI=2
 HOMEPAGE=http://www.jcoppens.com/soft/linsmith/index.en.php
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui
 SLOT=0
 SRC_URI=mirror://sourceforge/linsmith/linsmith-0.99.24.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=701b583dba526bfcb60e7a2f69bd2c59
diff --git a/metadata/md5-cache/sci-electronics/magic-7.5.202 b/metadata/md5-cache/sci-electronics/magic-7.5.202
index b7b432b17255..b6862057f7bb 100644
--- a/metadata/md5-cache/sci-electronics/magic-7.5.202
+++ b/metadata/md5-cache/sci-electronics/magic-7.5.202
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses sys-libs/readline dev-lang/tcl dev-lang/tk dev-tcltk/blt app-shells/tcsh || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses sys-libs/readline dev-lang/tcl dev-lang/tk dev-tcltk/blt app-shells/tcsh || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The VLSI design CAD tool.
 EAPI=2
 HOMEPAGE=http://www.opencircuitdesign.com/magic/index.html
@@ -8,5 +8,5 @@ LICENSE=HPND GPL-2+
 RDEPEND=sys-libs/ncurses sys-libs/readline dev-lang/tcl dev-lang/tk dev-tcltk/blt
 SLOT=0
 SRC_URI=http://www.opencircuitdesign.com/magic/archive/magic-7.5.202.tgz ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=68730b1324a4473ca061bccc0d6a5b67
diff --git a/metadata/md5-cache/sci-electronics/magic-7.5.202-r1 b/metadata/md5-cache/sci-electronics/magic-7.5.202-r1
index 41a0a13a7c3f..0e510e63bd92 100644
--- a/metadata/md5-cache/sci-electronics/magic-7.5.202-r1
+++ b/metadata/md5-cache/sci-electronics/magic-7.5.202-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses sys-libs/readline dev-lang/tcl dev-lang/tk dev-tcltk/blt app-shells/tcsh || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses sys-libs/readline dev-lang/tcl dev-lang/tk dev-tcltk/blt app-shells/tcsh || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The VLSI design CAD tool.
 EAPI=5
 HOMEPAGE=http://www.opencircuitdesign.com/magic/index.html
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=HPND GPL-2+
 RDEPEND=sys-libs/ncurses sys-libs/readline dev-lang/tcl dev-lang/tk dev-tcltk/blt
 SLOT=0
 SRC_URI=http://www.opencircuitdesign.com/magic/archive/magic-7.5.202.tgz ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6e5302b91fa0ccd12417f3bfdac0ad10
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=621cc6f3d4f8670abe4d108525a66812
diff --git a/metadata/md5-cache/sci-electronics/magic-7.5.230 b/metadata/md5-cache/sci-electronics/magic-7.5.230
index a2ee49b6820c..940e845610d9 100644
--- a/metadata/md5-cache/sci-electronics/magic-7.5.230
+++ b/metadata/md5-cache/sci-electronics/magic-7.5.230
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses sys-libs/readline dev-lang/tcl dev-lang/tk dev-tcltk/blt app-shells/tcsh || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses sys-libs/readline dev-lang/tcl dev-lang/tk dev-tcltk/blt app-shells/tcsh || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The VLSI design CAD tool.
 EAPI=5
 HOMEPAGE=http://www.opencircuitdesign.com/magic/index.html
@@ -8,5 +8,5 @@ LICENSE=HPND GPL-2+
 RDEPEND=sys-libs/ncurses sys-libs/readline dev-lang/tcl dev-lang/tk dev-tcltk/blt
 SLOT=0
 SRC_URI=http://www.opencircuitdesign.com/magic/archive/magic-7.5.230.tgz ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8aeb692cf8f89b297446d0280f66469e
diff --git a/metadata/md5-cache/sci-electronics/magic-8.0.131 b/metadata/md5-cache/sci-electronics/magic-8.0.131
index d5de01439e7f..401fd790317e 100644
--- a/metadata/md5-cache/sci-electronics/magic-8.0.131
+++ b/metadata/md5-cache/sci-electronics/magic-8.0.131
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses sys-libs/readline dev-lang/tcl dev-lang/tk dev-tcltk/blt app-shells/tcsh || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses sys-libs/readline dev-lang/tcl dev-lang/tk dev-tcltk/blt app-shells/tcsh || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The VLSI design CAD tool.
 EAPI=5
 HOMEPAGE=http://www.opencircuitdesign.com/magic/index.html
@@ -8,5 +8,5 @@ LICENSE=HPND GPL-2+
 RDEPEND=sys-libs/ncurses sys-libs/readline dev-lang/tcl dev-lang/tk dev-tcltk/blt
 SLOT=0
 SRC_URI=http://www.opencircuitdesign.com/magic/archive/magic-8.0.131.tgz ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c0ae9793ce41d90d8d2dba425186cfb1
diff --git a/metadata/md5-cache/sci-electronics/ngspice-24 b/metadata/md5-cache/sci-electronics/ngspice-24
index 0be7c6f475b9..15f8ec28dc6b 100644
--- a/metadata/md5-cache/sci-electronics/ngspice-24
+++ b/metadata/md5-cache/sci-electronics/ngspice-24
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=sys-libs/ncurses readline? ( >=sys-libs/readline-5.0 ) X? ( x11-libs/libXaw x11-libs/libXt x11-libs/libX11 sci-visualization/xgraph ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses readline? ( >=sys-libs/readline-5.0 ) X? ( x11-libs/libXaw x11-libs/libXt x11-libs/libX11 sci-visualization/xgraph ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Next Generation Spice (Electronic Circuit Simulator).
 EAPI=3
 HOMEPAGE=http://ngspice.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses readline? ( >=sys-libs/readline-5.0 ) X? ( x11-libs/libXaw x11-libs/libXt x11-libs/libX11 sci-visualization/xgraph )
 SLOT=0
 SRC_URI=mirror://sourceforge/ngspice/ngspice-24.tar.gz mirror://sourceforge/ngspice/ngspice24-manual.pdf.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=98f67badbf105f075b0aaffbb7b9c28d
diff --git a/metadata/md5-cache/sci-electronics/ngspice-25 b/metadata/md5-cache/sci-electronics/ngspice-25
index 8eae802b5712..9c85390a23f7 100644
--- a/metadata/md5-cache/sci-electronics/ngspice-25
+++ b/metadata/md5-cache/sci-electronics/ngspice-25
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=sys-libs/ncurses readline? ( >=sys-libs/readline-5.0 ) X? ( x11-libs/libXaw x11-libs/libXt x11-libs/libX11 sci-visualization/xgraph ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses readline? ( >=sys-libs/readline-5.0 ) X? ( x11-libs/libXaw x11-libs/libXt x11-libs/libX11 sci-visualization/xgraph ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Next Generation Spice (Electronic Circuit Simulator).
 EAPI=3
 HOMEPAGE=http://ngspice.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses readline? ( >=sys-libs/readline-5.0 ) X? ( x11-libs/libXaw x11-libs/libXt x11-libs/libX11 sci-visualization/xgraph )
 SLOT=0
 SRC_URI=mirror://sourceforge/ngspice/ngspice-25.tar.gz mirror://sourceforge/ngspice/ngspice-25-manual.pdf.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=50e45eac0b5aca7ea2903ceb7b1e6819
diff --git a/metadata/md5-cache/sci-electronics/oregano-0.82 b/metadata/md5-cache/sci-electronics/oregano-0.82
index a9c31f5c0bda..adc810708817 100644
--- a/metadata/md5-cache/sci-electronics/oregano-0.82
+++ b/metadata/md5-cache/sci-electronics/oregano-0.82
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=dev-libs/libxml2:2 x11-libs/goocanvas:2.0 x11-libs/gtk+:3 x11-libs/gtksourceview:3.0 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-libs/libxml2:2 x11-libs/goocanvas:2.0 x11-libs/gtk+:3 x11-libs/gtksourceview:3.0 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Oregano is an application for schematic capture and simulation of electrical circuits.
 EAPI=4
 HOMEPAGE=https://github.com/marc-lorber/oregano
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 x11-libs/goocanvas:2.0 x11-libs/gtk+:3 x11-libs/gtksourceview:3.0 sci-electronics/electronics-menu
 SLOT=0
 SRC_URI=https://github.com/marc-lorber/oregano/tarball/v0.82 -> oregano-0.82.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
 _md5_=da9a434d21d63be8498599c7f16d312d
diff --git a/metadata/md5-cache/sci-electronics/pcb-20110918 b/metadata/md5-cache/sci-electronics/pcb-20110918
index 52a5443095aa..2023ff817f74 100644
--- a/metadata/md5-cache/sci-electronics/pcb-20110918
+++ b/metadata/md5-cache/sci-electronics/pcb-20110918
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=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/motif-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 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=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/motif-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 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=GPL Electronic Design Automation: Printed Circuit Board editor
 EAPI=3
 HOMEPAGE=http://www.gpleda.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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/motif-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
 SLOT=0
 SRC_URI=mirror://sourceforge/pcb/pcb/pcb-20110918/pcb-20110918.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d540bc40d40faf7e47987eca21557100
diff --git a/metadata/md5-cache/sci-electronics/xcircuit-3.4.30 b/metadata/md5-cache/sci-electronics/xcircuit-3.4.30
index 27f3d65bcc29..982f7830c425 100644
--- a/metadata/md5-cache/sci-electronics/xcircuit-3.4.30
+++ b/metadata/md5-cache/sci-electronics/xcircuit-3.4.30
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=app-text/ghostscript-gpl dev-lang/tk x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-text/ghostscript-gpl dev-lang/tk x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Circuit drawing and schematic capture program.
 EAPI=2
 HOMEPAGE=http://opencircuitdesign.com/xcircuit
@@ -9,5 +9,5 @@ RDEPEND=app-text/ghostscript-gpl dev-lang/tk x11-libs/libXt
 RESTRICT=test
 SLOT=0
 SRC_URI=http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.4.30.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3a4b6238731c978b29db06db87267df2
diff --git a/metadata/md5-cache/sci-electronics/xcircuit-3.6.165 b/metadata/md5-cache/sci-electronics/xcircuit-3.6.165
index 374d1afaeab4..598d4560a094 100644
--- a/metadata/md5-cache/sci-electronics/xcircuit-3.6.165
+++ b/metadata/md5-cache/sci-electronics/xcircuit-3.6.165
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Circuit drawing and schematic capture program.
 EAPI=2
 HOMEPAGE=http://opencircuitdesign.com/xcircuit
@@ -9,5 +9,5 @@ RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/l
 RESTRICT=test
 SLOT=0
 SRC_URI=http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.6.165.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=940dd1d2e998fbb78145e4ff7266c529
diff --git a/metadata/md5-cache/sci-electronics/xcircuit-3.7.39 b/metadata/md5-cache/sci-electronics/xcircuit-3.7.39
index 719268fa0033..f7daaee671df 100644
--- a/metadata/md5-cache/sci-electronics/xcircuit-3.7.39
+++ b/metadata/md5-cache/sci-electronics/xcircuit-3.7.39
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Circuit drawing and schematic capture program.
 EAPI=2
 HOMEPAGE=http://opencircuitdesign.com/xcircuit
@@ -9,5 +9,5 @@ RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/l
 RESTRICT=test
 SLOT=0
 SRC_URI=http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.7.39.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3c61992fe7d31f0806033b7216704912
diff --git a/metadata/md5-cache/sci-electronics/xcircuit-3.7.48 b/metadata/md5-cache/sci-electronics/xcircuit-3.7.48
index 850823089559..eaaa91c53309 100644
--- a/metadata/md5-cache/sci-electronics/xcircuit-3.7.48
+++ b/metadata/md5-cache/sci-electronics/xcircuit-3.7.48
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/ghostscript-gpl dev-lang/tk sys-libs/zlib x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-text/ghostscript-gpl dev-lang/tk sys-libs/zlib x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Circuit drawing and schematic capture program.
 EAPI=4
 HOMEPAGE=http://opencircuitdesign.com/xcircuit
@@ -9,5 +9,5 @@ RDEPEND=app-text/ghostscript-gpl dev-lang/tk sys-libs/zlib x11-libs/libX11 x11-l
 RESTRICT=test
 SLOT=0
 SRC_URI=http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.7.48.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=00bdb88a8919e4bb6db825162148a991
diff --git a/metadata/md5-cache/sci-electronics/xcircuit-3.8.36 b/metadata/md5-cache/sci-electronics/xcircuit-3.8.36
index 30f2bfd807a6..525bea10d9c0 100644
--- a/metadata/md5-cache/sci-electronics/xcircuit-3.8.36
+++ b/metadata/md5-cache/sci-electronics/xcircuit-3.8.36
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/ghostscript-gpl dev-lang/tk sys-libs/zlib x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-text/ghostscript-gpl dev-lang/tk sys-libs/zlib x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Circuit drawing and schematic capture program.
 EAPI=4
 HOMEPAGE=http://opencircuitdesign.com/xcircuit
@@ -9,5 +9,5 @@ RDEPEND=app-text/ghostscript-gpl dev-lang/tk sys-libs/zlib x11-libs/libX11 x11-l
 RESTRICT=test
 SLOT=0
 SRC_URI=http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.8.36.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=764ef7b877aa451b9e9bf2b5e65f2859
diff --git a/metadata/md5-cache/sci-electronics/xcircuit-3.8.37 b/metadata/md5-cache/sci-electronics/xcircuit-3.8.37
index cd9fc38ce215..b614673b9e97 100644
--- a/metadata/md5-cache/sci-electronics/xcircuit-3.8.37
+++ b/metadata/md5-cache/sci-electronics/xcircuit-3.8.37
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/ghostscript-gpl dev-lang/tk sys-libs/zlib x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-text/ghostscript-gpl dev-lang/tk sys-libs/zlib x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Circuit drawing and schematic capture program.
 EAPI=4
 HOMEPAGE=http://opencircuitdesign.com/xcircuit
@@ -9,5 +9,5 @@ RDEPEND=app-text/ghostscript-gpl dev-lang/tk sys-libs/zlib x11-libs/libX11 x11-l
 RESTRICT=test
 SLOT=0
 SRC_URI=http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.8.37.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fa0afc385e0eae500145f7b5faa691ce
diff --git a/metadata/md5-cache/sci-electronics/xnec2c-1.4 b/metadata/md5-cache/sci-electronics/xnec2c-1.4
index a29bfc08f7d2..c577fa8f522f 100644
--- a/metadata/md5-cache/sci-electronics/xnec2c-1.4
+++ b/metadata/md5-cache/sci-electronics/xnec2c-1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A GTK+ graphical interactive version of nec2c.
 EAPI=2
 HOMEPAGE=http://5b4az.chronos.org.uk/pages/nec2.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://5b4az.chronos.org.uk/pkg/nec2/xnec2c/xnec2c-1.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=92ca066f8fe37352807c91f063a425e6
diff --git a/metadata/md5-cache/sci-electronics/xnec2c-1.5 b/metadata/md5-cache/sci-electronics/xnec2c-1.5
index 4e4a01db5d1c..16052a11721a 100644
--- a/metadata/md5-cache/sci-electronics/xnec2c-1.5
+++ b/metadata/md5-cache/sci-electronics/xnec2c-1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A GTK+ graphical interactive version of nec2c.
 EAPI=2
 HOMEPAGE=http://www.qsl.net/5b4az/pages/nec2.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://www.qsl.net/5b4az/pkg/nec2/xnec2c/xnec2c-1.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=31be9dc8eb391dd0877a1f507806f932
diff --git a/metadata/md5-cache/sci-electronics/xnec2c-1.6 b/metadata/md5-cache/sci-electronics/xnec2c-1.6
index a8b438311a85..c9ff06bc6c68 100644
--- a/metadata/md5-cache/sci-electronics/xnec2c-1.6
+++ b/metadata/md5-cache/sci-electronics/xnec2c-1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A GTK+ graphical interactive version of nec2c.
 EAPI=2
 HOMEPAGE=http://www.qsl.net/5b4az/pages/nec2.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://www.qsl.net/5b4az/pkg/nec2/xnec2c/xnec2c-1.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e411b3b6911292b7edc64daa2b674545
diff --git a/metadata/md5-cache/sci-electronics/xnec2c-2.0_beta b/metadata/md5-cache/sci-electronics/xnec2c-2.0_beta
index 9bdeed81343d..32b99532fc99 100644
--- a/metadata/md5-cache/sci-electronics/xnec2c-2.0_beta
+++ b/metadata/md5-cache/sci-electronics/xnec2c-2.0_beta
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A GTK+ graphical interactive version of nec2c.
 EAPI=2
 HOMEPAGE=http://www.qsl.net/5b4az/pages/nec2.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://www.qsl.net/5b4az/pkg/nec2/xnec2c/xnec2c-2.0-beta.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e942c83ff421e80e0955cd0f9de8754c
diff --git a/metadata/md5-cache/sci-electronics/xnec2c-2.1_beta b/metadata/md5-cache/sci-electronics/xnec2c-2.1_beta
index 76de9ae5e252..50f9345bc710 100644
--- a/metadata/md5-cache/sci-electronics/xnec2c-2.1_beta
+++ b/metadata/md5-cache/sci-electronics/xnec2c-2.1_beta
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A GTK+ graphical interactive version of nec2c.
 EAPI=4
 HOMEPAGE=http://www.qsl.net/5b4az/pages/nec2.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://www.qsl.net/5b4az/pkg/nec2/xnec2c/xnec2c-2.1-beta.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d7dbdcbb19e3f5fa5ca5493e0378ff56
diff --git a/metadata/md5-cache/sci-electronics/xnec2c-2.3_beta b/metadata/md5-cache/sci-electronics/xnec2c-2.3_beta
index 47b2274a5cfa..49163ede6822 100644
--- a/metadata/md5-cache/sci-electronics/xnec2c-2.3_beta
+++ b/metadata/md5-cache/sci-electronics/xnec2c-2.3_beta
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A GTK+ graphical interactive version of nec2c.
 EAPI=4
 HOMEPAGE=http://www.qsl.net/5b4az/pages/nec2.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://www.qsl.net/5b4az/pkg/nec2/xnec2c/xnec2c-2.3-beta.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=21b5968d9b7ae9f13e966d5e46ace794
diff --git a/metadata/md5-cache/sci-electronics/xoscope-2.0 b/metadata/md5-cache/sci-electronics/xoscope-2.0
index a7d717908ab5..16e4e9b454ca 100644
--- a/metadata/md5-cache/sci-electronics/xoscope-2.0
+++ b/metadata/md5-cache/sci-electronics/xoscope-2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile prepare setup
-DEPEND=x11-libs/gtkdatabox virtual/man virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtkdatabox virtual/man virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Soundcard Oscilloscope for X
 EAPI=4
 HOMEPAGE=http://xoscope.sourceforge.net
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtkdatabox virtual/man
 SLOT=0
 SRC_URI=mirror://sourceforge/xoscope/xoscope-2.0.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dd63314b899472a5a0e2d34fbe42f00f
diff --git a/metadata/md5-cache/sci-geosciences/gmt-4.5.6 b/metadata/md5-cache/sci-geosciences/gmt-4.5.6
index 7c839c3a9a8c..c4335ee107d4 100644
--- a/metadata/md5-cache/sci-geosciences/gmt-4.5.6
+++ b/metadata/md5-cache/sci-geosciences/gmt-4.5.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=!sci-biology/probcons netcdf? ( >=sci-libs/netcdf-4.1 ) octave? ( sci-mathematics/octave ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!sci-biology/probcons netcdf? ( >=sci-libs/netcdf-4.1 ) octave? ( sci-mathematics/octave ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Powerful map generator
 EAPI=4
 HOMEPAGE=http://gmt.soest.hawaii.edu/
@@ -11,5 +11,5 @@ REQUIRED_USE=mex? ( octave ) gmthigh? ( !gmtfull ) gmtfull? ( !gmthigh )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c2ba224c5f7f53022292eef34a00a781
diff --git a/metadata/md5-cache/sci-geosciences/gmt-4.5.8 b/metadata/md5-cache/sci-geosciences/gmt-4.5.8
index 1bd8cb2e1e61..c45d19904034 100644
--- a/metadata/md5-cache/sci-geosciences/gmt-4.5.8
+++ b/metadata/md5-cache/sci-geosciences/gmt-4.5.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!sci-biology/probcons gdal? ( sci-libs/gdal ) netcdf? ( >=sci-libs/netcdf-4.1 ) octave? ( sci-mathematics/octave ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!sci-biology/probcons gdal? ( sci-libs/gdal ) netcdf? ( >=sci-libs/netcdf-4.1 ) octave? ( sci-mathematics/octave ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Powerful map generator
 EAPI=4
 HOMEPAGE=http://gmt.soest.hawaii.edu/
@@ -10,5 +10,5 @@ RDEPEND=!sci-biology/probcons gdal? ( sci-libs/gdal ) netcdf? ( >=sci-libs/netcd
 REQUIRED_USE=mex? ( octave )
 SLOT=0
 SRC_URI=mirror://gmt/gmt-4.5.8.tar.bz2 mirror://gmt/gshhs-2.2.0.tar.bz2 gmttria? ( mirror://gmt/gmt-4.5.8-non-gpl.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=65be49cd22464e3942b921384d3104f3
diff --git a/metadata/md5-cache/sci-geosciences/gmt-4.5.9 b/metadata/md5-cache/sci-geosciences/gmt-4.5.9
index 7617db3820a9..ae54bda886aa 100644
--- a/metadata/md5-cache/sci-geosciences/gmt-4.5.9
+++ b/metadata/md5-cache/sci-geosciences/gmt-4.5.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!sci-biology/probcons gdal? ( sci-libs/gdal ) netcdf? ( >=sci-libs/netcdf-4.1 ) octave? ( sci-mathematics/octave ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!sci-biology/probcons gdal? ( sci-libs/gdal ) netcdf? ( >=sci-libs/netcdf-4.1 ) octave? ( sci-mathematics/octave ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Powerful map generator
 EAPI=4
 HOMEPAGE=http://gmt.soest.hawaii.edu/
@@ -10,5 +10,5 @@ RDEPEND=!sci-biology/probcons gdal? ( sci-libs/gdal ) netcdf? ( >=sci-libs/netcd
 REQUIRED_USE=mex? ( octave )
 SLOT=0
 SRC_URI=mirror://gmt/gmt-4.5.9.tar.bz2 mirror://gmt/gshhs-2.2.0.tar.bz2 gmttria? ( mirror://gmt/gmt-4.5.9-non-gpl.tar.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1445bbc7a6c1d02fb1cf8a869411e381
diff --git a/metadata/md5-cache/sci-geosciences/gpsbabel-1.4.3 b/metadata/md5-cache/sci-geosciences/gpsbabel-1.4.3
index a8420393c794..f6ba72403c19 100644
--- a/metadata/md5-cache/sci-geosciences/gpsbabel-1.4.3
+++ b/metadata/md5-cache/sci-geosciences/gpsbabel-1.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/expat sci-libs/shapelib virtual/libusb:0 qt4? ( dev-qt/qtgui:4 dev-qt/qtwebkit:4 ) doc? ( dev-lang/perl dev-libs/libxslt app-text/docbook-xml-dtd:4.1.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/expat sci-libs/shapelib virtual/libusb:0 qt4? ( dev-qt/qtgui:4 dev-qt/qtwebkit:4 ) doc? ( dev-lang/perl dev-libs/libxslt app-text/docbook-xml-dtd:4.1.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GPS waypoints, tracks and routes converter
 EAPI=4
 HOMEPAGE=http://www.gpsbabel.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat sci-libs/shapelib virtual/libusb:0 qt4? ( dev-qt/qtgui:4 dev-qt/qtwebkit:4 )
 SLOT=0
 SRC_URI=mirror://gentoo/gpsbabel-1.4.3.tar.gz doc? ( http://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4ab59f86d9532d28f5bde5a0f3e303ec
diff --git a/metadata/md5-cache/sci-geosciences/gpsbabel-1.4.4 b/metadata/md5-cache/sci-geosciences/gpsbabel-1.4.4
index 20ed9748bc9d..cb67c44d1ab4 100644
--- a/metadata/md5-cache/sci-geosciences/gpsbabel-1.4.4
+++ b/metadata/md5-cache/sci-geosciences/gpsbabel-1.4.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/expat sci-libs/shapelib virtual/libusb:0 qt4? ( dev-qt/qtgui:4 dev-qt/qtwebkit:4 ) doc? ( dev-lang/perl dev-libs/libxslt app-text/docbook-xml-dtd:4.1.2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/expat sci-libs/shapelib virtual/libusb:0 qt4? ( dev-qt/qtgui:4 dev-qt/qtwebkit:4 ) doc? ( dev-lang/perl dev-libs/libxslt app-text/docbook-xml-dtd:4.1.2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GPS waypoints, tracks and routes converter
 EAPI=4
 HOMEPAGE=http://www.gpsbabel.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat sci-libs/shapelib virtual/libusb:0 qt4? ( dev-qt/qtgui:4 dev-qt/qtwebkit:4 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~patrick/gpsbabel-1.4.4.tar.gz doc? ( http://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=269264d050d9cdbd8b25173dc51e7ec7
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-2.95-r1 b/metadata/md5-cache/sci-geosciences/gpsd-2.95-r1
index c441f214f582..980f53f3268d 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-2.95-r1
+++ b/metadata/md5-cache/sci-geosciences/gpsd-2.95-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=dev-python/pygtk:2 sys-libs/ncurses virtual/libusb:1 dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ntp? ( net-misc/ntp ) qt4? ( dev-qt/qtgui:4 ) app-text/xmlto =app-text/docbook-xml-dtd-4.1* || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-python/pygtk:2 sys-libs/ncurses virtual/libusb:1 dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ntp? ( net-misc/ntp ) qt4? ( dev-qt/qtgui:4 ) app-text/xmlto =app-text/docbook-xml-dtd-4.1* || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients.
 EAPI=3
 HOMEPAGE=http://gpsd.berlios.de/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-python/pygtk:2 sys-libs/ncurses virtual/libusb:1 dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ntp? ( net-misc/ntp ) qt4? ( dev-qt/qtgui:4 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=mirror://berlios/gpsd/gpsd-2.95.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1c81a4d8abc549b43ac1e8f1c2e33fda
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-2.96-r1 b/metadata/md5-cache/sci-geosciences/gpsd-2.96-r1
index d5ddb956e763..1d992fa9259f 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-2.96-r1
+++ b/metadata/md5-cache/sci-geosciences/gpsd-2.96-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=dev-python/pygtk:2 sys-libs/ncurses virtual/libusb:1 dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ntp? ( net-misc/ntp ) qt4? ( dev-qt/qtgui:4 ) 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-python/pygtk:2 sys-libs/ncurses virtual/libusb:1 dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ntp? ( net-misc/ntp ) qt4? ( dev-qt/qtgui:4 ) 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients.
 EAPI=3
 HOMEPAGE=http://gpsd.berlios.de/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-python/pygtk:2 sys-libs/ncurses virtual/libusb:1 dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ntp? ( net-misc/ntp ) qt4? ( dev-qt/qtgui:4 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=mirror://berlios/gpsd/gpsd-2.96bis.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=05c5514867dd255dc78a0155ddfc2df1
diff --git a/metadata/md5-cache/sci-geosciences/gpx-viewer-0.3.0 b/metadata/md5-cache/sci-geosciences/gpx-viewer-0.3.0
index 69fbff93534f..2a9435f94d42 100644
--- a/metadata/md5-cache/sci-geosciences/gpx-viewer-0.3.0
+++ b/metadata/md5-cache/sci-geosciences/gpx-viewer-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-libs/gdl:3 dev-libs/glib:2 dev-libs/libxml2:2 media-libs/libchamplain:0.12[gtk] x11-libs/gtk+:3 >=dev-util/intltool-0.21 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=dev-libs/gdl:3 dev-libs/glib:2 dev-libs/libxml2:2 media-libs/libchamplain:0.12[gtk] x11-libs/gtk+:3 >=dev-util/intltool-0.21 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Simple program to visualize a gpx file
 EAPI=4
 HOMEPAGE=http://blog.sarine.nl/gpx-viewer/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gdl:3 dev-libs/glib:2 dev-libs/libxml2:2 media-libs/libchamplain:0.12[gtk] x11-libs/gtk+:3
 SLOT=0
 SRC_URI=http://edge.launchpad.net/gpx-viewer/trunk/0.2.0/+download/gpx-viewer-0.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5f28ee580d23e5458a8be65b2523507a
diff --git a/metadata/md5-cache/sci-geosciences/grass-6.4.2 b/metadata/md5-cache/sci-geosciences/grass-6.4.2
index 6fa9a6d99f1c..570f59bc5bf0 100644
--- a/metadata/md5-cache/sci-geosciences/grass-6.4.2
+++ b/metadata/md5-cache/sci-geosciences/grass-6.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=app-admin/eselect-1.2 sci-libs/gdal sci-libs/proj sys-libs/gdbm sys-libs/ncurses sys-libs/zlib cairo? ( x11-libs/cairo[X?,opengl?] ) ffmpeg? ( >=virtual/ffmpeg-0.10 ) fftw? ( sci-libs/fftw:3.0 ) gmath? ( virtual/blas virtual/lapack ) jpeg? ( virtual/jpeg ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) opengl? ( virtual/opengl >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) png? ( media-libs/libpng ) postgres? ( >=dev-db/postgresql-base-8.4 ) readline? ( sys-libs/readline ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) wxwidgets? ( >=dev-python/wxpython-2.8.10.1[cairo,opengl?] ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXt motif? ( >=x11-libs/motif-2.3:0 opengl? ( || ( media-libs/mesa[motif] ( media-libs/mesa x11-libs/libGLw ) ) ) ) !python? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) !wxwidgets? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) ) virtual/pkgconfig sys-devel/flex sys-devel/gettext sys-devel/bison wxwidgets? ( dev-lang/swig ) X? ( x11-proto/xextproto x11-proto/xproto ) app-arch/xz-utils >=sys-apps/sed-4 python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=>=app-admin/eselect-1.2 sci-libs/gdal sci-libs/proj sys-libs/gdbm sys-libs/ncurses sys-libs/zlib cairo? ( x11-libs/cairo[X?,opengl?] ) ffmpeg? ( >=virtual/ffmpeg-0.10 ) fftw? ( sci-libs/fftw:3.0 ) gmath? ( virtual/blas virtual/lapack ) jpeg? ( virtual/jpeg ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) opengl? ( virtual/opengl >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) png? ( media-libs/libpng ) postgres? ( >=dev-db/postgresql-base-8.4 ) readline? ( sys-libs/readline ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) wxwidgets? ( >=dev-python/wxpython-2.8.10.1[cairo,opengl?] ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXt motif? ( >=x11-libs/motif-2.3:0 opengl? ( || ( media-libs/mesa[motif] ( media-libs/mesa x11-libs/libGLw ) ) ) ) !python? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) !wxwidgets? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) ) virtual/pkgconfig sys-devel/flex sys-devel/gettext sys-devel/bison wxwidgets? ( dev-lang/swig ) X? ( x11-proto/xextproto x11-proto/xproto ) app-arch/xz-utils >=sys-apps/sed-4 python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=A free GIS with raster and vector functionality, as well as 3D vizualization
 EAPI=4
 HOMEPAGE=http://grass.osgeo.org/
@@ -10,5 +10,5 @@ RDEPEND=>=app-admin/eselect-1.2 sci-libs/gdal sci-libs/proj sys-libs/gdbm sys-li
 REQUIRED_USE=motif? ( X ) opengl? ( X ) wxwidgets? ( X python )
 SLOT=6
 SRC_URI=http://grass.osgeo.org/grass64/source/grass-6.4.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=16f5effc4bb695a8e012e911c03b1656
diff --git a/metadata/md5-cache/sci-geosciences/gtk-g-rays2-2.01 b/metadata/md5-cache/sci-geosciences/gtk-g-rays2-2.01
index b4ca3b2834f5..b39e44c0a76b 100644
--- a/metadata/md5-cache/sci-geosciences/gtk-g-rays2-2.01
+++ b/metadata/md5-cache/sci-geosciences/gtk-g-rays2-2.01
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GUI for accessing the Wintec WBT 201 / G-Rays 2 GPS device
 EAPI=4
 HOMEPAGE=http://www.daria.co.uk/gps
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/dbus-glib virtual/udev[gudev] x11-libs/cairo x11-libs/gtk+:3 virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=http://www.zen35309.zen.co.uk/gps/gtk-g-rays2-2.01.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c59d5f3ea8ceec831099a880fdd2b68d
diff --git a/metadata/md5-cache/sci-geosciences/mapserver-6.0.1 b/metadata/md5-cache/sci-geosciences/mapserver-6.0.1
index 9d1e774383c6..575f760f7433 100644
--- a/metadata/md5-cache/sci-geosciences/mapserver-6.0.1
+++ b/metadata/md5-cache/sci-geosciences/mapserver-6.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup test unpack
-DEPEND=!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.12:1.12 ) >=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 ) )
+DEPEND=!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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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 ) )
 DESCRIPTION=OpenSource development environment for constructing spatially enabled Internet-web applications
 EAPI=4
 HOMEPAGE=http://mapserver.org/
@@ -10,5 +10,5 @@ RDEPEND=!sci-geosciences/mapserver:6.0.1 dev-libs/expat dev-libs/fcgi >=media-li
 REQUIRED_USE=|| ( php_targets_php5-3 )
 SLOT=0
 SRC_URI=http://download.osgeo.org/mapserver/mapserver-6.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=e998f4afab1e13d81f014dc8c954f783
diff --git a/metadata/md5-cache/sci-geosciences/osm-gps-map-0.7.3 b/metadata/md5-cache/sci-geosciences/osm-gps-map-0.7.3
index 843dc1b12828..4c4bacaa09f4 100644
--- a/metadata/md5-cache/sci-geosciences/osm-gps-map-0.7.3
+++ b/metadata/md5-cache/sci-geosciences/osm-gps-map-0.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.16.0:2 >=net-libs/libsoup-2.4.0:2.4 >=x11-libs/cairo-1.6.0 >=x11-libs/gtk+-2.14.0:2[introspection?] x11-libs/gdk-pixbuf:2[introspection?] introspection? ( dev-libs/gobject-introspection ) python? ( python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) dev-util/gtk-doc-am gnome-base/gnome-common:3 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.16.0:2 >=net-libs/libsoup-2.4.0:2.4 >=x11-libs/cairo-1.6.0 >=x11-libs/gtk+-2.14.0:2[introspection?] x11-libs/gdk-pixbuf:2[introspection?] introspection? ( dev-libs/gobject-introspection ) python? ( python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) dev-util/gtk-doc-am gnome-base/gnome-common:3 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A gtk+ viewer for OpenStreetMap files
 EAPI=5
 HOMEPAGE=http://nzjrs.github.com/osm-gps-map/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16.0:2 >=net-libs/libsoup-2.4.0:2.4 >=x11-libs/cairo-1.6.0 >=x11-libs/gtk+-2.14.0:2[introspection?] x11-libs/gdk-pixbuf:2[introspection?] introspection? ( dev-libs/gobject-introspection ) python? ( python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] )
 SLOT=0
 SRC_URI=http://www.johnstowers.co.nz/files/osm-gps-map/osm-gps-map-0.7.3.tar.gz python? ( http://www.johnstowers.co.nz/files/osm-gps-map/python-osmgpsmap-0.7.3.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	distutils-r1	28f569122728e4a4b52d45c00fc45fff	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6b1a1880d8290ad33c0f6cee3d74fc69
diff --git a/metadata/md5-cache/sci-geosciences/osm2pgsql-20100413 b/metadata/md5-cache/sci-geosciences/osm2pgsql-20100413
index 8c6dd7eb8c80..e5507077a548 100644
--- a/metadata/md5-cache/sci-geosciences/osm2pgsql-20100413
+++ b/metadata/md5-cache/sci-geosciences/osm2pgsql-20100413
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=app-arch/bzip2 dev-libs/libxml2:2 sci-libs/geos sci-libs/proj sys-libs/zlib dev-db/postgresql-base || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/bzip2 dev-libs/libxml2:2 sci-libs/geos sci-libs/proj sys-libs/zlib dev-db/postgresql-base || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Converts OSM data to SQL and insert into PostgreSQL db
 EAPI=4
 HOMEPAGE=http://wiki.openstreetmap.org/wiki/Osm2pgsql
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 dev-libs/libxml2:2 sci-libs/geos sci-libs/proj sys-libs/zlib dev-db/postgresql-base
 SLOT=0
 SRC_URI=http://gentoo.ccss.cz/osm2pgsql-20100413svn.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=5f869b8cc256eeeadea0618b93bc7c4d
diff --git a/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999 b/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
index 464006159508..d92f61ff2124 100644
--- a/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
+++ b/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=unpack
-DEPEND=app-arch/bzip2 dev-libs/libxml2:2 sci-libs/geos sci-libs/proj sys-libs/zlib dev-db/postgresql-base pbf? ( dev-libs/protobuf-c ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=app-arch/bzip2 dev-libs/libxml2:2 sci-libs/geos sci-libs/proj sys-libs/zlib dev-db/postgresql-base pbf? ( dev-libs/protobuf-c ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Converts OSM data to SQL and insert into PostgreSQL db
 EAPI=4
 HOMEPAGE=http://wiki.openstreetmap.org/wiki/Osm2pgsql
@@ -7,5 +7,5 @@ IUSE=+pbf
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 dev-libs/libxml2:2 sci-libs/geos sci-libs/proj sys-libs/zlib dev-db/postgresql-base pbf? ( dev-libs/protobuf-c )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=a7b1a9dc799ddca352268b2e12f5981b
diff --git a/metadata/md5-cache/sci-geosciences/viking-1.3 b/metadata/md5-cache/sci-geosciences/viking-1.3
index 8a3bc49b35de..dbd4ef51f2da 100644
--- a/metadata/md5-cache/sci-geosciences/viking-1.3
+++ b/metadata/md5-cache/sci-geosciences/viking-1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GPS data editor and analyzer
 EAPI=4
 HOMEPAGE=http://viking.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=mirror://sourceforge/viking/viking-1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=15107315abad2b34a4c53db4cf0c752e
diff --git a/metadata/md5-cache/sci-libs/adolc-2.3.0-r1 b/metadata/md5-cache/sci-libs/adolc-2.3.0-r1
index 11b40603be18..f275c634cc65 100644
--- a/metadata/md5-cache/sci-libs/adolc-2.3.0-r1
+++ b/metadata/md5-cache/sci-libs/adolc-2.3.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sparse? ( sci-libs/colpack ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sparse? ( sci-libs/colpack ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Automatic differentiation system for C/C++
 EAPI=4
 HOMEPAGE=https://projects.coin-or.org/ADOL-C/
@@ -9,5 +9,5 @@ LICENSE=|| ( EPL-1.0 GPL-2 )
 RDEPEND=sparse? ( sci-libs/colpack )
 SLOT=0
 SRC_URI=http://www.coin-or.org/download/source/ADOL-C/ADOL-C-2.3.0.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cbd7a3dbfb8ccd17d9a971aff5631554
diff --git a/metadata/md5-cache/sci-libs/adolc-2.4.0 b/metadata/md5-cache/sci-libs/adolc-2.4.0
index 93b2b9f6bf71..9a569018f994 100644
--- a/metadata/md5-cache/sci-libs/adolc-2.4.0
+++ b/metadata/md5-cache/sci-libs/adolc-2.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sparse? ( sci-libs/colpack ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sparse? ( sci-libs/colpack ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Automatic differentiation system for C/C++
 EAPI=5
 HOMEPAGE=https://projects.coin-or.org/ADOL-C/
@@ -9,5 +9,5 @@ LICENSE=|| ( EPL-1.0 GPL-2 )
 RDEPEND=sparse? ( sci-libs/colpack )
 SLOT=0
 SRC_URI=http://www.coin-or.org/download/source/ADOL-C/ADOL-C-2.4.0.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=51fbff0f6737d4e9dd30d2c8808fc704
diff --git a/metadata/md5-cache/sci-libs/amd-2.2.0 b/metadata/md5-cache/sci-libs/amd-2.2.0
index 89cc1c986f2f..8797fb9708d4 100644
--- a/metadata/md5-cache/sci-libs/amd-2.2.0
+++ b/metadata/md5-cache/sci-libs/amd-2.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install setup unpack
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Library to order a sparse matrix prior to Cholesky factorization
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/amd
 IUSE=doc
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/ufconfig virtual/fortran
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/amd/AMD-2.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c20cf07325b35350435703b05559c704
diff --git a/metadata/md5-cache/sci-libs/amd-2.2.3 b/metadata/md5-cache/sci-libs/amd-2.2.3
index 7f0e342a7995..f7f168c59d98 100644
--- a/metadata/md5-cache/sci-libs/amd-2.2.3
+++ b/metadata/md5-cache/sci-libs/amd-2.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Library to order a sparse matrix prior to Cholesky factorization
 EAPI=4
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/amd
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/ufconfig virtual/fortran
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/amd/AMD-2.2.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=49357cc8a83972453a9287cd77f18d61
diff --git a/metadata/md5-cache/sci-libs/amd-2.3.1 b/metadata/md5-cache/sci-libs/amd-2.3.1
index 2a3c1909407d..aedb37335b85 100644
--- a/metadata/md5-cache/sci-libs/amd-2.3.1
+++ b/metadata/md5-cache/sci-libs/amd-2.3.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/suitesparseconfig virtual/fortran
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/amd-2.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7d333cbc2094ff4f6c9ef8bdc362ab52
diff --git a/metadata/md5-cache/sci-libs/arpack-0.96-r3 b/metadata/md5-cache/sci-libs/arpack-0.96-r3
index 2205ff28e803..4d09e6da06ef 100644
--- a/metadata/md5-cache/sci-libs/arpack-0.96-r3
+++ b/metadata/md5-cache/sci-libs/arpack-0.96-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup test unpack
-DEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Arnoldi package library to solve large scale eigenvalue problems.
 EAPI=4
 HOMEPAGE=http://www.caam.rice.edu/software/ARPACK/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/fortran
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ca649524b80b4161b3cf4ae82e34767a
diff --git a/metadata/md5-cache/sci-libs/arpack-3.1.2 b/metadata/md5-cache/sci-libs/arpack-3.1.2
index 014b1f42933a..09b12439e0ec 100644
--- a/metadata/md5-cache/sci-libs/arpack-3.1.2
+++ b/metadata/md5-cache/sci-libs/arpack-3.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Arnoldi package library to solve large scale eigenvalue problems
 EAPI=4
 HOMEPAGE=http://www.caam.rice.edu/software/ARPACK/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/fortran
 SLOT=0
 SRC_URI=http://forge.scilab.org/upload/arpack-ng/files/arpack-ng_3.1.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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d7bb8055fb2cafb976d7d2f5106da5ea
diff --git a/metadata/md5-cache/sci-libs/arpack-3.1.2-r1 b/metadata/md5-cache/sci-libs/arpack-3.1.2-r1
index 0d0ad622282f..d54b6066fa69 100644
--- a/metadata/md5-cache/sci-libs/arpack-3.1.2-r1
+++ b/metadata/md5-cache/sci-libs/arpack-3.1.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Arnoldi package library to solve large scale eigenvalue problems
 EAPI=5
 HOMEPAGE=http://www.caam.rice.edu/software/ARPACK/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/fortran
 SLOT=0
 SRC_URI=http://forge.scilab.org/upload/arpack-ng/files/arpack-ng_3.1.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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=940b333464456426d04e52823cf0929d
diff --git a/metadata/md5-cache/sci-libs/arprec-2.2.16 b/metadata/md5-cache/sci-libs/arprec-2.2.16
index 4cacb6bb5ffc..cae7614cb4e4 100644
--- a/metadata/md5-cache/sci-libs/arprec-2.2.16
+++ b/metadata/md5-cache/sci-libs/arprec-2.2.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=qd? ( sci-libs/qd[fortran=] ) fortran? ( virtual/fortran ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=qd? ( sci-libs/qd[fortran=] ) fortran? ( virtual/fortran ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Arbitrary precision float arithmetics and functions
 EAPI=4
 HOMEPAGE=http://crd.lbl.gov/~dhbailey/mpdist/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=qd? ( sci-libs/qd[fortran=] ) fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=http://crd.lbl.gov/~dhbailey/mpdist/arprec-2.2.16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3c90b06eee73511c9d42879e5b085fa3
diff --git a/metadata/md5-cache/sci-libs/beagle-3.0.3 b/metadata/md5-cache/sci-libs/beagle-3.0.3
index dffd270fd4cf..2b5c2bcbb590 100644
--- a/metadata/md5-cache/sci-libs/beagle-3.0.3
+++ b/metadata/md5-cache/sci-libs/beagle-3.0.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/zlib !app-misc/beagle !dev-libs/libbeagle
 SLOT=0
 SRC_URI=mirror://sourceforge/beagle/beagle-3.0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=af8f7034dcdbbb30e0dbc83a403fcbb3
diff --git a/metadata/md5-cache/sci-libs/blas-reference-20070226 b/metadata/md5-cache/sci-libs/blas-reference-20070226
index f13c6ea37429..c977fdc770dc 100644
--- a/metadata/md5-cache/sci-libs/blas-reference-20070226
+++ b/metadata/md5-cache/sci-libs/blas-reference-20070226
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=app-admin/eselect-blas virtual/fortran || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-admin/eselect-blas virtual/fortran || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Basic Linear Algebra Subprograms F77 reference implementations
 HOMEPAGE=http://www.netlib.org/blas/
 IUSE=doc
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-admin/eselect-blas doc? ( app-doc/blas-docs ) virtual/fortran
 SLOT=0
 SRC_URI=http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=63624ffebf2907376a4db45cbec6b0df
diff --git a/metadata/md5-cache/sci-libs/blas-reference-20070226-r2 b/metadata/md5-cache/sci-libs/blas-reference-20070226-r2
index 38899dc66811..03a7e0585cf0 100644
--- a/metadata/md5-cache/sci-libs/blas-reference-20070226-r2
+++ b/metadata/md5-cache/sci-libs/blas-reference-20070226-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=app-admin/eselect-blas virtual/fortran || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-admin/eselect-blas virtual/fortran || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Basic Linear Algebra Subprograms F77 reference implementations
 EAPI=3
 HOMEPAGE=http://www.netlib.org/blas/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-admin/eselect-blas doc? ( app-doc/blas-docs ) virtual/fortran
 SLOT=0
 SRC_URI=http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=139ea31c17ffef4b549d78e6711164da
diff --git a/metadata/md5-cache/sci-libs/blas-reference-20070226-r3 b/metadata/md5-cache/sci-libs/blas-reference-20070226-r3
index 7221e986838e..ef0fae59adb1 100644
--- a/metadata/md5-cache/sci-libs/blas-reference-20070226-r3
+++ b/metadata/md5-cache/sci-libs/blas-reference-20070226-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=app-admin/eselect-blas virtual/fortran || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-admin/eselect-blas virtual/fortran || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Basic Linear Algebra Subprograms F77 reference implementations
 EAPI=3
 HOMEPAGE=http://www.netlib.org/blas/
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-admin/eselect-blas doc? ( app-doc/blas-docs ) virtual/fortran
 SLOT=0
 SRC_URI=http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a9bf49f09645442489e03ec3496f45e6
diff --git a/metadata/md5-cache/sci-libs/btf-1.0.1 b/metadata/md5-cache/sci-libs/btf-1.0.1
index 1595bd8faba0..a0c485e7a121 100644
--- a/metadata/md5-cache/sci-libs/btf-1.0.1
+++ b/metadata/md5-cache/sci-libs/btf-1.0.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Algorithm for matrix permutation into block triangular form
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/btf/
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/btf/BTF-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5388f2b36c20b075743bbfb272849d6c
diff --git a/metadata/md5-cache/sci-libs/btf-1.1.0 b/metadata/md5-cache/sci-libs/btf-1.1.0
index 9db71cdfa018..2d58ccd3a970 100644
--- a/metadata/md5-cache/sci-libs/btf-1.1.0
+++ b/metadata/md5-cache/sci-libs/btf-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Algorithm for matrix permutation into block triangular form
 EAPI=4
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/btf/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/btf/BTF-1.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9fcd9fe7cdfd2af1fe53377c8b27db85
diff --git a/metadata/md5-cache/sci-libs/btf-1.1.2 b/metadata/md5-cache/sci-libs/btf-1.1.2
index 56366c618908..81c33e406132 100644
--- a/metadata/md5-cache/sci-libs/btf-1.1.2
+++ b/metadata/md5-cache/sci-libs/btf-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Algorithm for matrix permutation into block triangular form
 EAPI=4
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/btf/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/btf/BTF-1.1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=47b9c96b3a4c1d33239c8da67027befe
diff --git a/metadata/md5-cache/sci-libs/btf-1.1.3 b/metadata/md5-cache/sci-libs/btf-1.1.3
index f8c470f711bc..a3b88ac4619d 100644
--- a/metadata/md5-cache/sci-libs/btf-1.1.3
+++ b/metadata/md5-cache/sci-libs/btf-1.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Algorithm for matrix permutation into block triangular form
 EAPI=4
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/btf/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/btf/BTF-1.1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8bb10d3e634ec6a3bc151d5e7c5454ca
diff --git a/metadata/md5-cache/sci-libs/btf-1.2.0 b/metadata/md5-cache/sci-libs/btf-1.2.0
index 542bf6e2baee..56dc01b8db4a 100644
--- a/metadata/md5-cache/sci-libs/btf-1.2.0
+++ b/metadata/md5-cache/sci-libs/btf-1.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/btf-1.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6b63e1a8ee8378e6208385b17d4635e2
diff --git a/metadata/md5-cache/sci-libs/camd-2.2.0 b/metadata/md5-cache/sci-libs/camd-2.2.0
index c249512e0cba..a4f996c0ec02 100644
--- a/metadata/md5-cache/sci-libs/camd-2.2.0
+++ b/metadata/md5-cache/sci-libs/camd-2.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library to order a sparse matrix prior to Cholesky factorization
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/camd/
 IUSE=doc
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=sci-libs/ufconfig
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/camd/CAMD-2.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=affb27f5f9de773ae074aa495d5ea693
diff --git a/metadata/md5-cache/sci-libs/camd-2.2.2 b/metadata/md5-cache/sci-libs/camd-2.2.2
index f1283d10dab4..a6c1f4a4dbdb 100644
--- a/metadata/md5-cache/sci-libs/camd-2.2.2
+++ b/metadata/md5-cache/sci-libs/camd-2.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library to order a sparse matrix prior to Cholesky factorization
 EAPI=4
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/camd/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=sci-libs/ufconfig
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/camd/CAMD-2.2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d91ceb57321b6c6bc73e47130edbda25
diff --git a/metadata/md5-cache/sci-libs/camd-2.2.3 b/metadata/md5-cache/sci-libs/camd-2.2.3
index 1fa8420fdd3d..232e70d05b3f 100644
--- a/metadata/md5-cache/sci-libs/camd-2.2.3
+++ b/metadata/md5-cache/sci-libs/camd-2.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library to order a sparse matrix prior to Cholesky factorization
 EAPI=4
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/camd/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=sci-libs/ufconfig
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/camd/CAMD-2.2.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ce3ccd05e0a3e675da563ec15ba51109
diff --git a/metadata/md5-cache/sci-libs/camd-2.3.1 b/metadata/md5-cache/sci-libs/camd-2.3.1
index 4f507f8d5e58..77561f0ea44a 100644
--- a/metadata/md5-cache/sci-libs/camd-2.3.1
+++ b/metadata/md5-cache/sci-libs/camd-2.3.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/camd-2.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8ea71d180d9dbaf0e3244d5d50cafae6
diff --git a/metadata/md5-cache/sci-libs/cblas-reference-20030223-r4 b/metadata/md5-cache/sci-libs/cblas-reference-20030223-r4
index 5ab7499fc8af..d11b67c2458b 100644
--- a/metadata/md5-cache/sci-libs/cblas-reference-20030223-r4
+++ b/metadata/md5-cache/sci-libs/cblas-reference-20030223-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=virtual/blas app-admin/eselect-cblas virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=virtual/blas app-admin/eselect-cblas virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=C wrapper interface to the F77 reference BLAS implementation
 HOMEPAGE=http://www.netlib.org/blas/
 KEYWORDS=alpha amd64 hppa ppc ppc64 s390 sparc x86 ~x86-fbsd
@@ -7,5 +7,5 @@ LICENSE=public-domain
 RDEPEND=virtual/blas app-admin/eselect-cblas virtual/fortran
 SLOT=0
 SRC_URI=http://www.netlib.org/blas/blast-forum/cblas.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0eb70f6a1fe3910c48d3146aa384c9f0
diff --git a/metadata/md5-cache/sci-libs/cblas-reference-20030223-r5 b/metadata/md5-cache/sci-libs/cblas-reference-20030223-r5
index b435227f2f26..ef8d061bfcf5 100644
--- a/metadata/md5-cache/sci-libs/cblas-reference-20030223-r5
+++ b/metadata/md5-cache/sci-libs/cblas-reference-20030223-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=virtual/blas app-admin/eselect-cblas virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=virtual/blas app-admin/eselect-cblas virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=C wrapper interface to the F77 reference BLAS implementation
 EAPI=3
 HOMEPAGE=http://www.netlib.org/blas/
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=virtual/blas app-admin/eselect-cblas virtual/fortran
 SLOT=0
 SRC_URI=http://www.netlib.org/blas/blast-forum/cblas.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=841dd57313a815bf69b6c107b51d2420
diff --git a/metadata/md5-cache/sci-libs/ccfits-2.4 b/metadata/md5-cache/sci-libs/ccfits-2.4
index 9510323247c9..39d58e3b950a 100644
--- a/metadata/md5-cache/sci-libs/ccfits-2.4
+++ b/metadata/md5-cache/sci-libs/ccfits-2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sci-libs/cfitsio-3.080 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sci-libs/cfitsio-3.080 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C++ interface for cfitsio
 EAPI=4
 HOMEPAGE=http://heasarc.gsfc.nasa.gov/fitsio/CCfits/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=sci-libs/cfitsio-3.080
 SLOT=0
 SRC_URI=http://heasarc.gsfc.nasa.gov/fitsio/CCfits//CCfits-2.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f7ffbc7c61ed98d1b3ead31eeae3859f
diff --git a/metadata/md5-cache/sci-libs/ccolamd-2.7.1 b/metadata/md5-cache/sci-libs/ccolamd-2.7.1
index fe44db23b7d5..c293750c95a1 100644
--- a/metadata/md5-cache/sci-libs/ccolamd-2.7.1
+++ b/metadata/md5-cache/sci-libs/ccolamd-2.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Constrained column approximate minimum degree ordering algorithm
 EAPI=2
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/ccolamd/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/ufconfig
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/ccolamd/CCOLAMD-2.7.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0a4315c1ec720166bae1b8d555f17966
diff --git a/metadata/md5-cache/sci-libs/ccolamd-2.7.3 b/metadata/md5-cache/sci-libs/ccolamd-2.7.3
index 236fd55d3a74..70fd613bcd4e 100644
--- a/metadata/md5-cache/sci-libs/ccolamd-2.7.3
+++ b/metadata/md5-cache/sci-libs/ccolamd-2.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Constrained column approximate minimum degree ordering algorithm
 EAPI=4
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/ccolamd/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/ufconfig
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/ccolamd/CCOLAMD-2.7.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a5a730c8596359bee7c050cba06b4fe8
diff --git a/metadata/md5-cache/sci-libs/ccolamd-2.7.4 b/metadata/md5-cache/sci-libs/ccolamd-2.7.4
index ca58e6eef68c..b64c36d99918 100644
--- a/metadata/md5-cache/sci-libs/ccolamd-2.7.4
+++ b/metadata/md5-cache/sci-libs/ccolamd-2.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Constrained column approximate minimum degree ordering algorithm
 EAPI=4
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/ccolamd/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/ufconfig
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/ccolamd/CCOLAMD-2.7.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8b8ff7946d55e101001eb95bd9548d4f
diff --git a/metadata/md5-cache/sci-libs/ccolamd-2.8.0 b/metadata/md5-cache/sci-libs/ccolamd-2.8.0
index bfa79efa7593..4f8e2f3f1972 100644
--- a/metadata/md5-cache/sci-libs/ccolamd-2.8.0
+++ b/metadata/md5-cache/sci-libs/ccolamd-2.8.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/ccolamd-2.8.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9896b67e07363d64de70319b42efde52
diff --git a/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r11 b/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r11
index 5f87190d42f6..47654d340b03 100644
--- a/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r11
+++ b/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=!<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/jpeg virtual/lapack virtual/blas virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran sys-devel/gnuconfig =dev-lang/python-2*
+DEPEND=!<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/jpeg virtual/lapack virtual/blas virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran sys-devel/gnuconfig =dev-lang/python-2*
 DESCRIPTION=Protein X-ray crystallography toolkit - Libraries
 EAPI=3
 HOMEPAGE=http://www.ccp4.ac.uk/
@@ -8,5 +8,5 @@ LICENSE=ccp4
 RDEPEND=!<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/jpeg virtual/lapack virtual/blas virtual/fortran =dev-lang/python-2*
 SLOT=0
 SRC_URI=ftp://ftp.ccp4.ac.uk/ccp4/6.1.3/ccp4-6.1.3-core-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5e81bde35a8e682f7fb63cfe5ff1384a
diff --git a/metadata/md5-cache/sci-libs/cddlib-094f-r2 b/metadata/md5-cache/sci-libs/cddlib-094f-r2
index fe17d17fb663..0df2fe94ff20 100644
--- a/metadata/md5-cache/sci-libs/cddlib-094f-r2
+++ b/metadata/md5-cache/sci-libs/cddlib-094f-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/gmp-4.2.2
 SLOT=0
 SRC_URI=ftp://ftp.ifor.math.ethz.ch/pub/fukuda/cdd/cddlib-094f.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b2d8e4ad5f0f11fbf3e32cc03fa337e
diff --git a/metadata/md5-cache/sci-libs/cddlib-094g b/metadata/md5-cache/sci-libs/cddlib-094g
index 20ea600912ea..b94fb7f7f37d 100644
--- a/metadata/md5-cache/sci-libs/cddlib-094g
+++ b/metadata/md5-cache/sci-libs/cddlib-094g
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/gmp-4.2.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/gmp-4.2.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C implementation of the Double Description Method of Motzkin et al.
 EAPI=5
 HOMEPAGE=http://www.ifor.math.ethz.ch/~fukuda/cdd_home/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/gmp-4.2.2
 SLOT=0
 SRC_URI=ftp://ftp.ifor.math.ethz.ch/pub/fukuda/cdd/cddlib-094g.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f840eb515eecf16faebff9be91f6fc49
diff --git a/metadata/md5-cache/sci-libs/cfitsio-3.140 b/metadata/md5-cache/sci-libs/cfitsio-3.140
index 8b064337641d..27dba40abc6f 100644
--- a/metadata/md5-cache/sci-libs/cfitsio-3.140
+++ b/metadata/md5-cache/sci-libs/cfitsio-3.140
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=fortran? ( dev-lang/cfortran ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=fortran? ( dev-lang/cfortran ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C and Fortran library for manipulating FITS files
 EAPI=2
 HOMEPAGE=http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
 LICENSE=BSD GPL-2
 SLOT=0
 SRC_URI=ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3140.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bc57a1538dfc3917e8630a4c6fa7d1a5
diff --git a/metadata/md5-cache/sci-libs/cfitsio-3.310 b/metadata/md5-cache/sci-libs/cfitsio-3.310
index 13b4d1bbb3e8..a7ef84cddf51 100644
--- a/metadata/md5-cache/sci-libs/cfitsio-3.310
+++ b/metadata/md5-cache/sci-libs/cfitsio-3.310
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/cfitsio-3.310.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=34af9cbffb940eefd00c4324a1dba2ff
diff --git a/metadata/md5-cache/sci-libs/cfitsio-3.330 b/metadata/md5-cache/sci-libs/cfitsio-3.330
index ee608ec3420f..2c992e24ce65 100644
--- a/metadata/md5-cache/sci-libs/cfitsio-3.330
+++ b/metadata/md5-cache/sci-libs/cfitsio-3.330
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/cfitsio-3.330.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7e016db3fb14629a591d2aae6cba5383
diff --git a/metadata/md5-cache/sci-libs/cfitsio-3.340 b/metadata/md5-cache/sci-libs/cfitsio-3.340
index 0fb011d2ca46..b953692abf0c 100644
--- a/metadata/md5-cache/sci-libs/cfitsio-3.340
+++ b/metadata/md5-cache/sci-libs/cfitsio-3.340
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/cfitsio-3.340.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2491b499d63453588b945124844a0ea6
diff --git a/metadata/md5-cache/sci-libs/cholmod-1.6.0-r1 b/metadata/md5-cache/sci-libs/cholmod-1.6.0-r1
index 9f95005ff87b..ba409571467c 100644
--- a/metadata/md5-cache/sci-libs/cholmod-1.6.0-r1
+++ b/metadata/md5-cache/sci-libs/cholmod-1.6.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=sci-libs/amd sci-libs/colamd metis? ( sci-libs/camd sci-libs/ccolamd || ( sci-libs/metis sci-libs/parmetis ) ) supernodal? ( virtual/lapack ) metis? ( virtual/pkgconfig ) supernodal? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/amd sci-libs/colamd metis? ( sci-libs/camd sci-libs/ccolamd || ( sci-libs/metis sci-libs/parmetis ) ) supernodal? ( virtual/lapack ) metis? ( virtual/pkgconfig ) supernodal? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Sparse Cholesky factorization and update/downdate library
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/cholmod
 IUSE=doc metis minimal supernodal
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=sci-libs/amd sci-libs/colamd metis? ( sci-libs/camd sci-libs/ccolamd || ( sci-libs/metis sci-libs/parmetis ) ) supernodal? ( virtual/lapack )
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/cholmod/CHOLMOD-1.6.0.tar.gz mirror://gentoo/cholmod-1.6.0-autotools.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b989903ecd38c1da4779ac0380a252ab
diff --git a/metadata/md5-cache/sci-libs/cholmod-1.7.4 b/metadata/md5-cache/sci-libs/cholmod-1.7.4
index 4055b9345bf9..6f0520a748e9 100644
--- a/metadata/md5-cache/sci-libs/cholmod-1.7.4
+++ b/metadata/md5-cache/sci-libs/cholmod-1.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/amd sci-libs/colamd metis? ( sci-libs/camd sci-libs/ccolamd || ( sci-libs/metis sci-libs/parmetis ) ) supernodal? ( virtual/lapack ) supernodal? ( virtual/pkgconfig ) metis? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/amd sci-libs/colamd metis? ( sci-libs/camd sci-libs/ccolamd || ( sci-libs/metis sci-libs/parmetis ) ) supernodal? ( virtual/lapack ) supernodal? ( virtual/pkgconfig ) metis? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Sparse Cholesky factorization and update/downdate library
 EAPI=4
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/cholmod/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=sci-libs/amd sci-libs/colamd metis? ( sci-libs/camd sci-libs/ccolamd || ( sci-libs/metis sci-libs/parmetis ) ) supernodal? ( virtual/lapack )
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/cholmod/CHOLMOD-1.7.4.tar.gz mirror://gentoo/cholmod-1.7.0-autotools.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a06f2aae748f352982e4dd9044de1410
diff --git a/metadata/md5-cache/sci-libs/cholmod-2.0.1 b/metadata/md5-cache/sci-libs/cholmod-2.0.1
index 09c638e93487..ce8b841d38c4 100644
--- a/metadata/md5-cache/sci-libs/cholmod-2.0.1
+++ b/metadata/md5-cache/sci-libs/cholmod-2.0.1
@@ -9,5 +9,5 @@ LICENSE=minimal? ( LGPL-2.1 ) !minimal? ( GPL-2 )
 RDEPEND=>=sci-libs/amd-2.3 >=sci-libs/colamd-2.8 cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/camd-2.3 >=sci-libs/ccolamd-2.8 || ( sci-libs/metis sci-libs/parmetis ) )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/cholmod-2.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=861db37921e92c78484ac1f266bf90c8
diff --git a/metadata/md5-cache/sci-libs/clipper-20100511-r1 b/metadata/md5-cache/sci-libs/clipper-20100511-r1
index 242e2a91edf7..3fc27e66ab58 100644
--- a/metadata/md5-cache/sci-libs/clipper-20100511-r1
+++ b/metadata/md5-cache/sci-libs/clipper-20100511-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/ccp4-libs sci-libs/fftw sci-libs/mmdb || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ccp4-libs sci-libs/fftw sci-libs/mmdb || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Object-oriented libraries for crystallographic data and crystallographic computation
 EAPI=4
 HOMEPAGE=http://www.ysbl.york.ac.uk/~cowtan/clipper/clipper.html
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/ccp4-libs sci-libs/fftw sci-libs/mmdb
 SLOT=0
 SRC_URI=http://www.ysbl.york.ac.uk/~cowtan/clipper/clipper-2.1-100511-ac.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fd0bc19182e0a8972b73a08a72ac3e4a
diff --git a/metadata/md5-cache/sci-libs/cln-1.3.2-r1 b/metadata/md5-cache/sci-libs/cln-1.3.2-r1
index eb1a54f8629e..2143683d7df5 100644
--- a/metadata/md5-cache/sci-libs/cln-1.3.2-r1
+++ b/metadata/md5-cache/sci-libs/cln-1.3.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp doc? ( virtual/latex-base )
 SLOT=1
 SRC_URI=ftp://ftpthep.physik.uni-mainz.de/pub/gnu/cln-1.3.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=742b185888c1087ae04b4a1d7bb3bedf
diff --git a/metadata/md5-cache/sci-libs/colamd-2.7.1 b/metadata/md5-cache/sci-libs/colamd-2.7.1
index 233ca08a4f8e..bb9c956f5d49 100644
--- a/metadata/md5-cache/sci-libs/colamd-2.7.1
+++ b/metadata/md5-cache/sci-libs/colamd-2.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Column approximate minimum degree ordering algorithm
 EAPI=2
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/colamd/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/ufconfig
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/colamd/COLAMD-2.7.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5c0a26be88d0eff576fb8e605cd93fe6
diff --git a/metadata/md5-cache/sci-libs/colamd-2.7.3 b/metadata/md5-cache/sci-libs/colamd-2.7.3
index 2f541fcc1c2c..95dbedb76fcb 100644
--- a/metadata/md5-cache/sci-libs/colamd-2.7.3
+++ b/metadata/md5-cache/sci-libs/colamd-2.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Column approximate minimum degree ordering algorithm
 EAPI=4
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/colamd/
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/ufconfig
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/colamd/COLAMD-2.7.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=747dfe1b56ade84220b29d7321bfb8b9
diff --git a/metadata/md5-cache/sci-libs/colamd-2.7.4 b/metadata/md5-cache/sci-libs/colamd-2.7.4
index ad1065baa692..dbf4f93eaa93 100644
--- a/metadata/md5-cache/sci-libs/colamd-2.7.4
+++ b/metadata/md5-cache/sci-libs/colamd-2.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Column approximate minimum degree ordering algorithm
 EAPI=4
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/colamd/
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/ufconfig
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/colamd/COLAMD-2.7.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9171a5f47bb87d687ca7d97801ba47ac
diff --git a/metadata/md5-cache/sci-libs/colamd-2.8.0 b/metadata/md5-cache/sci-libs/colamd-2.8.0
index d83f820765e9..fe7755b68af1 100644
--- a/metadata/md5-cache/sci-libs/colamd-2.8.0
+++ b/metadata/md5-cache/sci-libs/colamd-2.8.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/colamd-2.8.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=75ccea32db64f700b3cc53febabd31fb
diff --git a/metadata/md5-cache/sci-libs/colpack-1.0.6 b/metadata/md5-cache/sci-libs/colpack-1.0.6
index 95c4e8e115fd..6cb8058c8ba1 100644
--- a/metadata/md5-cache/sci-libs/colpack-1.0.6
+++ b/metadata/md5-cache/sci-libs/colpack-1.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare setup
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C++ algorithms for specialized vertex coloring problems
 EAPI=4
 HOMEPAGE=http://www.cscapes.org/coloringpage/software.htm
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3 LGPL-3
 SLOT=0
 SRC_URI=http://www.cscapes.org/download/ColPack/ColPack-1.0.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=baf5bd37fb6096f73b062bf68c8a321b
diff --git a/metadata/md5-cache/sci-libs/colpack-1.0.8 b/metadata/md5-cache/sci-libs/colpack-1.0.8
index e52d8d7d1a3a..4b9d0f88967b 100644
--- a/metadata/md5-cache/sci-libs/colpack-1.0.8
+++ b/metadata/md5-cache/sci-libs/colpack-1.0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C++ algorithms for specialized vertex coloring problems
 EAPI=4
 HOMEPAGE=http://www.cscapes.org/coloringpage/software.htm
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3 LGPL-3
 SLOT=0
 SRC_URI=http://www.cscapes.org/download/ColPack/ColPack-1.0.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bbe1f1b6563bf67e3178d2cfeebaa715
diff --git a/metadata/md5-cache/sci-libs/cxsparse-2.2.1 b/metadata/md5-cache/sci-libs/cxsparse-2.2.1
index fea51ba248a1..f3ef4fe6855d 100644
--- a/metadata/md5-cache/sci-libs/cxsparse-2.2.1
+++ b/metadata/md5-cache/sci-libs/cxsparse-2.2.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Extended sparse matrix package.
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/CXSparse/
 KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/CXSparse/versions/CXSparse-2.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7758a2fd387202baf303935c13516312
diff --git a/metadata/md5-cache/sci-libs/cxsparse-2.2.3 b/metadata/md5-cache/sci-libs/cxsparse-2.2.3
index 84852ea336b9..524d23706093 100644
--- a/metadata/md5-cache/sci-libs/cxsparse-2.2.3
+++ b/metadata/md5-cache/sci-libs/cxsparse-2.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Extended sparse matrix package.
 EAPI=2
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/CXSparse/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x8
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/CXSparse/versions/CXSparse-2.2.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dcaf2275c8283ed2e2ab0853fa80c277
diff --git a/metadata/md5-cache/sci-libs/cxsparse-2.2.5 b/metadata/md5-cache/sci-libs/cxsparse-2.2.5
index 7d970cf4a74a..74f4f68a01bb 100644
--- a/metadata/md5-cache/sci-libs/cxsparse-2.2.5
+++ b/metadata/md5-cache/sci-libs/cxsparse-2.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Extended sparse matrix package.
 EAPI=4
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/CXSparse/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x8
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/CXSparse/versions/CXSparse-2.2.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5a7a95bf1f1edff28e893303fd2c09be
diff --git a/metadata/md5-cache/sci-libs/cxsparse-2.2.6 b/metadata/md5-cache/sci-libs/cxsparse-2.2.6
index adf8f1bb5a2b..ea2683856286 100644
--- a/metadata/md5-cache/sci-libs/cxsparse-2.2.6
+++ b/metadata/md5-cache/sci-libs/cxsparse-2.2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Extended sparse matrix package.
 EAPI=4
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/CXSparse/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/CXSparse/versions/CXSparse-2.2.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=edf9e872ee1b6978fa2fd8bed19424d0
diff --git a/metadata/md5-cache/sci-libs/cxsparse-3.1.1 b/metadata/md5-cache/sci-libs/cxsparse-3.1.1
index 5573cecfd05a..06322e0f8611 100644
--- a/metadata/md5-cache/sci-libs/cxsparse-3.1.1
+++ b/metadata/md5-cache/sci-libs/cxsparse-3.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/cxsparse-3.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=305f1d84aa55211cdd27fecf4e9290db
diff --git a/metadata/md5-cache/sci-libs/fftw-2.1.5-r8 b/metadata/md5-cache/sci-libs/fftw-2.1.5-r8
index 4d433b9599d5..13f7a3d8f1a4 100644
--- a/metadata/md5-cache/sci-libs/fftw-2.1.5-r8
+++ b/metadata/md5-cache/sci-libs/fftw-2.1.5-r8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool fortran? ( virtual/fortran )
+DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool fortran? ( virtual/fortran )
 DESCRIPTION=Fast C library for the Discrete Fourier Transform
 EAPI=4
 HOMEPAGE=http://www.fftw.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi ) fortran? ( virtual/fortran )
 SLOT=2.1
 SRC_URI=http://www.fftw.org/fftw-2.1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dd01adb6bc119a39df34bffc88dae009
diff --git a/metadata/md5-cache/sci-libs/fftw-3.2.2 b/metadata/md5-cache/sci-libs/fftw-3.2.2
index 580c1421d08d..8562f0b84f9f 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.2.2
+++ b/metadata/md5-cache/sci-libs/fftw-3.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool fortran? ( virtual/fortran )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool fortran? ( virtual/fortran )
 DESCRIPTION=Fast C library for the Discrete Fourier Transform
 EAPI=2
 HOMEPAGE=http://www.fftw.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=fortran? ( virtual/fortran )
 SLOT=3.0
 SRC_URI=http://www.fftw.org/fftw-3.2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d9885b46ebffda1fda5d79ce22fe6608
diff --git a/metadata/md5-cache/sci-libs/fftw-3.2.2-r2 b/metadata/md5-cache/sci-libs/fftw-3.2.2-r2
index 628eec2905cb..efbd058f401d 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.2.2-r2
+++ b/metadata/md5-cache/sci-libs/fftw-3.2.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool fortran? ( virtual/fortran )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool fortran? ( virtual/fortran )
 DESCRIPTION=Fast C library for the Discrete Fourier Transform
 EAPI=2
 HOMEPAGE=http://www.fftw.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=fortran? ( virtual/fortran )
 SLOT=3.0
 SRC_URI=http://www.fftw.org/fftw-3.2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=75234b129b85a094eed9c80ee64fda37
diff --git a/metadata/md5-cache/sci-libs/fftw-3.3.3 b/metadata/md5-cache/sci-libs/fftw-3.3.3
index a56adb35c924..d8e8ac561eaf 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.3.3
+++ b/metadata/md5-cache/sci-libs/fftw-3.3.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi ) fortran? ( virtual/fortran )
 SLOT=3.0
 SRC_URI=http://www.fftw.org/fftw-3.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5a3e5994e9512c8c7bff5771e581b6bd
diff --git a/metadata/md5-cache/sci-libs/fftw-3.3.3-r1 b/metadata/md5-cache/sci-libs/fftw-3.3.3-r1
index d316cf9d3a85..285bbc8053f2 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.3.3-r1
+++ b/metadata/md5-cache/sci-libs/fftw-3.3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=mpi? ( virtual/mpi ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-sound
 REQUIRED_USE=amd64? ( abi_x86_32? ( !mpi !quad ) )
 SLOT=3.0
 SRC_URI=http://www.fftw.org/fftw-3.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4041e6cd9c068dc273b45a084fd55898
diff --git a/metadata/md5-cache/sci-libs/fftw-3.3.3-r2 b/metadata/md5-cache/sci-libs/fftw-3.3.3-r2
index 3f464bad02c9..86033aedfd5e 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.3.3-r2
+++ b/metadata/md5-cache/sci-libs/fftw-3.3.3-r2
@@ -10,5 +10,5 @@ RDEPEND=mpi? ( virtual/mpi ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-sound
 REQUIRED_USE=amd64? ( abi_x86_32? ( !mpi !quad ) )
 SLOT=3.0
 SRC_URI=http://www.fftw.org/fftw-3.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cfc23e4cd1b6ec3ad53b8f557a6541cc
diff --git a/metadata/md5-cache/sci-libs/gamer-1.4 b/metadata/md5-cache/sci-libs/gamer-1.4
index e0d605660744..cdabd6cf2e04 100644
--- a/metadata/md5-cache/sci-libs/gamer-1.4
+++ b/metadata/md5-cache/sci-libs/gamer-1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/maloc-1.4 doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/maloc-1.4 doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Geometry-preserving Adaptive MeshER
 EAPI=3
 HOMEPAGE=http://fetk.org/codes/gamer/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/maloc-1.4
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/gamer-1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=99c1ace47fd861256c8bccbb0fd669a4
diff --git a/metadata/md5-cache/sci-libs/gamer-1.5 b/metadata/md5-cache/sci-libs/gamer-1.5
index 9e9bedf7bae4..c82cb2f83ee2 100644
--- a/metadata/md5-cache/sci-libs/gamer-1.5
+++ b/metadata/md5-cache/sci-libs/gamer-1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/maloc-1.4 doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/maloc-1.4 doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Geometry-preserving Adaptive MeshER
 EAPI=4
 HOMEPAGE=http://fetk.org/codes/gamer/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/maloc-1.4
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/gamer-1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ff8f76d29972d6fc7b4d18c7acc5a40b
diff --git a/metadata/md5-cache/sci-libs/gamer-1.5-r1 b/metadata/md5-cache/sci-libs/gamer-1.5-r1
index 78ea6cb77a6a..26670cffa429 100644
--- a/metadata/md5-cache/sci-libs/gamer-1.5-r1
+++ b/metadata/md5-cache/sci-libs/gamer-1.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/maloc-1.4 doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/maloc-1.4 doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Geometry-preserving Adaptive MeshER
 EAPI=4
 HOMEPAGE=http://fetk.org/codes/gamer/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/maloc-1.4
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/gamer-1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=988238eea56adee76102f8b199d73a34
diff --git a/metadata/md5-cache/sci-libs/gaul-devel-0.1849-r2 b/metadata/md5-cache/sci-libs/gaul-devel-0.1849-r2
index fe4c9931e69b..c9a1ab6906de 100644
--- a/metadata/md5-cache/sci-libs/gaul-devel-0.1849-r2
+++ b/metadata/md5-cache/sci-libs/gaul-devel-0.1849-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-apps/sed slang? ( sys-libs/slang ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/sed slang? ( sys-libs/slang ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Genetic Algorithm Utility Library
 EAPI=4
 HOMEPAGE=http://GAUL.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/sed slang? ( sys-libs/slang )
 SLOT=0
 SRC_URI=mirror://sourceforge/gaul/gaul-devel-0.1849-0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2da4dd6427feabfd4f43dbce9ce00ac7
diff --git a/metadata/md5-cache/sci-libs/gdal-1.6.3-r1 b/metadata/md5-cache/sci-libs/gdal-1.6.3-r1
index 79c8e5d418cc..014aeb0c2dd5 100644
--- a/metadata/md5-cache/sci-libs/gdal-1.6.3-r1
+++ b/metadata/md5-cache/sci-libs/gdal-1.6.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-libs/expat media-libs/tiff:0 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] python? ( =dev-lang/python-2* )
+DEPEND=dev-libs/expat media-libs/tiff:0 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] python? ( =dev-lang/python-2* )
 DESCRIPTION=Translator library for raster geospatial data formats (includes OGR support)
 EAPI=3
 HOMEPAGE=http://www.gdal.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/expat media-libs/tiff:0 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* )
 SLOT=0
 SRC_URI=http://download.osgeo.org/gdal/gdal-1.6.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	ruby	d0d4dafe867eb79ce8953e27d88fc00f	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	ruby	d0d4dafe867eb79ce8953e27d88fc00f	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b30604618341f878112ae852d5eea2e
diff --git a/metadata/md5-cache/sci-libs/gdal-1.8.1-r1 b/metadata/md5-cache/sci-libs/gdal-1.8.1-r1
index 0b3b20507a1c..7b9eb0d6ebc6 100644
--- a/metadata/md5-cache/sci-libs/gdal-1.8.1-r1
+++ b/metadata/md5-cache/sci-libs/gdal-1.8.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 DESCRIPTION=Translator library for raster geospatial data formats (includes OGR support)
 EAPI=3
 HOMEPAGE=http://www.gdal.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=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* ) )
 SLOT=0
 SRC_URI=http://download.osgeo.org/gdal/gdal-1.8.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1d435098c455c54d4b6870cae23f4390
diff --git a/metadata/md5-cache/sci-libs/gdal-1.9.1 b/metadata/md5-cache/sci-libs/gdal-1.9.1
index 4c29be9ec988..c7c184a33200 100644
--- a/metadata/md5-cache/sci-libs/gdal-1.9.1
+++ b/metadata/md5-cache/sci-libs/gdal-1.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=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] ) ) armadillo? ( sci-libs/armadillo[lapack] ) 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] ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) pdf? ( app-text/podofo 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.9 ) sqlite? ( dev-db/sqlite:3 ) spatialite? ( dev-db/spatialite ) xls? ( dev-libs/freexl ) doc? ( app-doc/doxygen ) java? ( >=virtual/jdk-1.6 ) 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=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] ) ) armadillo? ( sci-libs/armadillo[lapack] ) 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] ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) pdf? ( app-text/podofo 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.9 ) sqlite? ( dev-db/sqlite:3 ) spatialite? ( dev-db/spatialite ) xls? ( dev-libs/freexl ) doc? ( app-doc/doxygen ) java? ( >=virtual/jdk-1.6 ) 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=Translator library for raster geospatial data formats (includes OGR support)
 EAPI=4
 HOMEPAGE=http://www.gdal.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat media-libs/tiff sci-libs/libgeotiff ( || ( <sys-libs/zlib
 REQUIRED_USE=spatialite? ( sqlite ) mdb? ( java )
 SLOT=0
 SRC_URI=http://download.osgeo.org/gdal/gdal-1.9.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d7ce82e20d00819d5debb9d8dc244cf8
diff --git a/metadata/md5-cache/sci-libs/gdal-1.9.2 b/metadata/md5-cache/sci-libs/gdal-1.9.2
index a2cb6643d53b..f5aa793cf6d6 100644
--- a/metadata/md5-cache/sci-libs/gdal-1.9.2
+++ b/metadata/md5-cache/sci-libs/gdal-1.9.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=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] ) armadillo? ( sci-libs/armadillo[lapack] ) 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] ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) 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.9 ) sqlite? ( dev-db/sqlite:3 ) spatialite? ( dev-db/spatialite ) xls? ( dev-libs/freexl ) doc? ( app-doc/doxygen ) java? ( >=virtual/jdk-1.6 ) 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] python? ( dev-lang/python ) java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=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] ) armadillo? ( sci-libs/armadillo[lapack] ) 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] ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) 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.9 ) sqlite? ( dev-db/sqlite:3 ) spatialite? ( dev-db/spatialite ) xls? ( dev-libs/freexl ) doc? ( app-doc/doxygen ) java? ( >=virtual/jdk-1.6 ) 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] python? ( dev-lang/python ) java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=Translator library for raster geospatial data formats (includes OGR support)
 EAPI=5
 HOMEPAGE=http://www.gdal.org/
 IUSE=armadillo +aux_xml curl debug doc ecwj2k fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc opencl ogdi pdf perl png postgres python ruby spatialite sqlite threads xls elibc_FreeBSD java
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=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] ) armadillo? ( sci-libs/armadillo[lapack] ) 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] ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) 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.9 ) sqlite? ( dev-db/sqlite:3 ) spatialite? ( dev-db/spatialite ) xls? ( dev-libs/freexl ) dev-lang/perl[-build] python? ( dev-lang/python ) java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=spatialite? ( sqlite ) mdb? ( java )
 SLOT=0
 SRC_URI=http://download.osgeo.org/gdal/gdal-1.9.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=71a8d1b067b84b9ac1439dc593305b7e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=76b7e337fe2f8eda171882daeafb5f4f
diff --git a/metadata/md5-cache/sci-libs/geos-3.2.2 b/metadata/md5-cache/sci-libs/geos-3.2.2
index fec359535db9..54f43f5d3610 100644
--- a/metadata/md5-cache/sci-libs/geos-3.2.2
+++ b/metadata/md5-cache/sci-libs/geos-3.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=ruby? ( dev-lang/ruby:1.8 ) doc? ( app-doc/doxygen ) ruby? ( dev-lang/swig ) python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=ruby? ( dev-lang/ruby:1.8 ) doc? ( app-doc/doxygen ) ruby? ( dev-lang/swig ) python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Geometry engine library for Geographic Information Systems
 EAPI=3
 HOMEPAGE=http://trac.osgeo.org/geos/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=ruby? ( dev-lang/ruby:1.8 ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://download.osgeo.org/geos/geos-3.2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7277348a3a51aba351be1418e77a01ff
diff --git a/metadata/md5-cache/sci-libs/geos-3.3.3 b/metadata/md5-cache/sci-libs/geos-3.3.3
index 9eedf486a6cf..3286d732bd0f 100644
--- a/metadata/md5-cache/sci-libs/geos-3.3.3
+++ b/metadata/md5-cache/sci-libs/geos-3.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=php? ( dev-lang/php:5.3[-threads] ) ruby? ( dev-lang/ruby ) doc? ( app-doc/doxygen ) php? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=php? ( dev-lang/php:5.3[-threads] ) ruby? ( dev-lang/ruby ) doc? ( app-doc/doxygen ) php? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Geometry engine library for Geographic Information Systems
 EAPI=4
 HOMEPAGE=http://trac.osgeo.org/geos/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=php? ( dev-lang/php:5.3[-threads] ) ruby? ( dev-lang/ruby ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://download.osgeo.org/geos/geos-3.3.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f3182cd2f869638e463e2937922b9e49
diff --git a/metadata/md5-cache/sci-libs/geos-3.3.4 b/metadata/md5-cache/sci-libs/geos-3.3.4
index c0f9b16a1de6..3f6570037987 100644
--- a/metadata/md5-cache/sci-libs/geos-3.3.4
+++ b/metadata/md5-cache/sci-libs/geos-3.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=php? ( dev-lang/php:5.3[-threads] ) ruby? ( dev-lang/ruby ) doc? ( app-doc/doxygen ) php? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=php? ( dev-lang/php:5.3[-threads] ) ruby? ( dev-lang/ruby ) doc? ( app-doc/doxygen ) php? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Geometry engine library for Geographic Information Systems
 EAPI=4
 HOMEPAGE=http://trac.osgeo.org/geos/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=php? ( dev-lang/php:5.3[-threads] ) ruby? ( dev-lang/ruby ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://download.osgeo.org/geos/geos-3.3.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eb1f3bc292de070b9b6a930bd71113b9
diff --git a/metadata/md5-cache/sci-libs/geos-3.3.5 b/metadata/md5-cache/sci-libs/geos-3.3.5
index 9cb0d156c677..05c570cd87c1 100644
--- a/metadata/md5-cache/sci-libs/geos-3.3.5
+++ b/metadata/md5-cache/sci-libs/geos-3.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=php? ( dev-lang/php:5.3[-threads] ) ruby? ( dev-lang/ruby ) doc? ( app-doc/doxygen ) php? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=php? ( dev-lang/php:5.3[-threads] ) ruby? ( dev-lang/ruby ) doc? ( app-doc/doxygen ) php? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Geometry engine library for Geographic Information Systems
 EAPI=4
 HOMEPAGE=http://trac.osgeo.org/geos/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=php? ( dev-lang/php:5.3[-threads] ) ruby? ( dev-lang/ruby ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://download.osgeo.org/geos/geos-3.3.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=908dd88d67ab561583381c7a7ba7a16f
diff --git a/metadata/md5-cache/sci-libs/geos-3.3.7 b/metadata/md5-cache/sci-libs/geos-3.3.7
index b0b57a5956ab..4bd1ac44c2c7 100644
--- a/metadata/md5-cache/sci-libs/geos-3.3.7
+++ b/metadata/md5-cache/sci-libs/geos-3.3.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=php? ( dev-lang/php:5.3[-threads] ) ruby? ( dev-lang/ruby ) doc? ( app-doc/doxygen ) php? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=php? ( dev-lang/php:5.3[-threads] ) ruby? ( dev-lang/ruby ) doc? ( app-doc/doxygen ) php? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Geometry engine library for Geographic Information Systems
 EAPI=4
 HOMEPAGE=http://trac.osgeo.org/geos/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=php? ( dev-lang/php:5.3[-threads] ) ruby? ( dev-lang/ruby ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://download.osgeo.org/geos/geos-3.3.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7631058133674181df7e35d77b5e0ea5
diff --git a/metadata/md5-cache/sci-libs/geos-3.3.8-r1 b/metadata/md5-cache/sci-libs/geos-3.3.8-r1
index 4fe2b7855792..767a7bfde4c2 100644
--- a/metadata/md5-cache/sci-libs/geos-3.3.8-r1
+++ b/metadata/md5-cache/sci-libs/geos-3.3.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=php? ( >=dev-lang/php-5.3[-threads] ) ruby? ( dev-lang/ruby ) doc? ( app-doc/doxygen ) php? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=php? ( >=dev-lang/php-5.3[-threads] ) ruby? ( dev-lang/ruby ) doc? ( app-doc/doxygen ) php? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Geometry engine library for Geographic Information Systems
 EAPI=4
 HOMEPAGE=http://trac.osgeo.org/geos/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=php? ( >=dev-lang/php-5.3[-threads] ) ruby? ( dev-lang/ruby ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://download.osgeo.org/geos/geos-3.3.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1e861854968c91bb89f890ab124d7764
diff --git a/metadata/md5-cache/sci-libs/gerris-20120731 b/metadata/md5-cache/sci-libs/gerris-20120731
index 27b763246f63..9c92388dd23c 100644
--- a/metadata/md5-cache/sci-libs/gerris-20120731
+++ b/metadata/md5-cache/sci-libs/gerris-20120731
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 dev-games/ode sci-libs/netcdf sci-libs/gsl sci-libs/gts sci-libs/hypre[mpi?] sci-libs/lis[mpi?] sci-libs/proj >=sci-libs/fftw-3 virtual/lapack mpi? ( virtual/mpi ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 dev-games/ode sci-libs/netcdf sci-libs/gsl sci-libs/gts sci-libs/hypre[mpi?] sci-libs/lis[mpi?] sci-libs/proj >=sci-libs/fftw-3 virtual/lapack mpi? ( virtual/mpi ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Gerris Flow Solver
 EAPI=4
 HOMEPAGE=http://gfs.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dev-games/ode sci-libs/netcdf sci-libs/gsl sci-libs/gts
 RESTRICT=test
 SLOT=0
 SRC_URI=http://gerris.dalembert.upmc.fr/gerris/tarballs/gerris-snapshot-120731.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e6e19d62df1a1e0820e9fc42377d189
diff --git a/metadata/md5-cache/sci-libs/getdata-0.8.0 b/metadata/md5-cache/sci-libs/getdata-0.8.0
index 86e4fffa5e8a..db6c5da63221 100644
--- a/metadata/md5-cache/sci-libs/getdata-0.8.0
+++ b/metadata/md5-cache/sci-libs/getdata-0.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool fortran? ( virtual/fortran ) python? ( =dev-lang/python-2* )
+DEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool fortran? ( virtual/fortran ) python? ( =dev-lang/python-2* )
 DESCRIPTION=Reference implementation of the Dirfile, format for time-ordered binary data
 EAPI=3
 HOMEPAGE=http://getdata.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) fortran? ( virtual/fortran ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/getdata/getdata/0.8.0/getdata-0.8.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=34650984b4ab52fb1e6e2b38651f9e1f
diff --git a/metadata/md5-cache/sci-libs/grib_api-1.9.16 b/metadata/md5-cache/sci-libs/grib_api-1.9.16
index 3b3f52668dea..6a2f24209c93 100644
--- a/metadata/md5-cache/sci-libs/grib_api-1.9.16
+++ b/metadata/md5-cache/sci-libs/grib_api-1.9.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=jpeg2k? ( jasper? ( media-libs/jasper ) !jasper? ( media-libs/openjpeg ) ) netcdf? ( sci-libs/netcdf ) png? ( media-libs/libpng ) python? ( dev-python/numpy ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=jpeg2k? ( jasper? ( media-libs/jasper ) !jasper? ( media-libs/openjpeg ) ) netcdf? ( sci-libs/netcdf ) png? ( media-libs/libpng ) python? ( dev-python/numpy ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Library for decoding WMO FM-92 GRIB messages
 EAPI=4
 HOMEPAGE=http://www.ecmwf.int/products/data/software/grib_api.html
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=jpeg2k? ( jasper? ( media-libs/jasper ) !jasper? ( media-libs/openjpeg ) ) netcdf? ( sci-libs/netcdf ) png? ( media-libs/libpng ) python? ( dev-python/numpy ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://www.ecmwf.int/products/data/software/download/software_files/grib_api-1.9.16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=649466804863284aad2e9c03d8c09c51
diff --git a/metadata/md5-cache/sci-libs/gsl-1.14 b/metadata/md5-cache/sci-libs/gsl-1.14
index 872dd656814b..3ba41823d237 100644
--- a/metadata/md5-cache/sci-libs/gsl-1.14
+++ b/metadata/md5-cache/sci-libs/gsl-1.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=cblas-external? ( virtual/cblas ) app-admin/eselect-cblas virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=cblas-external? ( virtual/cblas ) app-admin/eselect-cblas virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The GNU Scientific Library
 EAPI=3
 HOMEPAGE=http://www.gnu.org/software/gsl/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=cblas-external? ( virtual/cblas )
 SLOT=0
 SRC_URI=mirror://gnu/gsl/gsl-1.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5e15ff48aa7f0f32ebf00f71a48d3d11
diff --git a/metadata/md5-cache/sci-libs/gsl-1.14-r1 b/metadata/md5-cache/sci-libs/gsl-1.14-r1
index 639aca6f206b..9ba7a3e8fa7f 100644
--- a/metadata/md5-cache/sci-libs/gsl-1.14-r1
+++ b/metadata/md5-cache/sci-libs/gsl-1.14-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=cblas-external? ( virtual/cblas ) app-admin/eselect-cblas virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=cblas-external? ( virtual/cblas ) app-admin/eselect-cblas virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The GNU Scientific Library
 EAPI=3
 HOMEPAGE=http://www.gnu.org/software/gsl/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=cblas-external? ( virtual/cblas )
 SLOT=0
 SRC_URI=mirror://gnu/gsl/gsl-1.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bc55c405c050d89ff384e5a3a60d8b96
diff --git a/metadata/md5-cache/sci-libs/gsl-1.15 b/metadata/md5-cache/sci-libs/gsl-1.15
index 1d82a30a277e..d541ee82261c 100644
--- a/metadata/md5-cache/sci-libs/gsl-1.15
+++ b/metadata/md5-cache/sci-libs/gsl-1.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare pretend
-DEPEND=cblas-external? ( virtual/cblas ) app-admin/eselect-cblas virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=cblas-external? ( virtual/cblas ) app-admin/eselect-cblas virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The GNU Scientific Library
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/gsl/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=cblas-external? ( virtual/cblas )
 SLOT=0
 SRC_URI=mirror://gnu/gsl/gsl-1.15.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5286ef41588f0a5c9b001de473e4cc92
diff --git a/metadata/md5-cache/sci-libs/gts-20100321-r3 b/metadata/md5-cache/sci-libs/gts-20100321-r3
index 884d970e51bf..32366a057427 100644
--- a/metadata/md5-cache/sci-libs/gts-20100321-r3
+++ b/metadata/md5-cache/sci-libs/gts-20100321-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare setup
-DEPEND=dev-libs/glib:2 !<=sci-chemistry/ccp4-apps-6.1.3-r2 virtual/pkgconfig test? ( media-libs/netpbm ) virtual/fortran || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 !<=sci-chemistry/ccp4-apps-6.1.3-r2 virtual/pkgconfig test? ( media-libs/netpbm ) virtual/fortran || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU Triangulated Surface Library
 EAPI=2
 HOMEPAGE=http://gts.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 !<=sci-chemistry/ccp4-apps-6.1.3-r2 virtual/fortran
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/gts-20100321.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=902883a503e51e98ece8663641bff334
diff --git a/metadata/md5-cache/sci-libs/gts-20111025-r1 b/metadata/md5-cache/sci-libs/gts-20111025-r1
index d34b1cb9c082..3e02d9a58c3f 100644
--- a/metadata/md5-cache/sci-libs/gts-20111025-r1
+++ b/metadata/md5-cache/sci-libs/gts-20111025-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/glib:2 virtual/pkgconfig test? ( media-libs/netpbm ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=dev-libs/glib:2 virtual/pkgconfig test? ( media-libs/netpbm ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=GNU Triangulated Surface Library
 EAPI=4
 HOMEPAGE=http://gts.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 virtual/fortran
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/gts-20111025.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a8cee604f87389fb152ecede0812ea82
diff --git a/metadata/md5-cache/sci-libs/gts-20120706 b/metadata/md5-cache/sci-libs/gts-20120706
index 5ce1c1fde1f7..dd86dba036bb 100644
--- a/metadata/md5-cache/sci-libs/gts-20120706
+++ b/metadata/md5-cache/sci-libs/gts-20120706
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/glib:2 virtual/pkgconfig test? ( media-libs/netpbm ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=dev-libs/glib:2 virtual/pkgconfig test? ( media-libs/netpbm ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=GNU Triangulated Surface Library
 EAPI=4
 HOMEPAGE=http://gts.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/glib:2 virtual/fortran
 SLOT=0
 SRC_URI=http://gts.sourceforge.net/tarballs/gts-snapshot-120706.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0defd0b3fd597674fc041f57f36e72aa
diff --git a/metadata/md5-cache/sci-libs/hdf-4.2.8 b/metadata/md5-cache/sci-libs/hdf-4.2.8
index c7bfed287236..3dfba61ab336 100644
--- a/metadata/md5-cache/sci-libs/hdf-4.2.8
+++ b/metadata/md5-cache/sci-libs/hdf-4.2.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=sys-libs/zlib virtual/jpeg szip? ( >=sci-libs/szip-2 ) fortran? ( virtual/fortran ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib virtual/jpeg szip? ( >=sci-libs/szip-2 ) fortran? ( virtual/fortran ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=General purpose library and format for storing scientific data
 EAPI=4
 HOMEPAGE=http://www.hdfgroup.org/hdf4.html
@@ -9,5 +9,5 @@ LICENSE=NCSA-HDF
 RDEPEND=sys-libs/zlib virtual/jpeg szip? ( >=sci-libs/szip-2 ) fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/hdf-4.2.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=08e65ec309e2758ba3a463a0a0195db7
diff --git a/metadata/md5-cache/sci-libs/hdf-4.2.9 b/metadata/md5-cache/sci-libs/hdf-4.2.9
index 49f6c448d698..feb8cf2a6980 100644
--- a/metadata/md5-cache/sci-libs/hdf-4.2.9
+++ b/metadata/md5-cache/sci-libs/hdf-4.2.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=sys-libs/zlib virtual/jpeg szip? ( >=sci-libs/szip-2 ) fortran? ( virtual/fortran ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib virtual/jpeg szip? ( >=sci-libs/szip-2 ) fortran? ( virtual/fortran ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=General purpose library and format for storing scientific data
 EAPI=4
 HOMEPAGE=http://www.hdfgroup.org/hdf4.html
@@ -9,5 +9,5 @@ LICENSE=NCSA-HDF
 RDEPEND=sys-libs/zlib virtual/jpeg szip? ( >=sci-libs/szip-2 ) fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/hdf-4.2.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=458a44bff057c650179351e00b1054c1
diff --git a/metadata/md5-cache/sci-libs/hdf5-1.8.10 b/metadata/md5-cache/sci-libs/hdf5-1.8.10
index e56e825e9908..34339319edf4 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.8.10
+++ b/metadata/md5-cache/sci-libs/hdf5-1.8.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=mpi? ( virtual/mpi[romio] ) szip? ( >=sci-libs/szip-2.1 ) zlib? ( sys-libs/zlib ) sys-devel/libtool:2 >=sys-devel/autoconf-2.69 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool fortran? ( virtual/fortran )
+DEPEND=mpi? ( virtual/mpi[romio] ) szip? ( >=sci-libs/szip-2.1 ) zlib? ( sys-libs/zlib ) sys-devel/libtool:2 >=sys-devel/autoconf-2.69 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool fortran? ( virtual/fortran )
 DESCRIPTION=General purpose library and file format for storing scientific data
 EAPI=4
 HOMEPAGE=http://www.hdfgroup.org/HDF5/
@@ -10,5 +10,5 @@ RDEPEND=mpi? ( virtual/mpi[romio] ) szip? ( >=sci-libs/szip-2.1 ) zlib? ( sys-li
 REQUIRED_USE=cxx? ( !mpi ) mpi? ( !cxx ) threads? ( !cxx !mpi !fortran ) fortran2003? ( fortran )
 SLOT=0
 SRC_URI=http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8.10/src/hdf5-1.8.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eb802f7f7588be2a37f6c9ebc933c00f
diff --git a/metadata/md5-cache/sci-libs/hdf5-1.8.10_p1 b/metadata/md5-cache/sci-libs/hdf5-1.8.10_p1
index 5db1352db11d..591b859e5c09 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.8.10_p1
+++ b/metadata/md5-cache/sci-libs/hdf5-1.8.10_p1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=mpi? ( virtual/mpi[romio] ) szip? ( >=sci-libs/szip-2.1 ) zlib? ( sys-libs/zlib ) sys-devel/libtool:2 >=sys-devel/autoconf-2.69 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool fortran? ( virtual/fortran )
+DEPEND=mpi? ( virtual/mpi[romio] ) szip? ( >=sci-libs/szip-2.1 ) zlib? ( sys-libs/zlib ) sys-devel/libtool:2 >=sys-devel/autoconf-2.69 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool fortran? ( virtual/fortran )
 DESCRIPTION=General purpose library and file format for storing scientific data
 EAPI=5
 HOMEPAGE=http://www.hdfgroup.org/HDF5/
@@ -10,5 +10,5 @@ RDEPEND=mpi? ( virtual/mpi[romio] ) szip? ( >=sci-libs/szip-2.1 ) zlib? ( sys-li
 REQUIRED_USE=cxx? ( !mpi ) mpi? ( !cxx ) threads? ( !cxx !mpi !fortran ) fortran2003? ( fortran )
 SLOT=0/1.8.10
 SRC_URI=http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8.10-patch1/src/hdf5-1.8.10-patch1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3404ff7cf59b75ac5eaa5896545b5876
diff --git a/metadata/md5-cache/sci-libs/itpp-4.2-r1 b/metadata/md5-cache/sci-libs/itpp-4.2-r1
index 523d0688b204..33a4a6148fc5 100644
--- a/metadata/md5-cache/sci-libs/itpp-4.2-r1
+++ b/metadata/md5-cache/sci-libs/itpp-4.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=blas? ( virtual/blas lapack? ( virtual/lapack ) ) !minimal? ( fftw? ( >=sci-libs/fftw-3 ) ) blas? ( virtual/pkgconfig ) doc? ( app-doc/doxygen virtual/latex-base ) lapack? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=blas? ( virtual/blas lapack? ( virtual/lapack ) ) !minimal? ( fftw? ( >=sci-libs/fftw-3 ) ) blas? ( virtual/pkgconfig ) doc? ( app-doc/doxygen virtual/latex-base ) lapack? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C++ library of mathematical, signal processing and communication
 EAPI=4
 HOMEPAGE=http://itpp.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=blas? ( virtual/blas lapack? ( virtual/lapack ) ) !minimal? ( fftw? ( >=sci-libs/fftw-3 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/itpp/itpp-4.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=696327419a0afbeece66d3c15ac53b1a
diff --git a/metadata/md5-cache/sci-libs/itpp-4.2-r2 b/metadata/md5-cache/sci-libs/itpp-4.2-r2
index b65a87ef0e21..d5feec3b8107 100644
--- a/metadata/md5-cache/sci-libs/itpp-4.2-r2
+++ b/metadata/md5-cache/sci-libs/itpp-4.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=blas? ( virtual/blas lapack? ( virtual/lapack ) ) !minimal? ( fftw? ( >=sci-libs/fftw-3 ) ) >=sys-devel/automake-1.11.1 blas? ( virtual/pkgconfig ) doc? ( app-doc/doxygen virtual/latex-base ) lapack? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=blas? ( virtual/blas lapack? ( virtual/lapack ) ) !minimal? ( fftw? ( >=sci-libs/fftw-3 ) ) >=sys-devel/automake-1.11.1 blas? ( virtual/pkgconfig ) doc? ( app-doc/doxygen virtual/latex-base ) lapack? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C++ library of mathematical, signal processing and communication
 EAPI=4
 HOMEPAGE=http://itpp.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=blas? ( virtual/blas lapack? ( virtual/lapack ) ) !minimal? ( fftw? ( >=sci-libs/fftw-3 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/itpp/itpp-4.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a0ce25a263ab90228c76149e60b838a
diff --git a/metadata/md5-cache/sci-libs/klu-1.1.1 b/metadata/md5-cache/sci-libs/klu-1.1.1
index 6e803c54413d..b34805dfc5da 100644
--- a/metadata/md5-cache/sci-libs/klu-1.1.1
+++ b/metadata/md5-cache/sci-libs/klu-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sci-libs/amd sci-libs/btf sci-libs/colamd || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/amd sci-libs/btf sci-libs/colamd || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Sparse LU factorization for circuit simulation
 EAPI=4
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/klu/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/amd sci-libs/btf sci-libs/colamd
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/klu/KLU-1.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=be4880fcac784739d79edaf4a7020778
diff --git a/metadata/md5-cache/sci-libs/klu-1.1.2 b/metadata/md5-cache/sci-libs/klu-1.1.2
index 380642e644bd..d5f6e6fee801 100644
--- a/metadata/md5-cache/sci-libs/klu-1.1.2
+++ b/metadata/md5-cache/sci-libs/klu-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sci-libs/amd sci-libs/btf sci-libs/colamd || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/amd sci-libs/btf sci-libs/colamd || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Sparse LU factorization for circuit simulation
 EAPI=4
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/klu/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/amd sci-libs/btf sci-libs/colamd
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/klu/KLU-1.1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4fe6554ef73327928507d9a1dccf9ff0
diff --git a/metadata/md5-cache/sci-libs/klu-1.1.3 b/metadata/md5-cache/sci-libs/klu-1.1.3
index 0c1fdbcfca54..a38c6cb22f76 100644
--- a/metadata/md5-cache/sci-libs/klu-1.1.3
+++ b/metadata/md5-cache/sci-libs/klu-1.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/amd sci-libs/btf sci-libs/colamd || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/amd sci-libs/btf sci-libs/colamd || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Sparse LU factorization for circuit simulation
 EAPI=4
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/klu/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/amd sci-libs/btf sci-libs/colamd
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/klu/KLU-1.1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9683630f92b48a598e2b524722b1ff50
diff --git a/metadata/md5-cache/sci-libs/klu-1.2.1 b/metadata/md5-cache/sci-libs/klu-1.2.1
index b32c0b4fdf5b..f760d876b542 100644
--- a/metadata/md5-cache/sci-libs/klu-1.2.1
+++ b/metadata/md5-cache/sci-libs/klu-1.2.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sci-libs/amd-1.3 >=sci-libs/btf-1.2 >=sci-libs/colamd-1.3
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/klu-1.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8c2432afb6b6ae041c275111d6a8805e
diff --git a/metadata/md5-cache/sci-libs/lapack-reference-3.1.1-r1 b/metadata/md5-cache/sci-libs/lapack-reference-3.1.1-r1
index 11bae34cf4e0..78ae2acf8b4b 100644
--- a/metadata/md5-cache/sci-libs/lapack-reference-3.1.1-r1
+++ b/metadata/md5-cache/sci-libs/lapack-reference-3.1.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup test unpack
-DEPEND=app-admin/eselect-lapack virtual/blas virtual/pkgconfig doc? ( app-doc/lapack-docs ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=app-admin/eselect-lapack virtual/blas virtual/pkgconfig doc? ( app-doc/lapack-docs ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=FORTRAN reference implementation of LAPACK Linear Algebra PACKage
 HOMEPAGE=http://www.netlib.org/lapack/index.html
 IUSE=doc
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-admin/eselect-lapack virtual/blas virtual/fortran
 SLOT=0
 SRC_URI=http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz mirror://gentoo/lapack-reference-3.1.1-autotools.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=40ddcb22156d31360a666cb7fc54bae9
diff --git a/metadata/md5-cache/sci-libs/lapack-reference-3.2.1-r1 b/metadata/md5-cache/sci-libs/lapack-reference-3.2.1-r1
index 3788dc8945aa..c8c04f332abf 100644
--- a/metadata/md5-cache/sci-libs/lapack-reference-3.2.1-r1
+++ b/metadata/md5-cache/sci-libs/lapack-reference-3.2.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=app-admin/eselect-lapack virtual/blas virtual/pkgconfig doc? ( app-doc/lapack-docs ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=app-admin/eselect-lapack virtual/blas virtual/pkgconfig doc? ( app-doc/lapack-docs ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=FORTRAN reference implementation of LAPACK Linear Algebra PACKage
 EAPI=3
 HOMEPAGE=http://www.netlib.org/lapack/index.html
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-admin/eselect-lapack virtual/blas virtual/fortran
 SLOT=0
 SRC_URI=mirror://gentoo/lapack-3.2.1.tgz mirror://gentoo/lapack-reference-3.2.1-autotools.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1f69a4698173377724c2558675b4ae83
diff --git a/metadata/md5-cache/sci-libs/lapack-reference-3.2.1-r3 b/metadata/md5-cache/sci-libs/lapack-reference-3.2.1-r3
index 9a416e3a8508..22a0a00e8bb1 100644
--- a/metadata/md5-cache/sci-libs/lapack-reference-3.2.1-r3
+++ b/metadata/md5-cache/sci-libs/lapack-reference-3.2.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=app-admin/eselect-lapack virtual/blas virtual/pkgconfig doc? ( app-doc/lapack-docs ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=app-admin/eselect-lapack virtual/blas virtual/pkgconfig doc? ( app-doc/lapack-docs ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=FORTRAN reference implementation of LAPACK Linear Algebra PACKage
 EAPI=3
 HOMEPAGE=http://www.netlib.org/lapack/index.html
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-admin/eselect-lapack virtual/blas virtual/fortran
 SLOT=0
 SRC_URI=mirror://gentoo/lapack-3.2.1.tgz mirror://gentoo/lapack-reference-3.2.1-autotools.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3cadb5b302bff0d93ddf8fdfa70a4d42
diff --git a/metadata/md5-cache/sci-libs/ldl-2.0.3-r1 b/metadata/md5-cache/sci-libs/ldl-2.0.3-r1
index d65d9508f4cf..fd51bb6d5d19 100644
--- a/metadata/md5-cache/sci-libs/ldl-2.0.3-r1
+++ b/metadata/md5-cache/sci-libs/ldl-2.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple but educational LDL^T matrix factorization algorithm
 EAPI=2
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/ldl
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/ufconfig
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/ldl/LDL-2.0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7191ead02a30f5f5a7b629f675abb881
diff --git a/metadata/md5-cache/sci-libs/ldl-2.0.4 b/metadata/md5-cache/sci-libs/ldl-2.0.4
index f15b85cf7340..e9d9c86bdc95 100644
--- a/metadata/md5-cache/sci-libs/ldl-2.0.4
+++ b/metadata/md5-cache/sci-libs/ldl-2.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/ufconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple but educational LDL^T matrix factorization algorithm
 EAPI=4
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/ldl
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/ldl/LDL-2.0.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=823e71cf866af8efc30288ad5857ab45
diff --git a/metadata/md5-cache/sci-libs/ldl-2.1.0 b/metadata/md5-cache/sci-libs/ldl-2.1.0
index b632cc13da3f..08fb4ef9b47d 100644
--- a/metadata/md5-cache/sci-libs/ldl-2.1.0
+++ b/metadata/md5-cache/sci-libs/ldl-2.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/ldl-2.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a3ca59f2247bb08b31f16740ed4d1c2e
diff --git a/metadata/md5-cache/sci-libs/libcmatrix-3.11.0 b/metadata/md5-cache/sci-libs/libcmatrix-3.11.0
index 676c8fed3bbf..1bf4bcf2d307 100644
--- a/metadata/md5-cache/sci-libs/libcmatrix-3.11.0
+++ b/metadata/md5-cache/sci-libs/libcmatrix-3.11.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/minuit || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/minuit || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=lite version of pNMRsim
 EAPI=5
 HOMEPAGE=http://www.dur.ac.uk/paul.hodgkinson/pNMRsim/
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=sci-libs/minuit
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/libcmatrix-3.11.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=836255e99e064ba047bdc93c40b84569
diff --git a/metadata/md5-cache/sci-libs/libctl-3.1 b/metadata/md5-cache/sci-libs/libctl-3.1
index d218e3033e66..acfc8be1c098 100644
--- a/metadata/md5-cache/sci-libs/libctl-3.1
+++ b/metadata/md5-cache/sci-libs/libctl-3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-scheme/guile[deprecated] sci-libs/nlopt virtual/fortran
 SLOT=0
 SRC_URI=http://ab-initio.mit.edu/libctl/libctl-3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b3b696acf7bdd2e68f37f88853146cfc
diff --git a/metadata/md5-cache/sci-libs/libctl-3.2 b/metadata/md5-cache/sci-libs/libctl-3.2
index 0b748ca9794a..206e8e254f5c 100644
--- a/metadata/md5-cache/sci-libs/libctl-3.2
+++ b/metadata/md5-cache/sci-libs/libctl-3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-scheme/guile sci-libs/nlopt virtual/fortran
 SLOT=0
 SRC_URI=http://ab-initio.mit.edu/libctl/libctl-3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3d658b1b1e3f74f8c3600eb1489871e8
diff --git a/metadata/md5-cache/sci-libs/libdap-3.11.3 b/metadata/md5-cache/sci-libs/libdap-3.11.3
index 5f4e01f9edc7..63757e19fee8 100644
--- a/metadata/md5-cache/sci-libs/libdap-3.11.3
+++ b/metadata/md5-cache/sci-libs/libdap-3.11.3
@@ -10,5 +10,5 @@ RDEPEND=dev-util/cppunit dev-libs/libxml2:2 net-misc/curl sys-libs/zlib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.opendap.org/pub/source/libdap-3.11.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=27f2ab7dd995fe2761fb8a454d68b970
diff --git a/metadata/md5-cache/sci-libs/libecwj2-3.3-r1 b/metadata/md5-cache/sci-libs/libecwj2-3.3-r1
index c816d3d8240b..da753eb495ac 100644
--- a/metadata/md5-cache/sci-libs/libecwj2-3.3-r1
+++ b/metadata/md5-cache/sci-libs/libecwj2-3.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND==media-libs/lcms-1* app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==media-libs/lcms-1* app-arch/unzip || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for both the ECW and the ISO JPEG 2000 image file formats
 EAPI=4
 HOMEPAGE=http://www.ermapper.com/ProductView.aspx?t=28
@@ -9,5 +9,5 @@ LICENSE=ECWPL
 RDEPEND==media-libs/lcms-1*
 SLOT=0
 SRC_URI=mirror://gentoo/libecwj2-3.3-2006-09-06.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a7af10d96173ec24c3c03a93fb0f42df
diff --git a/metadata/md5-cache/sci-libs/libgenome-1.3-r1 b/metadata/md5-cache/sci-libs/libgenome-1.3-r1
index 4b2f76c0e1a1..8b523fc031f1 100644
--- a/metadata/md5-cache/sci-libs/libgenome-1.3-r1
+++ b/metadata/md5-cache/sci-libs/libgenome-1.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for sci-biology/mauve
 EAPI=2
 HOMEPAGE=http://gel.ahabs.wisc.edu/mauve/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/libgenome-1.3-r1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=b65f596940103a663631540fd321c374
diff --git a/metadata/md5-cache/sci-libs/libgenome-9999 b/metadata/md5-cache/sci-libs/libgenome-9999
index a20322680399..119ec20d3c33 100644
--- a/metadata/md5-cache/sci-libs/libgenome-9999
+++ b/metadata/md5-cache/sci-libs/libgenome-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install preinst prepare unpack
-DEPEND=doc? ( app-doc/doxygen ) || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for sci-biology/mauve
 EAPI=2
 HOMEPAGE=http://gel.ahabs.wisc.edu/mauve/
 IUSE=doc
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=947451d75ed36b7a6e6be29ea2dc37dd
diff --git a/metadata/md5-cache/sci-libs/libgeotiff-1.2.4 b/metadata/md5-cache/sci-libs/libgeotiff-1.2.4
index d5c62697948a..7ae1f7f87cf6 100644
--- a/metadata/md5-cache/sci-libs/libgeotiff-1.2.4
+++ b/metadata/md5-cache/sci-libs/libgeotiff-1.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=media-libs/tiff-3.7 virtual/jpeg sci-libs/proj doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/tiff-3.7 virtual/jpeg sci-libs/proj doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for reading TIFF files with embedded tags for geographic (cartographic) information
 HOMEPAGE=http://www.remotesensing.org/geotiff/geotiff.html
 IUSE=doc python
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/tiff-3.7 virtual/jpeg sci-libs/proj
 SLOT=0
 SRC_URI=ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/libgeotiff-1.2.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3c3c70f673147a902b6c98108f0f9f89
diff --git a/metadata/md5-cache/sci-libs/libgeotiff-1.4.0 b/metadata/md5-cache/sci-libs/libgeotiff-1.4.0
index 476853143bc2..30853cc2b179 100644
--- a/metadata/md5-cache/sci-libs/libgeotiff-1.4.0
+++ b/metadata/md5-cache/sci-libs/libgeotiff-1.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=virtual/jpeg >=media-libs/tiff-3.9.1 sci-libs/proj sys-libs/zlib doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/jpeg >=media-libs/tiff-3.9.1 sci-libs/proj sys-libs/zlib doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for reading TIFF files with embedded tags for geographic (cartographic) information
 EAPI=4
 HOMEPAGE=http://geotiff.osgeo.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg >=media-libs/tiff-3.9.1 sci-libs/proj sys-libs/zlib
 SLOT=0
 SRC_URI=http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.4.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2a1ae5d1de0deafeac90572f15b34788
diff --git a/metadata/md5-cache/sci-libs/libghemical-2.00 b/metadata/md5-cache/sci-libs/libghemical-2.00
index a2da2ceab60d..0b44c8937ba1 100644
--- a/metadata/md5-cache/sci-libs/libghemical-2.00
+++ b/metadata/md5-cache/sci-libs/libghemical-2.00
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=mopac7? ( sci-chemistry/mopac7 ) mpqc? ( >=sci-chemistry/mpqc-2.3.1-r1 virtual/blas virtual/lapack ) virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mopac7? ( sci-chemistry/mopac7 ) mpqc? ( >=sci-chemistry/mpqc-2.3.1-r1 virtual/blas virtual/lapack ) virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Chemical quantum mechanics and molecular mechanics
 HOMEPAGE=http://bioinformatics.org/ghemical/
 IUSE=mopac7 mpqc
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=mopac7? ( sci-chemistry/mopac7 ) mpqc? ( >=sci-chemistry/mpqc-2.3.1-r1 virtual/blas virtual/lapack )
 SLOT=0
 SRC_URI=http://www.bioinformatics.org/ghemical/download/libghemical-2.00.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cb22d1452d7e8976e48fef0e52223e8a
diff --git a/metadata/md5-cache/sci-libs/libghemical-2.99.1 b/metadata/md5-cache/sci-libs/libghemical-2.99.1
index b7bd4a48781a..b7bd4c4a746f 100644
--- a/metadata/md5-cache/sci-libs/libghemical-2.99.1
+++ b/metadata/md5-cache/sci-libs/libghemical-2.99.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=mopac7? ( >=sci-chemistry/mopac7-1.13-r1 ) mpqc? ( >=sci-chemistry/mpqc-2.3.1-r1 virtual/blas virtual/lapack ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mopac7? ( >=sci-chemistry/mopac7-1.13-r1 ) mpqc? ( >=sci-chemistry/mpqc-2.3.1-r1 virtual/blas virtual/lapack ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Chemical quantum mechanics and molecular mechanics
 EAPI=3
 HOMEPAGE=http://bioinformatics.org/ghemical/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mopac7? ( >=sci-chemistry/mopac7-1.13-r1 ) mpqc? ( >=sci-chemistry/mpqc-2.3.1-r1 virtual/blas virtual/lapack )
 SLOT=0
 SRC_URI=http://www.bioinformatics.org/ghemical/download/current/libghemical-2.99.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a815c35916471b78e505b17b4836e0c6
diff --git a/metadata/md5-cache/sci-libs/libghemical-3.0.0 b/metadata/md5-cache/sci-libs/libghemical-3.0.0
index b0f7ef55dae2..69b7e7cbdbff 100644
--- a/metadata/md5-cache/sci-libs/libghemical-3.0.0
+++ b/metadata/md5-cache/sci-libs/libghemical-3.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=mopac7? ( >=sci-chemistry/mopac7-1.13-r1 ) mpqc? ( >=sci-chemistry/mpqc-2.3.1-r1 virtual/blas virtual/lapack ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mopac7? ( >=sci-chemistry/mopac7-1.13-r1 ) mpqc? ( >=sci-chemistry/mpqc-2.3.1-r1 virtual/blas virtual/lapack ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Chemical quantum mechanics and molecular mechanics
 EAPI=3
 HOMEPAGE=http://bioinformatics.org/ghemical/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mopac7? ( >=sci-chemistry/mopac7-1.13-r1 ) mpqc? ( >=sci-chemistry/mpqc-2.3.1-r1 virtual/blas virtual/lapack )
 SLOT=0
 SRC_URI=http://www.bioinformatics.org/ghemical/download/current/libghemical-3.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b267605fd8480a6883ae62b3cf61dbe2
diff --git a/metadata/md5-cache/sci-libs/libh2o-0.2.1 b/metadata/md5-cache/sci-libs/libh2o-0.2.1
index 5038bc1ff0d8..42c0c6461318 100644
--- a/metadata/md5-cache/sci-libs/libh2o-0.2.1
+++ b/metadata/md5-cache/sci-libs/libh2o-0.2.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/libh2o/downloads/libh2o-0.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b557f324505ece50658531ef36f1c1cb
diff --git a/metadata/md5-cache/sci-libs/libh2o-9999 b/metadata/md5-cache/sci-libs/libh2o-9999
index 93bb2a223325..944f146c9113 100644
--- a/metadata/md5-cache/sci-libs/libh2o-9999
+++ b/metadata/md5-cache/sci-libs/libh2o-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/pkgconfig dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library of routines for IF97 water & steam properties
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/libh2o/
 IUSE=debug static-libs
 LICENSE=BSD
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=74a2fc65c833c9118c16b80642a74947
diff --git a/metadata/md5-cache/sci-libs/libh2oxx-0.2 b/metadata/md5-cache/sci-libs/libh2oxx-0.2
index bab6f388df26..454c575f1146 100644
--- a/metadata/md5-cache/sci-libs/libh2oxx-0.2
+++ b/metadata/md5-cache/sci-libs/libh2oxx-0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=sci-libs/libh2o-0.2
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/libh2oxx/downloads/libh2oxx-0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=538633b32ce935747d87d0ab92e1f1f1
diff --git a/metadata/md5-cache/sci-libs/libh2oxx-9999 b/metadata/md5-cache/sci-libs/libh2oxx-9999
index e1b9e917d3c9..3e33c2797c39 100644
--- a/metadata/md5-cache/sci-libs/libh2oxx-9999
+++ b/metadata/md5-cache/sci-libs/libh2oxx-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=sci-libs/libh2o-0.2 dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sci-libs/libh2o-0.2 dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C++ bindings for libh2o
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/libh2oxx/
@@ -7,5 +7,5 @@ IUSE=debug static-libs
 LICENSE=BSD
 RDEPEND=>=sci-libs/libh2o-0.2
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=72cf779590ddcc0674db4d705e88879a
diff --git a/metadata/md5-cache/sci-libs/libmems-1.6 b/metadata/md5-cache/sci-libs/libmems-1.6
index 4cbd83999dcc..f8ff93570550 100644
--- a/metadata/md5-cache/sci-libs/libmems-1.6
+++ b/metadata/md5-cache/sci-libs/libmems-1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/boost sci-libs/libgenome sci-libs/libmuscle doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/boost sci-libs/libgenome sci-libs/libmuscle doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for sci-biology/mauve
 EAPI=2
 HOMEPAGE=http://gel.ahabs.wisc.edu/mauve/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost sci-libs/libgenome sci-libs/libmuscle
 SLOT=0
 SRC_URI=mirror://gentoo/libmems-1.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=261be07435ac200599986c2ee094485b
diff --git a/metadata/md5-cache/sci-libs/libmems-1.6_p1 b/metadata/md5-cache/sci-libs/libmems-1.6_p1
index 0faf1cfb294a..75a23bf0367e 100644
--- a/metadata/md5-cache/sci-libs/libmems-1.6_p1
+++ b/metadata/md5-cache/sci-libs/libmems-1.6_p1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost sci-libs/libgenome sci-libs/libmuscle doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/boost sci-libs/libgenome sci-libs/libmuscle doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for sci-biology/mauve
 EAPI=4
 HOMEPAGE=http://gel.ahabs.wisc.edu/mauve/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost sci-libs/libgenome sci-libs/libmuscle
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/libmems-1.6_p1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=196a8d7f755f06994b475f7db3422e73
diff --git a/metadata/md5-cache/sci-libs/libmems-9999 b/metadata/md5-cache/sci-libs/libmems-9999
index e6a1d2534af2..12714bfa9667 100644
--- a/metadata/md5-cache/sci-libs/libmems-9999
+++ b/metadata/md5-cache/sci-libs/libmems-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare test unpack
-DEPEND=dev-libs/boost sci-libs/libgenome sci-libs/libmuscle doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=dev-libs/boost sci-libs/libgenome sci-libs/libmuscle doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=Library for sci-biology/mauve
 EAPI=4
 HOMEPAGE=http://gel.ahabs.wisc.edu/mauve/
@@ -7,5 +7,5 @@ IUSE=doc
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost sci-libs/libgenome sci-libs/libmuscle
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7d2ca16d582011332d449fa094582631
diff --git a/metadata/md5-cache/sci-libs/libmuscle-3.7-r1 b/metadata/md5-cache/sci-libs/libmuscle-3.7-r1
index 16b36f930c18..733ba38f7ee4 100644
--- a/metadata/md5-cache/sci-libs/libmuscle-3.7-r1
+++ b/metadata/md5-cache/sci-libs/libmuscle-3.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=doc? ( app-doc/doxygen ) !sci-biology/muscle || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) !sci-biology/muscle || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for sci-biology/mauve
 EAPI=2
 HOMEPAGE=http://gel.ahabs.wisc.edu/mauve/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://gentoo/libmuscle-3.7-r1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=1d51ba233d7c0d745dd04970a7807057
diff --git a/metadata/md5-cache/sci-libs/libmuscle-3.7-r2 b/metadata/md5-cache/sci-libs/libmuscle-3.7-r2
index a117bb1c775a..dcaba36a78b8 100644
--- a/metadata/md5-cache/sci-libs/libmuscle-3.7-r2
+++ b/metadata/md5-cache/sci-libs/libmuscle-3.7-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=doc? ( app-doc/doxygen ) !sci-biology/muscle || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) !sci-biology/muscle || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for sci-biology/mauve
 EAPI=2
 HOMEPAGE=http://gel.ahabs.wisc.edu/mauve/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://gentoo/libmuscle-3.7-r1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=221925168237e96f004029692495d3ba
diff --git a/metadata/md5-cache/sci-libs/libmuscle-9999 b/metadata/md5-cache/sci-libs/libmuscle-9999
index 8df5d7c995f1..207cd6f97982 100644
--- a/metadata/md5-cache/sci-libs/libmuscle-9999
+++ b/metadata/md5-cache/sci-libs/libmuscle-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install preinst prepare unpack
-DEPEND=doc? ( app-doc/doxygen ) !sci-biology/muscle || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) !sci-biology/muscle || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for sci-biology/mauve
 EAPI=2
 HOMEPAGE=http://gel.ahabs.wisc.edu/mauve/
 IUSE=doc
 LICENSE=public-domain
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2c5f8c9fe1a158b1dd2e7ddb401efee2
diff --git a/metadata/md5-cache/sci-libs/libnova-0.12.3 b/metadata/md5-cache/sci-libs/libnova-0.12.3
index e70bf52747a9..1f764cd29b85 100644
--- a/metadata/md5-cache/sci-libs/libnova-0.12.3
+++ b/metadata/md5-cache/sci-libs/libnova-0.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Celestial Mechanics and Astronomical Calculation Library
 EAPI=2
 HOMEPAGE=http://libnova.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 hppa ppc ppc64 x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/libnova/libnova-0.12.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=49b448217d626aafb244b88e38bd4694
diff --git a/metadata/md5-cache/sci-libs/libnova-0.15.0 b/metadata/md5-cache/sci-libs/libnova-0.15.0
index 5d64fe26be7f..0e21839caa1d 100644
--- a/metadata/md5-cache/sci-libs/libnova-0.15.0
+++ b/metadata/md5-cache/sci-libs/libnova-0.15.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Celestial Mechanics and Astronomical Calculation Library
 EAPI=4
 HOMEPAGE=http://libnova.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/libnova/libnova-0.15.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e872d3918b5a112418800ba53dbe6cb9
diff --git a/metadata/md5-cache/sci-libs/libspatialindex-1.8.0 b/metadata/md5-cache/sci-libs/libspatialindex-1.8.0
index ee26eedbf47f..a167d0dbd60d 100644
--- a/metadata/md5-cache/sci-libs/libspatialindex-1.8.0
+++ b/metadata/md5-cache/sci-libs/libspatialindex-1.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=General framework for developing spatial indices
 EAPI=5
 HOMEPAGE=http://libspatialindex.github.com/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://download.osgeo.org/libspatialindex/spatialindex-src-1.8.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=85055acc32ce46af2da4924b04ba4337
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-3.2.16-r3 b/metadata/md5-cache/sci-libs/linux-gpib-3.2.16-r3
index 07e931cdd889..7db6ca6bba94 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-3.2.16-r3
+++ b/metadata/md5-cache/sci-libs/linux-gpib-3.2.16-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=tcl? ( dev-lang/tcl ) guile? ( dev-scheme/guile ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) firmware? ( sys-apps/fxload ) virtual/pkgconfig 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) virtual/pkgconfig
+DEPEND=tcl? ( dev-lang/tcl ) guile? ( dev-scheme/guile ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) firmware? ( sys-apps/fxload ) virtual/pkgconfig 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) virtual/pkgconfig
 DESCRIPTION=Kernel module and driver library for GPIB (IEEE 488.2) hardware
 EAPI=4
 HOMEPAGE=http://linux-gpib.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=tcl? ( dev-lang/tcl ) guile? ( dev-scheme/guile ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) firmware? ( sys-apps/fxload ) kernel_linux? ( virtual/modutils ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2a6efd67c3c2b98c7d389017c9555df9
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-3.2.17 b/metadata/md5-cache/sci-libs/linux-gpib-3.2.17
index e742a331ace3..2251a148285d 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-3.2.17
+++ b/metadata/md5-cache/sci-libs/linux-gpib-3.2.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=tcl? ( dev-lang/tcl ) guile? ( dev-scheme/guile ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) firmware? ( sys-apps/fxload ) virtual/pkgconfig 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) virtual/pkgconfig
+DEPEND=tcl? ( dev-lang/tcl ) guile? ( dev-scheme/guile ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) firmware? ( sys-apps/fxload ) virtual/pkgconfig 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) virtual/pkgconfig
 DESCRIPTION=Kernel module and driver library for GPIB (IEEE 488.2) hardware
 EAPI=4
 HOMEPAGE=http://linux-gpib.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=tcl? ( dev-lang/tcl ) guile? ( dev-scheme/guile ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) firmware? ( sys-apps/fxload ) kernel_linux? ( virtual/modutils ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-3.2.17.tar.gz firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4c93c697b2bcf95344762856b984cae3
diff --git a/metadata/md5-cache/sci-libs/lis-1.3.32 b/metadata/md5-cache/sci-libs/lis-1.3.32
index 84a2a7a180f0..0fbd6a63d195 100644
--- a/metadata/md5-cache/sci-libs/lis-1.3.32
+++ b/metadata/md5-cache/sci-libs/lis-1.3.32
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Library of Iterative Solvers for Linear Systems
 EAPI=5
 HOMEPAGE=http://www.ssisc.org/lis/index.en.html
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=mpi? ( virtual/mpi ) virtual/fortran
 SLOT=0
 SRC_URI=http://www.ssisc.org/lis/dl/lis-1.3.32.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=63af4ed56dccf4f25d14d0763d169bac
diff --git a/metadata/md5-cache/sci-libs/mathgl-1.11.2 b/metadata/md5-cache/sci-libs/mathgl-1.11.2
index 3e0492addf44..a0269e17e795 100644
--- a/metadata/md5-cache/sci-libs/mathgl-1.11.2
+++ b/metadata/md5-cache/sci-libs/mathgl-1.11.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare prerm setup test unpack
-DEPEND=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? ( dev-qt/qtgui: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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=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? ( dev-qt/qtgui: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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Math Graphics Library
 EAPI=4
 HOMEPAGE=http://mathgl.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libpng sys-libs/zlib virtual/opengl fltk? ( x11-libs/fltk:1 )
 REQUIRED_USE=mpi? ( hdf5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mathgl/mathgl-1.11.2.tar.gz mirror://sourceforge/mathgl/STIX_font.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=ac3ad3532253790a79df10bb0ecd8767
diff --git a/metadata/md5-cache/sci-libs/matio-1.5.0 b/metadata/md5-cache/sci-libs/matio-1.5.0
index 0f98bae6d520..0589e7dd1527 100644
--- a/metadata/md5-cache/sci-libs/matio-1.5.0
+++ b/metadata/md5-cache/sci-libs/matio-1.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib hdf5? ( sci-libs/hdf5 ) doc? ( virtual/latex-base ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib hdf5? ( sci-libs/hdf5 ) doc? ( virtual/latex-base ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for reading and writing matlab files
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/matio/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/zlib hdf5? ( sci-libs/hdf5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/matio/matio-1.5.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed019ee433b5d83ab5e0d0ca6dea7267
diff --git a/metadata/md5-cache/sci-libs/matio-1.5.1 b/metadata/md5-cache/sci-libs/matio-1.5.1
index 190c1e89ea79..e2215e89be9b 100644
--- a/metadata/md5-cache/sci-libs/matio-1.5.1
+++ b/metadata/md5-cache/sci-libs/matio-1.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib hdf5? ( sci-libs/hdf5 ) doc? ( virtual/latex-base ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib hdf5? ( sci-libs/hdf5 ) doc? ( virtual/latex-base ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for reading and writing matlab files
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/matio/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/zlib hdf5? ( sci-libs/hdf5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/matio/matio-1.5.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=21ffeab09bf23859f0d76b1d4cb23dc3
diff --git a/metadata/md5-cache/sci-libs/mc-1.5 b/metadata/md5-cache/sci-libs/mc-1.5
index 5a38b2dba4f2..9d0e3715977b 100644
--- a/metadata/md5-cache/sci-libs/mc-1.5
+++ b/metadata/md5-cache/sci-libs/mc-1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=2D/3D AFEM code for nonlinear geometric PDE
 EAPI=4
 HOMEPAGE=http://fetk.org/codes/mc/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 virtual/fortran
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/mc-1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=250ef030abd085dc2424422e5f14235a
diff --git a/metadata/md5-cache/sci-libs/metis-4.0.1-r1 b/metadata/md5-cache/sci-libs/metis-4.0.1-r1
index e357584bbd81..b69c985b06ab 100644
--- a/metadata/md5-cache/sci-libs/metis-4.0.1-r1
+++ b/metadata/md5-cache/sci-libs/metis-4.0.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install setup unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=A package for unstructured serial graph partitioning
 HOMEPAGE=http://www-users.cs.umn.edu/~karypis/metis/metis/index.html
 IUSE=doc static-libs
@@ -8,5 +8,5 @@ LICENSE=free-noncomm
 RDEPEND=!sci-libs/parmetis virtual/fortran
 SLOT=0
 SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD/metis-4.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cdca0fba641af4b645ac9827645b2d35
diff --git a/metadata/md5-cache/sci-libs/metis-4.0.3 b/metadata/md5-cache/sci-libs/metis-4.0.3
index 1fb71d549143..e9ef17591273 100644
--- a/metadata/md5-cache/sci-libs/metis-4.0.3
+++ b/metadata/md5-cache/sci-libs/metis-4.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=A package for unstructured serial graph partitioning
 EAPI=4
 HOMEPAGE=http://www-users.cs.umn.edu/~karypis/metis/metis/
@@ -9,5 +9,5 @@ LICENSE=free-noncomm
 RDEPEND=!sci-libs/parmetis virtual/fortran
 SLOT=0
 SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD/metis-4.0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ebcffe8e9c6f18f01c3faebc57212345
diff --git a/metadata/md5-cache/sci-libs/minuit-5.28.00 b/metadata/md5-cache/sci-libs/minuit-5.28.00
index 6394d2201d77..b1f6fbc97a6f 100644
--- a/metadata/md5-cache/sci-libs/minuit-5.28.00
+++ b/metadata/md5-cache/sci-libs/minuit-5.28.00
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A C++ physics analysis tool for function minimization
 EAPI=4
 HOMEPAGE=http://seal.web.cern.ch/seal/MathLibs/Minuit2/html/index.html
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=59c65bf858edb96f7cdb1b7aa7499eea
diff --git a/metadata/md5-cache/sci-libs/mmdb-1.24 b/metadata/md5-cache/sci-libs/mmdb-1.24
index fce3afe29f65..290fa0af7de0 100644
--- a/metadata/md5-cache/sci-libs/mmdb-1.24
+++ b/metadata/md5-cache/sci-libs/mmdb-1.24
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-2 LGPL-3
 SLOT=0
 SRC_URI=http://www.ysbl.york.ac.uk/~emsley/software/mmdb-1.24.tar.gz http://launchpad.net/mmdb/1.23/1.24/+download/mmdb-1.24.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=30ead70dacc79e818705b10092df51f6
diff --git a/metadata/md5-cache/sci-libs/mpfi-1.5 b/metadata/md5-cache/sci-libs/mpfi-1.5
index 56a9ecd569d1..e8703d89251a 100644
--- a/metadata/md5-cache/sci-libs/mpfi-1.5
+++ b/metadata/md5-cache/sci-libs/mpfi-1.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/gmp-4.1.2 >=dev-libs/mpfr-2.4
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/27346/mpfi-1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7751a99afe6a9de4aae25f356ec0d23c
diff --git a/metadata/md5-cache/sci-libs/mpfi-1.5.1 b/metadata/md5-cache/sci-libs/mpfi-1.5.1
index 09fe6d925996..4ca8fd5aacb9 100644
--- a/metadata/md5-cache/sci-libs/mpfi-1.5.1
+++ b/metadata/md5-cache/sci-libs/mpfi-1.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/gmp-4.1.2 >=dev-libs/mpfr-2.4
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/30129/mpfi-1.5.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=123656d20a8885e3cb45057115c0bf54
diff --git a/metadata/md5-cache/sci-libs/mpir-2.2.1 b/metadata/md5-cache/sci-libs/mpir-2.2.1
index a21a226d4487..f6f08de7a67a 100644
--- a/metadata/md5-cache/sci-libs/mpir-2.2.1
+++ b/metadata/md5-cache/sci-libs/mpir-2.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=x86? ( dev-lang/yasm ) amd64? ( dev-lang/yasm ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x86? ( dev-lang/yasm ) amd64? ( dev-lang/yasm ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for arbitrary precision integer arithmetic derived from version 4.2.1 of gmp
 EAPI=3
 HOMEPAGE=http://www.mpir.org/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=http://www.mpir.org/mpir-2.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a424985b6ec05be015b9fa8a4933022c
diff --git a/metadata/md5-cache/sci-libs/mpir-2.5.1 b/metadata/md5-cache/sci-libs/mpir-2.5.1
index 91408e4948aa..ea148a19b6a2 100644
--- a/metadata/md5-cache/sci-libs/mpir-2.5.1
+++ b/metadata/md5-cache/sci-libs/mpir-2.5.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=http://www.mpir.org/mpir-2.5.1.tar.lzma
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b6450c3bf801055be1c741af90a91c95
diff --git a/metadata/md5-cache/sci-libs/mpir-2.6.0 b/metadata/md5-cache/sci-libs/mpir-2.6.0
index 84e81f734edc..67b0748d8747 100644
--- a/metadata/md5-cache/sci-libs/mpir-2.6.0
+++ b/metadata/md5-cache/sci-libs/mpir-2.6.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=http://www.mpir.org/mpir-2.6.0.tar.lzma
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cd88a908574b400486c21316132f61ea
diff --git a/metadata/md5-cache/sci-libs/mpir-2.6.0-r1 b/metadata/md5-cache/sci-libs/mpir-2.6.0-r1
index 5370628c0571..349b5b3a91e0 100644
--- a/metadata/md5-cache/sci-libs/mpir-2.6.0-r1
+++ b/metadata/md5-cache/sci-libs/mpir-2.6.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=http://www.mpir.org/mpir-2.6.0.tar.lzma
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6d818722338f744adb3645e0d2c3c251
diff --git a/metadata/md5-cache/sci-libs/netcdf-4.1.1-r4 b/metadata/md5-cache/sci-libs/netcdf-4.1.1-r4
index 541296ab868d..087b5888ab29 100644
--- a/metadata/md5-cache/sci-libs/netcdf-4.1.1-r4
+++ b/metadata/md5-cache/sci-libs/netcdf-4.1.1-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool fortran? ( virtual/fortran )
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool fortran? ( virtual/fortran )
 DESCRIPTION=Scientific library and interface for array oriented data access
 EAPI=3
 HOMEPAGE=http://www.unidata.ucar.edu/software/netcdf/
@@ -9,5 +9,5 @@ LICENSE=UCAR-Unidata
 RDEPEND=dap? ( net-misc/curl ) hdf5? ( >=sci-libs/hdf5-1.8[zlib,szip?,fortran?] ) fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e4e6a300905f39f6fa92e564f550d8bf
diff --git a/metadata/md5-cache/sci-libs/netcdf-4.1.3 b/metadata/md5-cache/sci-libs/netcdf-4.1.3
index 1bf9502f0f3b..6c768d90430e 100644
--- a/metadata/md5-cache/sci-libs/netcdf-4.1.3
+++ b/metadata/md5-cache/sci-libs/netcdf-4.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dap? ( net-misc/curl ) hdf5? ( >=sci-libs/hdf5-1.8.6[zlib,szip,fortran?] ) >=sys-devel/libtool-2.4 doc? ( virtual/latex-base ) fortran? ( dev-lang/cfortran ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool fortran? ( virtual/fortran )
+DEPEND=dap? ( net-misc/curl ) hdf5? ( >=sci-libs/hdf5-1.8.6[zlib,szip,fortran?] ) >=sys-devel/libtool-2.4 doc? ( virtual/latex-base ) fortran? ( dev-lang/cfortran ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool fortran? ( virtual/fortran )
 DESCRIPTION=Scientific library and interface for array oriented data access
 EAPI=4
 HOMEPAGE=http://www.unidata.ucar.edu/software/netcdf/
@@ -9,5 +9,5 @@ LICENSE=UCAR-Unidata
 RDEPEND=dap? ( net-misc/curl ) hdf5? ( >=sci-libs/hdf5-1.8.6[zlib,szip,fortran?] ) fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=684c9d519a24366844c834f4d3903aab
diff --git a/metadata/md5-cache/sci-libs/netcdf-4.2 b/metadata/md5-cache/sci-libs/netcdf-4.2
index 4c70dd9b696a..b7af1aa6faef 100644
--- a/metadata/md5-cache/sci-libs/netcdf-4.2
+++ b/metadata/md5-cache/sci-libs/netcdf-4.2
@@ -9,5 +9,5 @@ LICENSE=UCAR-Unidata
 RDEPEND=dap? ( net-misc/curl ) hdf? ( sci-libs/hdf >=sci-libs/hdf5-1.8.8 ) hdf5? ( >=sci-libs/hdf5-1.8.8[mpi=,szip=,zlib] )
 SLOT=0
 SRC_URI=ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1a691aaf1c1260ba212722a2b9a78063
diff --git a/metadata/md5-cache/sci-libs/netcdf-4.2.1 b/metadata/md5-cache/sci-libs/netcdf-4.2.1
index 2d71e441d707..4cc9fd75f052 100644
--- a/metadata/md5-cache/sci-libs/netcdf-4.2.1
+++ b/metadata/md5-cache/sci-libs/netcdf-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=dap? ( net-misc/curl ) hdf? ( sci-libs/hdf >=sci-libs/hdf5-1.8.8 ) hdf5?
 REQUIRED_USE=test? ( tools )
 SLOT=0
 SRC_URI=ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=311ffe7b8a3e4133101538ba925c8be6
diff --git a/metadata/md5-cache/sci-libs/netcdf-4.2.1.1 b/metadata/md5-cache/sci-libs/netcdf-4.2.1.1
index 7c6a598e95f5..6b0cd320da11 100644
--- a/metadata/md5-cache/sci-libs/netcdf-4.2.1.1
+++ b/metadata/md5-cache/sci-libs/netcdf-4.2.1.1
@@ -10,5 +10,5 @@ RDEPEND=dap? ( net-misc/curl ) hdf? ( sci-libs/hdf >=sci-libs/hdf5-1.8.8 ) hdf5?
 REQUIRED_USE=test? ( tools )
 SLOT=0
 SRC_URI=ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.2.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a362b007798a78cc80196157c8ec54a5
diff --git a/metadata/md5-cache/sci-libs/netcdf-cxx-4.2-r1 b/metadata/md5-cache/sci-libs/netcdf-cxx-4.2-r1
index 0393faa2f403..f9f61905ccdf 100644
--- a/metadata/md5-cache/sci-libs/netcdf-cxx-4.2-r1
+++ b/metadata/md5-cache/sci-libs/netcdf-cxx-4.2-r1
@@ -9,5 +9,5 @@ LICENSE=UCAR-Unidata
 RDEPEND=>=sci-libs/netcdf-4.2
 SLOT=0
 SRC_URI=https://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-cxx4-4.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bb0ea32d4f10321213327b7557e781e5
diff --git a/metadata/md5-cache/sci-libs/netcdf-fortran-4.2 b/metadata/md5-cache/sci-libs/netcdf-fortran-4.2
index c8591dbba0f3..863a0175137f 100644
--- a/metadata/md5-cache/sci-libs/netcdf-fortran-4.2
+++ b/metadata/md5-cache/sci-libs/netcdf-fortran-4.2
@@ -9,5 +9,5 @@ LICENSE=UCAR-Unidata
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-fortran-4.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db95fd88bd60fb5758e558f361c75d9f
diff --git a/metadata/md5-cache/sci-libs/nlopt-2.2.4 b/metadata/md5-cache/sci-libs/nlopt-2.2.4
index 608974b61e3e..8ceec2655c69 100644
--- a/metadata/md5-cache/sci-libs/nlopt-2.2.4
+++ b/metadata/md5-cache/sci-libs/nlopt-2.2.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=guile? ( dev-scheme/guile ) octave? ( sci-mathematics/octave ) python? ( dev-python/numpy ) python? ( dev-lang/python )
 SLOT=0
 SRC_URI=http://ab-initio.mit.edu/nlopt//nlopt-2.2.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6845aa3fd5fd5beb065b04dd037df66e
diff --git a/metadata/md5-cache/sci-libs/nlopt-2.3-r1 b/metadata/md5-cache/sci-libs/nlopt-2.3-r1
index c2cd454ce257..b96b57152115 100644
--- a/metadata/md5-cache/sci-libs/nlopt-2.3-r1
+++ b/metadata/md5-cache/sci-libs/nlopt-2.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=guile? ( dev-scheme/guile ) octave? ( sci-mathematics/octave ) python? ( dev-python/numpy ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( dev-lang/python )
+DEPEND=guile? ( dev-scheme/guile ) octave? ( sci-mathematics/octave ) python? ( dev-python/numpy ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( dev-lang/python )
 DESCRIPTION=Non-linear optimization library
 EAPI=4
 HOMEPAGE=http://ab-initio.mit.edu/nlopt/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=guile? ( dev-scheme/guile ) octave? ( sci-mathematics/octave ) python? ( dev-python/numpy ) python? ( dev-lang/python )
 SLOT=0
 SRC_URI=http://ab-initio.mit.edu/nlopt//nlopt-2.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cf222d440a4160a7bb57e723c2f89755
diff --git a/metadata/md5-cache/sci-libs/nlopt-2.3-r2 b/metadata/md5-cache/sci-libs/nlopt-2.3-r2
index 097054769c3e..15a3bf8d3be6 100644
--- a/metadata/md5-cache/sci-libs/nlopt-2.3-r2
+++ b/metadata/md5-cache/sci-libs/nlopt-2.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=guile? ( dev-scheme/guile ) octave? ( sci-mathematics/octave ) python? ( dev-python/numpy ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( dev-lang/python )
+DEPEND=guile? ( dev-scheme/guile ) octave? ( sci-mathematics/octave ) python? ( dev-python/numpy ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( dev-lang/python )
 DESCRIPTION=Non-linear optimization library
 EAPI=5
 HOMEPAGE=http://ab-initio.mit.edu/nlopt/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=guile? ( dev-scheme/guile ) octave? ( sci-mathematics/octave ) python? ( dev-python/numpy ) python? ( dev-lang/python )
 SLOT=0
 SRC_URI=http://ab-initio.mit.edu/nlopt//nlopt-2.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ad7f7451fdf21feff2f8ff4d6e345a9a
diff --git a/metadata/md5-cache/sci-libs/oc-2.0 b/metadata/md5-cache/sci-libs/oc-2.0
index f98c37eff3f7..2b6911cdec9b 100644
--- a/metadata/md5-cache/sci-libs/oc-2.0
+++ b/metadata/md5-cache/sci-libs/oc-2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=net-misc/curl
 SLOT=0
 SRC_URI=http://opendap.org/pub/OC/source/oc-2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6eb5a2a57dc2b75fbdf73e75ece12fc5
diff --git a/metadata/md5-cache/sci-libs/opencascade-6.5 b/metadata/md5-cache/sci-libs/opencascade-6.5
index 2455951f3106..375bf6181656 100644
--- a/metadata/md5-cache/sci-libs/opencascade-6.5
+++ b/metadata/md5-cache/sci-libs/opencascade-6.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare pretend setup
-DEPEND=media-libs/ftgl virtual/glu 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=media-libs/ftgl virtual/glu 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=Software development platform for CAD/CAE, 3D surface/solid modeling and data exchange
 EAPI=4
 HOMEPAGE=http://www.opencascade.org/
@@ -10,5 +10,5 @@ RDEPEND=media-libs/ftgl virtual/glu virtual/opengl x11-libs/libXmu >=dev-lang/tc
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://files.opencascade.com/OCCT/OCC_6.5_release/OpenCASCADE650.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e4d5e06d6589332bce7fd59c662ebab4
diff --git a/metadata/md5-cache/sci-libs/parmetis-3.1.1 b/metadata/md5-cache/sci-libs/parmetis-3.1.1
index 9354d0f399c5..df5cbe11efdc 100644
--- a/metadata/md5-cache/sci-libs/parmetis-3.1.1
+++ b/metadata/md5-cache/sci-libs/parmetis-3.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=virtual/mpi || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/mpi || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Parallel graph partitioner
 EAPI=2
 HOMEPAGE=http://www-users.cs.umn.edu/~karypis/metis/parmetis/
@@ -9,5 +9,5 @@ LICENSE=free-noncomm
 RDEPEND=virtual/mpi !sci-libs/metis
 SLOT=0
 SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD/ParMetis-3.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=da35842126c528a0e18bbf7044b7802d
diff --git a/metadata/md5-cache/sci-libs/parmetis-3.2.0 b/metadata/md5-cache/sci-libs/parmetis-3.2.0
index 06a1c29a9c9b..bc04fa3a8af1 100644
--- a/metadata/md5-cache/sci-libs/parmetis-3.2.0
+++ b/metadata/md5-cache/sci-libs/parmetis-3.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=virtual/mpi || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/mpi || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Parallel graph partitioner
 EAPI=4
 HOMEPAGE=http://www-users.cs.umn.edu/~karypis/metis/parmetis/
@@ -9,5 +9,5 @@ LICENSE=free-noncomm
 RDEPEND=virtual/mpi !sci-libs/metis
 SLOT=0
 SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD/ParMetis-3.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a13edd7c302715f0f4ae4bf869fbbafb
diff --git a/metadata/md5-cache/sci-libs/parmgridgen-1.0 b/metadata/md5-cache/sci-libs/parmgridgen-1.0
index 43e34102246c..c1914ab2fbe3 100644
--- a/metadata/md5-cache/sci-libs/parmgridgen-1.0
+++ b/metadata/md5-cache/sci-libs/parmgridgen-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare setup
-DEPEND=virtual/mpi || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/mpi || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Software for parallel (mpi) generating coarse grids
 EAPI=2
 HOMEPAGE=http://www-users.cs.umn.edu/~moulitsa/software.html
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=virtual/mpi
 SLOT=0
 SRC_URI=http://www-users.cs.umn.edu/~moulitsa/download/ParMGridGen-1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ddfdd212e645c5caac7af712823411b5
diff --git a/metadata/md5-cache/sci-libs/punc-1.5 b/metadata/md5-cache/sci-libs/punc-1.5
index 27a98b9fb77f..5a4a367a983a 100644
--- a/metadata/md5-cache/sci-libs/punc-1.5
+++ b/metadata/md5-cache/sci-libs/punc-1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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 ) virtual/pkgconfig doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=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 ) virtual/pkgconfig doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Portable Understructure for Numerical Computing
 EAPI=4
 HOMEPAGE=http://fetk.org/codes/punc/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 ) virtual/fortran
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/punc-1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=441635a41762af03a69012a541674e50
diff --git a/metadata/md5-cache/sci-libs/qd-2.3.13 b/metadata/md5-cache/sci-libs/qd-2.3.13
index e56e5132bd05..ace1f2b3e0b8 100644
--- a/metadata/md5-cache/sci-libs/qd-2.3.13
+++ b/metadata/md5-cache/sci-libs/qd-2.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool fortran? ( virtual/fortran )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool fortran? ( virtual/fortran )
 DESCRIPTION=Quad-double and double-double float arithmetics
 EAPI=4
 HOMEPAGE=http://crd.lbl.gov/~dhbailey/mpdist/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=http://crd.lbl.gov/~dhbailey/mpdist/qd-2.3.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5089500d05a10eefc8efe7e55854e77a
diff --git a/metadata/md5-cache/sci-libs/qfits-6.2.0 b/metadata/md5-cache/sci-libs/qfits-6.2.0
index e847bae85006..b90785d0f7cd 100644
--- a/metadata/md5-cache/sci-libs/qfits-6.2.0
+++ b/metadata/md5-cache/sci-libs/qfits-6.2.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.hq.eso.org/pub/qfits/qfits-6.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5db69f2d86784d4f562a9085e17ec164
diff --git a/metadata/md5-cache/sci-libs/spqr-1.2.3 b/metadata/md5-cache/sci-libs/spqr-1.2.3
index 82af080d4904..91f1afe656f4 100644
--- a/metadata/md5-cache/sci-libs/spqr-1.2.3
+++ b/metadata/md5-cache/sci-libs/spqr-1.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/cholmod[supernodal] tbb? ( dev-cpp/tbb ) metis? ( >=sci-libs/cholmod-1.7.0-r1[metis] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/cholmod[supernodal] tbb? ( dev-cpp/tbb ) metis? ( >=sci-libs/cholmod-1.7.0-r1[metis] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Multithreaded multifrontal sparse QR factorization library
 EAPI=4
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/SPQR
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-libs/cholmod[supernodal] tbb? ( dev-cpp/tbb ) metis? ( >=sci-libs/cholmod-1.7.0-r1[metis] )
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/SPQR/SPQR-1.2.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c890b5142499492b5d5dce3935c35f01
diff --git a/metadata/md5-cache/sci-libs/spqr-1.3.1 b/metadata/md5-cache/sci-libs/spqr-1.3.1
index 9777b19820a7..21c667fb3a4b 100644
--- a/metadata/md5-cache/sci-libs/spqr-1.3.1
+++ b/metadata/md5-cache/sci-libs/spqr-1.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sci-libs/cholmod-2[metis?] tbb? ( dev-cpp/tbb )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/spqr-1.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2ac0504833b11c8dd23bdbf69a58ac86
diff --git a/metadata/md5-cache/sci-libs/spr-3.3.2 b/metadata/md5-cache/sci-libs/spr-3.3.2
index a71060359f25..419ea5e076c8 100644
--- a/metadata/md5-cache/sci-libs/spr-3.3.2
+++ b/metadata/md5-cache/sci-libs/spr-3.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=root? ( sci-physics/root ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=root? ( sci-physics/root ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Statistical analysis and machine learning library
 EAPI=4
 HOMEPAGE=http://statpatrec.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=root? ( sci-physics/root )
 SLOT=0
 SRC_URI=mirror://sourceforge/statpatrec/SPR-3.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ac80aa7bbeb6332e649e8820102b4f8c
diff --git a/metadata/md5-cache/sci-libs/ssm-1.1 b/metadata/md5-cache/sci-libs/ssm-1.1
index 5d49b18d8515..5d4efab2b52d 100644
--- a/metadata/md5-cache/sci-libs/ssm-1.1
+++ b/metadata/md5-cache/sci-libs/ssm-1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=sci-libs/mmdb-1.23 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sci-libs/mmdb-1.23 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A macromolecular coordinate superposition library
 EAPI=4
 HOMEPAGE=https://launchpad.net/ssm
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sci-libs/mmdb-1.23 !<sci-libs/ccp4-libs-6.1.3-r10
 SLOT=0
 SRC_URI=http://launchpad.net/ssm/trunk/1.1/+download/ssm-1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e99d315a6f63e13e2ae9964ea0cc55cb
diff --git a/metadata/md5-cache/sci-libs/starparse-1.0-r1 b/metadata/md5-cache/sci-libs/starparse-1.0-r1
index 7086a68e831c..a5a5dd724e94 100644
--- a/metadata/md5-cache/sci-libs/starparse-1.0-r1
+++ b/metadata/md5-cache/sci-libs/starparse-1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=guile? ( dev-scheme/guile ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=guile? ( dev-scheme/guile ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for parsing NMR star files (peak-list format) and CIF files
 EAPI=4
 HOMEPAGE=http://burrow-owl.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=guile? ( dev-scheme/guile )
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~jlec/distfiles/starparse-1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a00b4e6401776a9644a3863d430be8da
diff --git a/metadata/md5-cache/sci-libs/suitesparseconfig-4.0.2 b/metadata/md5-cache/sci-libs/suitesparseconfig-4.0.2
index 88381da4c041..08105e71df3a 100644
--- a/metadata/md5-cache/sci-libs/suitesparseconfig-4.0.2
+++ b/metadata/md5-cache/sci-libs/suitesparseconfig-4.0.2
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-lin
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/suitesparseconfig-4.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=19c539408a07d8ff37180154a17c4b42
diff --git a/metadata/md5-cache/sci-libs/superlu-4.1-r1 b/metadata/md5-cache/sci-libs/superlu-4.1-r1
index 1bcf2e9d7356..5d0f065eebe3 100644
--- a/metadata/md5-cache/sci-libs/superlu-4.1-r1
+++ b/metadata/md5-cache/sci-libs/superlu-4.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=virtual/blas virtual/pkgconfig test? ( app-shells/tcsh ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=virtual/blas virtual/pkgconfig test? ( app-shells/tcsh ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Sparse LU factorization library
 EAPI=2
 HOMEPAGE=http://crd.lbl.gov/~xiaoye/SuperLU/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/blas virtual/fortran
 SLOT=0
 SRC_URI=http://crd.lbl.gov/~xiaoye/SuperLU//superlu_4.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f3d97c9df9e9b4c21c741250774a4cef
diff --git a/metadata/md5-cache/sci-libs/superlu-4.3 b/metadata/md5-cache/sci-libs/superlu-4.3
index 817a2a2661f5..06cd342b2b3b 100644
--- a/metadata/md5-cache/sci-libs/superlu-4.3
+++ b/metadata/md5-cache/sci-libs/superlu-4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/blas virtual/pkgconfig test? ( app-shells/tcsh ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=virtual/blas virtual/pkgconfig test? ( app-shells/tcsh ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Sparse LU factorization library
 EAPI=4
 HOMEPAGE=http://crd.lbl.gov/~xiaoye/SuperLU/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/blas virtual/fortran
 SLOT=0
 SRC_URI=http://crd.lbl.gov/~xiaoye/SuperLU//superlu_4.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3f4aa3dc4a72421e59558b8cbeb1a277
diff --git a/metadata/md5-cache/sci-libs/szip-2.1-r1 b/metadata/md5-cache/sci-libs/szip-2.1-r1
index 7deceaa18a18..b30d5d010e1a 100644
--- a/metadata/md5-cache/sci-libs/szip-2.1-r1
+++ b/metadata/md5-cache/sci-libs/szip-2.1-r1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linu
 LICENSE=szip
 SLOT=0
 SRC_URI=ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=882a920423769697da04ff106257dc67
diff --git a/metadata/md5-cache/sci-libs/ta-lib-0.4.0 b/metadata/md5-cache/sci-libs/ta-lib-0.4.0
index 11689b44b79d..1909e4dbae36 100644
--- a/metadata/md5-cache/sci-libs/ta-lib-0.4.0
+++ b/metadata/md5-cache/sci-libs/ta-lib-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Technical Analysis Library for analyzing financial markets trends
 EAPI=4
 HOMEPAGE=http://www.ta-lib.org/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/ta-lib/ta-lib-0.4.0-src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9d9909ca30cca69fc93c3949275380dd
diff --git a/metadata/md5-cache/sci-libs/tamu_anova-0.2.1 b/metadata/md5-cache/sci-libs/tamu_anova-0.2.1
index af5d53ea5e93..b7a10a14467a 100644
--- a/metadata/md5-cache/sci-libs/tamu_anova-0.2.1
+++ b/metadata/md5-cache/sci-libs/tamu_anova-0.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/gsl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/gsl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ANOVA Extensions to the GNU Scientific Library
 EAPI=4
 HOMEPAGE=http://www.stat.tamu.edu/~aredd/tamuanova/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-libs/gsl
 SLOT=0
 SRC_URI=http://www.stat.tamu.edu/~aredd/tamuanova/tamu_anova-0.2.tar.gz -> tamu_anova-0.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=75066d8cc099bf24bd088ac913ea2eed
diff --git a/metadata/md5-cache/sci-libs/udunits-2.1.15 b/metadata/md5-cache/sci-libs/udunits-2.1.15
index f67846a94ba6..bbfab8234111 100644
--- a/metadata/md5-cache/sci-libs/udunits-2.1.15
+++ b/metadata/md5-cache/sci-libs/udunits-2.1.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare setup
-DEPEND=dev-libs/expat virtual/fortran || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/expat virtual/fortran || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for manipulating units of physical quantities
 EAPI=2
 HOMEPAGE=http://www.unidata.ucar.edu/packages/udunits/
@@ -9,5 +9,5 @@ LICENSE=UCAR-Unidata
 RDEPEND=dev-libs/expat virtual/fortran
 SLOT=0
 SRC_URI=ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-2.1.15.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e4abbaf9443adaa874a342de14ebdd6a
diff --git a/metadata/md5-cache/sci-libs/udunits-2.1.24 b/metadata/md5-cache/sci-libs/udunits-2.1.24
index 9152c701b92b..b959968bf24e 100644
--- a/metadata/md5-cache/sci-libs/udunits-2.1.24
+++ b/metadata/md5-cache/sci-libs/udunits-2.1.24
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/expat virtual/fortran || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/expat virtual/fortran || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for manipulating units of physical quantities
 EAPI=4
 HOMEPAGE=http://www.unidata.ucar.edu/packages/udunits/
@@ -9,5 +9,5 @@ LICENSE=UCAR-Unidata
 RDEPEND=dev-libs/expat virtual/fortran
 SLOT=0
 SRC_URI=ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-2.1.24.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a97cac1ad32fb120fce1df6909ace3b2
diff --git a/metadata/md5-cache/sci-libs/umfpack-5.2.0 b/metadata/md5-cache/sci-libs/umfpack-5.2.0
index a3781aa27a88..cc8fc7a27dcd 100644
--- a/metadata/md5-cache/sci-libs/umfpack-5.2.0
+++ b/metadata/md5-cache/sci-libs/umfpack-5.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup unpack
-DEPEND=virtual/blas sci-libs/amd virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=virtual/blas sci-libs/amd virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Unsymmetric multifrontal sparse LU factorization library
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/umfpack
 IUSE=doc
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/blas sci-libs/amd virtual/fortran
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/umfpack/UMFPACK-5.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=92d51dc887e838539bd5ae5ced9cc4ce
diff --git a/metadata/md5-cache/sci-libs/umfpack-5.5.2 b/metadata/md5-cache/sci-libs/umfpack-5.5.2
index e6e658483e21..4093b3dffee2 100644
--- a/metadata/md5-cache/sci-libs/umfpack-5.5.2
+++ b/metadata/md5-cache/sci-libs/umfpack-5.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/blas sci-libs/amd metis? ( sci-libs/cholmod[metis] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=virtual/blas sci-libs/amd metis? ( sci-libs/cholmod[metis] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Unsymmetric multifrontal sparse LU factorization library
 EAPI=4
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/umfpack
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/blas sci-libs/amd metis? ( sci-libs/cholmod[metis] ) virtual/fortran
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/umfpack/UMFPACK-5.5.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3af3cb94c18039cf0eacf13fe9546a28
diff --git a/metadata/md5-cache/sci-libs/umfpack-5.6.1-r1 b/metadata/md5-cache/sci-libs/umfpack-5.6.1-r1
index 79f2c203b685..352fedc335e1 100644
--- a/metadata/md5-cache/sci-libs/umfpack-5.6.1-r1
+++ b/metadata/md5-cache/sci-libs/umfpack-5.6.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sci-libs/amd-1.3 sci-libs/suitesparseconfig virtual/blas cholmod? ( >=sci-libs/cholmod-2 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/umfpack-5.6.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c4a3e68a945c362acb96274bc54556fd
diff --git a/metadata/md5-cache/sci-mathematics/4ti2-1.3.2 b/metadata/md5-cache/sci-mathematics/4ti2-1.3.2
index d21c1cfb8099..60d087333192 100644
--- a/metadata/md5-cache/sci-mathematics/4ti2-1.3.2
+++ b/metadata/md5-cache/sci-mathematics/4ti2-1.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-mathematics/glpk[gmp] dev-libs/gmp[cxx]
 SLOT=0
 SRC_URI=http://4ti2.de/version_1.3.2/4ti2-1.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ee1d55d25aa4d935aff8501f61bc55a3
diff --git a/metadata/md5-cache/sci-mathematics/4ti2-1.3.2-r1 b/metadata/md5-cache/sci-mathematics/4ti2-1.3.2-r1
index bbece849b97a..496ab966e078 100644
--- a/metadata/md5-cache/sci-mathematics/4ti2-1.3.2-r1
+++ b/metadata/md5-cache/sci-mathematics/4ti2-1.3.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-mathematics/glpk[gmp] dev-libs/gmp[cxx] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-mathematics/glpk[gmp] dev-libs/gmp[cxx] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Software package for algebraic, geometric and combinatorial problems
 EAPI=4
 HOMEPAGE=http://www.4ti2.de/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-mathematics/glpk[gmp] dev-libs/gmp[cxx]
 SLOT=0
 SRC_URI=http://4ti2.de/version_1.3.2/4ti2-1.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f0bdf4034a25ec8dc5055a22b257ac5b
diff --git a/metadata/md5-cache/sci-mathematics/Macaulay2-1.4 b/metadata/md5-cache/sci-mathematics/Macaulay2-1.4
index 2653ba120835..685cb1b67fe2 100644
--- a/metadata/md5-cache/sci-mathematics/Macaulay2-1.4
+++ b/metadata/md5-cache/sci-mathematics/Macaulay2-1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=research tool for commutative algebra and algebraic geometry
 EAPI=2
 HOMEPAGE=http://www.math.uiuc.edu/Macaulay2/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=89d4ff9b7cbb096f5eb2c149af5c0336
diff --git a/metadata/md5-cache/sci-mathematics/Macaulay2-1.4-r1 b/metadata/md5-cache/sci-mathematics/Macaulay2-1.4-r1
index 35ec492574e1..3cec1970e048 100644
--- a/metadata/md5-cache/sci-mathematics/Macaulay2-1.4-r1
+++ b/metadata/md5-cache/sci-mathematics/Macaulay2-1.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=research tool for commutative algebra and algebraic geometry
 EAPI=2
 HOMEPAGE=http://www.math.uiuc.edu/Macaulay2/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/gdbm >=dev-libs/ntl-5.5.2 >=sci-mathematics/pari-2.3.4[gmp] >=s
 RESTRICT=test
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=169dbda86bd006edf411f832f263a7b0
diff --git a/metadata/md5-cache/sci-mathematics/dataplot-20090821 b/metadata/md5-cache/sci-mathematics/dataplot-20090821
index 6998019da5c7..2dbdc4fb59e2 100644
--- a/metadata/md5-cache/sci-mathematics/dataplot-20090821
+++ b/metadata/md5-cache/sci-mathematics/dataplot-20090821
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=media-libs/plotutils opengl? ( virtual/opengl ) gd? ( media-libs/gd[png,jpeg] ) virtual/pkgconfig virtual/fortran || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/plotutils opengl? ( virtual/opengl ) gd? ( media-libs/gd[png,jpeg] ) virtual/pkgconfig virtual/fortran || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Program for scientific visualization and statistical analyis
 EAPI=4
 HOMEPAGE=http://www.itl.nist.gov/div898/software/dataplot/
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=media-libs/plotutils opengl? ( virtual/opengl ) gd? ( media-libs/gd[png,jpeg] ) X? ( x11-misc/xdg-utils ) virtual/fortran
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=de1d3ddf200062e096b4b7bdee76b91c
diff --git a/metadata/md5-cache/sci-mathematics/euler-1.61.0 b/metadata/md5-cache/sci-mathematics/euler-1.61.0
index ea44186def67..cebaceb3d89a 100644
--- a/metadata/md5-cache/sci-mathematics/euler-1.61.0
+++ b/metadata/md5-cache/sci-mathematics/euler-1.61.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Mathematical programming environment
 EAPI=1
 HOMEPAGE=http://euler.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://sourceforge/euler/euler-1.61.0.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3527e7798027f1acf9687d3b55317268
diff --git a/metadata/md5-cache/sci-mathematics/fann-2.1.0_beta-r1 b/metadata/md5-cache/sci-mathematics/fann-2.1.0_beta-r1
index b494cfda3596..77fa9d6939a6 100644
--- a/metadata/md5-cache/sci-mathematics/fann-2.1.0_beta-r1
+++ b/metadata/md5-cache/sci-mathematics/fann-2.1.0_beta-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python? ( dev-lang/swig ) app-arch/unzip python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=python? ( dev-lang/swig ) app-arch/unzip python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Fast Artificial Neural Network Library
 EAPI=2
 HOMEPAGE=http://leenissen.dk/fann/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/fann/fann-2.1.0beta.zip
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=97ae38d4518ee0fcdcea7e5ee4145623
diff --git a/metadata/md5-cache/sci-mathematics/form-4.0_p20120529 b/metadata/md5-cache/sci-mathematics/form-4.0_p20120529
index f5758b93bd92..bda614330302 100644
--- a/metadata/md5-cache/sci-mathematics/form-4.0_p20120529
+++ b/metadata/md5-cache/sci-mathematics/form-4.0_p20120529
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=gmp? ( dev-libs/gmp ) mpi? ( virtual/mpi ) zlib? ( sys-libs/zlib ) devref? ( dev-texlive/texlive-latex ) doc? ( dev-texlive/texlive-latex ) doxygen? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gmp? ( dev-libs/gmp ) mpi? ( virtual/mpi ) zlib? ( sys-libs/zlib ) devref? ( dev-texlive/texlive-latex ) doc? ( dev-texlive/texlive-latex ) doxygen? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Symbolic Manipulation System
 EAPI=4
 HOMEPAGE=http://www.nikhef.nl/~form/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=gmp? ( dev-libs/gmp ) mpi? ( virtual/mpi ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~grozin/form-4.0_p20120529.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=9f7ee9e337e1b9e7d670d78812404f08
diff --git a/metadata/md5-cache/sci-mathematics/fricas-1.1.7-r1 b/metadata/md5-cache/sci-mathematics/fricas-1.1.7-r1
index ba72c7c6f1e2..b05587082266 100644
--- a/metadata/md5-cache/sci-mathematics/fricas-1.1.7-r1
+++ b/metadata/md5-cache/sci-mathematics/fricas-1.1.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( virtual/emacs ) gmp? ( dev-libs/gmp ) clozurecl? ( dev-lisp/clozurecl ) !clozurecl? ( clisp? ( dev-lisp/clisp ) !clisp? ( ecl? ( >=dev-lisp/ecls-9 ) !ecl? ( gcl? ( dev-lisp/gcl ) !gcl? ( cmucl? ( >=dev-lisp/cmucl-20b ) !cmucl? ( dev-lisp/sbcl ) ) ) ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( virtual/emacs ) gmp? ( dev-libs/gmp ) clozurecl? ( dev-lisp/clozurecl ) !clozurecl? ( clisp? ( dev-lisp/clisp ) !clisp? ( ecl? ( >=dev-lisp/ecls-9 ) !ecl? ( gcl? ( dev-lisp/gcl ) !gcl? ( cmucl? ( >=dev-lisp/cmucl-20b ) !cmucl? ( dev-lisp/sbcl ) ) ) ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=FriCAS is a fork of Axiom computer algebra system
 EAPI=4
 HOMEPAGE=http://fricas.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( virtual/emacs ) gmp? ( d
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/fricas/fricas-1.1.7-full.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=66836c3866d4b2b18115aae6567191b6
diff --git a/metadata/md5-cache/sci-mathematics/fricas-1.1.8 b/metadata/md5-cache/sci-mathematics/fricas-1.1.8
index 5cd941f55608..b671caef506a 100644
--- a/metadata/md5-cache/sci-mathematics/fricas-1.1.8
+++ b/metadata/md5-cache/sci-mathematics/fricas-1.1.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( virtual/emacs ) gmp? ( dev-libs/gmp ) clozurecl? ( dev-lisp/clozurecl ) !clozurecl? ( clisp? ( dev-lisp/clisp ) !clisp? ( ecl? ( >=dev-lisp/ecls-9 ) !ecl? ( gcl? ( dev-lisp/gcl ) !gcl? ( cmucl? ( >=dev-lisp/cmucl-20b ) !cmucl? ( dev-lisp/sbcl ) ) ) ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( virtual/emacs ) gmp? ( dev-libs/gmp ) clozurecl? ( dev-lisp/clozurecl ) !clozurecl? ( clisp? ( dev-lisp/clisp ) !clisp? ( ecl? ( >=dev-lisp/ecls-9 ) !ecl? ( gcl? ( dev-lisp/gcl ) !gcl? ( cmucl? ( >=dev-lisp/cmucl-20b ) !cmucl? ( dev-lisp/sbcl ) ) ) ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=FriCAS is a fork of Axiom computer algebra system
 EAPI=4
 HOMEPAGE=http://fricas.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( virtual/emacs ) gmp? ( d
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/fricas/fricas-1.1.8-full.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2cd761547bd6a13483227e1ac568c71e
diff --git a/metadata/md5-cache/sci-mathematics/fricas-1.2.0 b/metadata/md5-cache/sci-mathematics/fricas-1.2.0
index 8e7db44bcbc3..b0b1a8477e75 100644
--- a/metadata/md5-cache/sci-mathematics/fricas-1.2.0
+++ b/metadata/md5-cache/sci-mathematics/fricas-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( virtual/emacs ) gmp? ( dev-libs/gmp ) clozurecl? ( dev-lisp/clozurecl:= ) !clozurecl? ( clisp? ( dev-lisp/clisp:= ) !clisp? ( ecl? ( dev-lisp/ecl:= ) !ecl? ( gcl? ( dev-lisp/gcl:= ) !gcl? ( cmucl? ( dev-lisp/cmucl:= ) !cmucl? ( dev-lisp/sbcl:= ) ) ) ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( virtual/emacs ) gmp? ( dev-libs/gmp ) clozurecl? ( dev-lisp/clozurecl:= ) !clozurecl? ( clisp? ( dev-lisp/clisp:= ) !clisp? ( ecl? ( dev-lisp/ecl:= ) !ecl? ( gcl? ( dev-lisp/gcl:= ) !gcl? ( cmucl? ( dev-lisp/cmucl:= ) !cmucl? ( dev-lisp/sbcl:= ) ) ) ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=FriCAS is a fork of Axiom computer algebra system
 EAPI=5
 HOMEPAGE=http://fricas.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( virtual/emacs ) gmp? ( d
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/fricas/fricas-1.2.0-full.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f758a157d1cf49e535efda33cafb3de1
diff --git a/metadata/md5-cache/sci-mathematics/glpk-4.48 b/metadata/md5-cache/sci-mathematics/glpk-4.48
index fbb6c475eef1..46a982ba432d 100644
--- a/metadata/md5-cache/sci-mathematics/glpk-4.48
+++ b/metadata/md5-cache/sci-mathematics/glpk-4.48
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=gmp? ( dev-libs/gmp ) mysql? ( virtual/mysql ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
 SLOT=0
 SRC_URI=mirror://gnu/glpk/glpk-4.48.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=02defdf8209979c8642340036694a086
diff --git a/metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.4-r1 b/metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.4-r1
index 1e9a82be10ff..6a917b70c831 100644
--- a/metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.4-r1
+++ b/metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/gmp blas? ( sci-libs/gsl ) gwnum? ( sci-mathematics/gwnum ) openmp? ( sys-devel/gcc[openmp] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/gmp blas? ( sci-libs/gsl ) gwnum? ( sci-mathematics/gwnum ) openmp? ( sys-devel/gcc[openmp] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Elliptic Curve Method for Integer Factorization
 EAPI=5
 HOMEPAGE=http://ecm.gforge.inria.fr/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gmp blas? ( sci-libs/gsl ) gwnum? ( sci-mathematics/gwnum ) ope
 REQUIRED_USE=gwnum? ( !openmp )
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/32159/gmp-ecm-6.4.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=59296924f712da1a079985649ad9001d
diff --git a/metadata/md5-cache/sci-mathematics/gmp-ecm-9999 b/metadata/md5-cache/sci-mathematics/gmp-ecm-9999
index 5994162e1fbc..44e3a9d51850 100644
--- a/metadata/md5-cache/sci-mathematics/gmp-ecm-9999
+++ b/metadata/md5-cache/sci-mathematics/gmp-ecm-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare unpack
-DEPEND=dev-libs/gmp blas? ( sci-libs/gsl ) gwnum? ( sci-mathematics/gwnum ) openmp? ( sys-devel/gcc[openmp] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=dev-libs/gmp blas? ( sci-libs/gsl ) gwnum? ( sci-mathematics/gwnum ) openmp? ( sys-devel/gcc[openmp] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=Elliptic Curve Method for Integer Factorization
 EAPI=5
 HOMEPAGE=http://ecm.gforge.inria.fr/
@@ -8,5 +8,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-libs/gmp blas? ( sci-libs/gsl ) gwnum? ( sci-mathematics/gwnum ) openmp? ( sys-devel/gcc[openmp] )
 REQUIRED_USE=gwnum? ( !openmp )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ffb7e6b0a134da14d930eb4c6f0db449
diff --git a/metadata/md5-cache/sci-mathematics/jags-3.3.0 b/metadata/md5-cache/sci-mathematics/jags-3.3.0
index eac90a7674ff..d404c4edda7b 100644
--- a/metadata/md5-cache/sci-mathematics/jags-3.3.0
+++ b/metadata/md5-cache/sci-mathematics/jags-3.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/blas virtual/lapack
 SLOT=0
 SRC_URI=mirror://sourceforge/project/mcmc-jags/JAGS/3.x/Source/JAGS-3.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=73e47e50b986b9a6ea7e13f53fe0318f
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.26.0 b/metadata/md5-cache/sci-mathematics/maxima-5.26.0
index a7bf09352502..219f4867fb43 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.26.0
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.26.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free computer algebra environment based on Macsyma
 EAPI=3
 HOMEPAGE=http://maxima.sourceforge.net/
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/imaxima )
 RDEPEND=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 ) ) ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.26.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8e777e567484d11cfc1c1fa30a516223
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.27.0-r1 b/metadata/md5-cache/sci-mathematics/maxima-5.27.0-r1
index 3056b6ab793f..8fc4f51f6586 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.27.0-r1
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.27.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free computer algebra environment based on Macsyma
 EAPI=3
 HOMEPAGE=http://maxima.sourceforge.net/
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/imaxima )
 RDEPEND=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 ) ) ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.27.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e2505b91069ae1bb2bc17294064f8f62
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.28.0 b/metadata/md5-cache/sci-mathematics/maxima-5.28.0
index 54b71526347e..7495c3e30b51 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.28.0
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.28.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free computer algebra environment based on Macsyma
 EAPI=3
 HOMEPAGE=http://maxima.sourceforge.net/
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/imaxima )
 RDEPEND=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 ) ) ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.28.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=90e5afea4dcff167e6a33b5568156502
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.29.1 b/metadata/md5-cache/sci-mathematics/maxima-5.29.1
index 4cf882e43b50..ef7b2309044a 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.29.1
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.29.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free computer algebra environment based on Macsyma
 EAPI=3
 HOMEPAGE=http://maxima.sourceforge.net/
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/imaxima )
 RDEPEND=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 ) ) ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.29.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=746fca9e348039d103704f3542c24d58
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.30.0 b/metadata/md5-cache/sci-mathematics/maxima-5.30.0
index 1e1fec1d3ade..5a912121e9c4 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.30.0
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.30.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=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:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Free computer algebra environment based on Macsyma
 EAPI=5
 HOMEPAGE=http://maxima.sourceforge.net/
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/imaxima )
 RDEPEND=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:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) 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 ) ) ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.30.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2377b3d0b81900063992a8ff20b95f48
diff --git a/metadata/md5-cache/sci-mathematics/octave-3.4.3-r1 b/metadata/md5-cache/sci-mathematics/octave-3.4.3-r1
index 7dfaec6366ac..ae5d3bd0e0b7 100644
--- a/metadata/md5-cache/sci-mathematics/octave-3.4.3-r1
+++ b/metadata/md5-cache/sci-mathematics/octave-3.4.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High-level interactive language for numerical computations
 EAPI=4
 HOMEPAGE=http://www.octave.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://gnu/octave/octave-3.4.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=027ed09ea6e907f0abcc0240b6caa93c
diff --git a/metadata/md5-cache/sci-mathematics/octave-3.6.3 b/metadata/md5-cache/sci-mathematics/octave-3.6.3
index dffc7d0a32de..7512b7483d62 100644
--- a/metadata/md5-cache/sci-mathematics/octave-3.6.3
+++ b/metadata/md5-cache/sci-mathematics/octave-3.6.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-text/ghostscript-gpl dev-libs/libpcre sys-libs/ncurses virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) gnuplot? ( sci-visualization/gnuplot ) hdf5? ( sci-libs/hdf5 ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) 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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=app-text/ghostscript-gpl dev-libs/libpcre sys-libs/ncurses virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) gnuplot? ( sci-visualization/gnuplot ) hdf5? ( sci-libs/hdf5 ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) 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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=High-level interactive language for numerical computations
 EAPI=4
 HOMEPAGE=http://www.octave.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre sys-libs/ncurses virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) gnuplot? ( sci-visualization/gnuplot ) hdf5? ( sci-libs/hdf5 ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) 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 ) virtual/fortran
 SLOT=0
 SRC_URI=mirror://gnu/octave/octave-3.6.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1264d98a1dc17ff30157bc72099b281f
diff --git a/metadata/md5-cache/sci-mathematics/octave-3.6.4 b/metadata/md5-cache/sci-mathematics/octave-3.6.4
index b7d631b9ca19..5e9fef915617 100644
--- a/metadata/md5-cache/sci-mathematics/octave-3.6.4
+++ b/metadata/md5-cache/sci-mathematics/octave-3.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-text/ghostscript-gpl dev-libs/libpcre sys-libs/ncurses virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) gnuplot? ( sci-visualization/gnuplot ) hdf5? ( sci-libs/hdf5 ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) 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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=app-text/ghostscript-gpl dev-libs/libpcre sys-libs/ncurses virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) gnuplot? ( sci-visualization/gnuplot ) hdf5? ( sci-libs/hdf5 ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) 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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=High-level interactive language for numerical computations
 EAPI=5
 HOMEPAGE=http://www.octave.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre sys-libs/ncurses virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) gnuplot? ( sci-visualization/gnuplot ) hdf5? ( sci-libs/hdf5 ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) 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 ) virtual/fortran
 SLOT=0
 SRC_URI=mirror://gnu/octave/octave-3.6.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=93230e83edb4fe8bda732dc17325f4bd
diff --git a/metadata/md5-cache/sci-mathematics/prng-3.0.2 b/metadata/md5-cache/sci-mathematics/prng-3.0.2
index 3dcce039b981..139de481249d 100644
--- a/metadata/md5-cache/sci-mathematics/prng-3.0.2
+++ b/metadata/md5-cache/sci-mathematics/prng-3.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Pseudo-Random Number Generator library
 EAPI=4
 HOMEPAGE=http://statmath.wu.ac.at/prng/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://statmath.wu.ac.at/prng/prng-3.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=943a3bc077f9a1e47c9d9c3c768b16df
diff --git a/metadata/md5-cache/sci-mathematics/pspp-0.6.2-r1 b/metadata/md5-cache/sci-mathematics/pspp-0.6.2-r1
index be2baede24a8..66058c58126c 100644
--- a/metadata/md5-cache/sci-mathematics/pspp-0.6.2-r1
+++ b/metadata/md5-cache/sci-mathematics/pspp-0.6.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=dev-libs/libxml2:2 sci-libs/gsl sys-libs/readline sys-devel/gettext sys-libs/zlib virtual/libiconv 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 ) virtual/pkgconfig doc? ( virtual/latex-base ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2:2 sci-libs/gsl sys-libs/readline sys-devel/gettext sys-libs/zlib virtual/libiconv 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 ) virtual/pkgconfig doc? ( virtual/latex-base ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Program for statistical analysis of sampled data.
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/pspp/pspp.html
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libxml2:2 sci-libs/gsl sys-libs/readline sys-devel/gettext sys-libs/zlib virtual/libiconv 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 )
 SLOT=0
 SRC_URI=mirror://gnu/pspp/pspp-0.6.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e99bb1c9dde84273fd5469c79e1292cb
diff --git a/metadata/md5-cache/sci-mathematics/rngstreams-1.0.1 b/metadata/md5-cache/sci-mathematics/rngstreams-1.0.1
index 0bc62dcc8ebf..92825adb9881 100644
--- a/metadata/md5-cache/sci-mathematics/rngstreams-1.0.1
+++ b/metadata/md5-cache/sci-mathematics/rngstreams-1.0.1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://statmath.wu.ac.at/software/RngStreams/rngstreams-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=97347ba659df896edadf7400838d7653
diff --git a/metadata/md5-cache/sci-mathematics/singular-3.1.2-r2 b/metadata/md5-cache/sci-mathematics/singular-3.1.2-r2
index 3baf27c0ec1c..61cdc5d6120d 100644
--- a/metadata/md5-cache/sci-mathematics/singular-3.1.2-r2
+++ b/metadata/md5-cache/sci-mathematics/singular-3.1.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=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.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Computer algebra system for polynomial computations
 EAPI=3
 HOMEPAGE=http://www.singular.uni-kl.de/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=75450a1d7cd2220cbe11e3674f4c5632
diff --git a/metadata/md5-cache/sci-mathematics/singular-3.1.3.1 b/metadata/md5-cache/sci-mathematics/singular-3.1.3.1
index 529441141e62..a85edb0421fd 100644
--- a/metadata/md5-cache/sci-mathematics/singular-3.1.3.1
+++ b/metadata/md5-cache/sci-mathematics/singular-3.1.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=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.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Computer algebra system for polynomial computations
 EAPI=3
 HOMEPAGE=http://www.singular.uni-kl.de/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dffde356567749fb9a91f1b8e8f47c35
diff --git a/metadata/md5-cache/sci-mathematics/singular-3.1.3.3 b/metadata/md5-cache/sci-mathematics/singular-3.1.3.3
index 16cc27161bb4..27bd3eb98921 100644
--- a/metadata/md5-cache/sci-mathematics/singular-3.1.3.3
+++ b/metadata/md5-cache/sci-mathematics/singular-3.1.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=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.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 DESCRIPTION=Computer algebra system for polynomial computations
 EAPI=3
 HOMEPAGE=http://www.singular.uni-kl.de/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=35e8ff242cdb40393c05a1d9075d3cb0
diff --git a/metadata/md5-cache/sci-mathematics/singular-3.1.4 b/metadata/md5-cache/sci-mathematics/singular-3.1.4
index 4ff2e927630c..862a10aae68a 100644
--- a/metadata/md5-cache/sci-mathematics/singular-3.1.4
+++ b/metadata/md5-cache/sci-mathematics/singular-3.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 ) dev-lang/perl boost? ( dev-libs/boost ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 ) dev-lang/perl boost? ( dev-libs/boost ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Computer algebra system for polynomial computations
 EAPI=3
 HOMEPAGE=http://www.singular.uni-kl.de/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 ) python?
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-4/Singular-3-1-4.tar.gz http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-4/Singular-3-1-4-share.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a0f760fc87b2efeee660238b55f9e6ee
diff --git a/metadata/md5-cache/sci-mathematics/singular-3.1.4-r1 b/metadata/md5-cache/sci-mathematics/singular-3.1.4-r1
index e441f925ff2f..2a64d303579a 100644
--- a/metadata/md5-cache/sci-mathematics/singular-3.1.4-r1
+++ b/metadata/md5-cache/sci-mathematics/singular-3.1.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 ) dev-lang/perl boost? ( dev-libs/boost ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 ) dev-lang/perl boost? ( dev-libs/boost ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Computer algebra system for polynomial computations
 EAPI=3
 HOMEPAGE=http://www.singular.uni-kl.de/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 ) python?
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-4/Singular-3-1-4.tar.gz http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-4/Singular-3-1-4-share.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fb2d14d919b29e926d733e564e8cc7be
diff --git a/metadata/md5-cache/sci-mathematics/topcom-0.16.2 b/metadata/md5-cache/sci-mathematics/topcom-0.16.2
index 77f0189614fb..8bf71ba85933 100644
--- a/metadata/md5-cache/sci-mathematics/topcom-0.16.2
+++ b/metadata/md5-cache/sci-mathematics/topcom-0.16.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/gmp sci-libs/cddlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/gmp sci-libs/cddlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Computing Triangulations Of Point Configurations and Oriented Matroids
 EAPI=4
 HOMEPAGE=http://www.rambau.wm.uni-bayreuth.de/TOPCOM/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp sci-libs/cddlib
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=090345a01c4f81275730c4a9937517ad
diff --git a/metadata/md5-cache/sci-mathematics/topcom-0.17.4 b/metadata/md5-cache/sci-mathematics/topcom-0.17.4
index f7fe149f318e..a80f2ab28013 100644
--- a/metadata/md5-cache/sci-mathematics/topcom-0.17.4
+++ b/metadata/md5-cache/sci-mathematics/topcom-0.17.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/gmp-5.0.5 >=sci-libs/cddlib-094f || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/gmp-5.0.5 >=sci-libs/cddlib-094f || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Computing Triangulations Of Point Configurations and Oriented Matroids
 EAPI=4
 HOMEPAGE=http://www.rambau.wm.uni-bayreuth.de/TOPCOM/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/gmp-5.0.5 >=sci-libs/cddlib-094f
 SLOT=0
 SRC_URI=http://www.uni-bayreuth.de/departments/wirtschaftsmathematik/rambau/Software/TOPCOM-0.17.4.tar.gz doc? ( http://www.rambau.wm.uni-bayreuth.de/TOPCOM/TOPCOM-manual.html )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=54cd0e8126f01420df5d75854b574336
diff --git a/metadata/md5-cache/sci-mathematics/unuran-1.8.1 b/metadata/md5-cache/sci-mathematics/unuran-1.8.1
index 1228d66728ac..92aac715b355 100644
--- a/metadata/md5-cache/sci-mathematics/unuran-1.8.1
+++ b/metadata/md5-cache/sci-mathematics/unuran-1.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gsl? ( sci-libs/gsl ) prng? ( sci-mathematics/prng ) rngstreams? ( sci-mathematics/rngstreams )
 SLOT=0
 SRC_URI=http://statmath.wu.ac.at/unuran/unuran-1.8.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1e01bb1a9ba77313920a7c81de91cb14
diff --git a/metadata/md5-cache/sci-mathematics/yacas-1.3.2 b/metadata/md5-cache/sci-mathematics/yacas-1.3.2
index 76ec0e406727..1d956c69c794 100644
--- a/metadata/md5-cache/sci-mathematics/yacas-1.3.2
+++ b/metadata/md5-cache/sci-mathematics/yacas-1.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=java? ( >=virtual/jdk-1.6 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=java? ( >=virtual/jdk-1.6 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=General purpose computer algebra system
 EAPI=4
 HOMEPAGE=http://yacas.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://yacas.sourceforge.net/backups/yacas-1.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cdd6f03266c17eade773fcc701416a84
diff --git a/metadata/md5-cache/sci-mathematics/yacas-1.3.3 b/metadata/md5-cache/sci-mathematics/yacas-1.3.3
index e5aab758468e..1dc0040d9ce9 100644
--- a/metadata/md5-cache/sci-mathematics/yacas-1.3.3
+++ b/metadata/md5-cache/sci-mathematics/yacas-1.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=java? ( >=virtual/jdk-1.6 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=java? ( >=virtual/jdk-1.6 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=General purpose computer algebra system
 EAPI=4
 HOMEPAGE=http://yacas.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://yacas.sourceforge.net/backups/yacas-1.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a26df0f26b0ef9a76239b29696dd8082
diff --git a/metadata/md5-cache/sci-misc/apertium-3.2.0 b/metadata/md5-cache/sci-misc/apertium-3.2.0
index b7caa9c0d114..1293aa672be1 100644
--- a/metadata/md5-cache/sci-misc/apertium-3.2.0
+++ b/metadata/md5-cache/sci-misc/apertium-3.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxslt dev-libs/libpcre[cxx] >=sci-misc/lttoolbox-3.2 virtual/libiconv
 SLOT=0
 SRC_URI=mirror://sourceforge/apertium/apertium-3.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a384ef0f0aa1c503a66fa0f602591c0
diff --git a/metadata/md5-cache/sci-misc/boinc-7.0.29 b/metadata/md5-cache/sci-misc/boinc-7.0.29
index 25143565ba74..aa16a81af55b 100644
--- a/metadata/md5-cache/sci-misc/boinc-7.0.29
+++ b/metadata/md5-cache/sci-misc/boinc-7.0.29
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=!sci-misc/boinc-bin !app-admin/quickswitch >=app-misc/ca-certificates-20080809 dev-libs/openssl net-misc/curl[ssl,-gnutls(-),-nss(-),curl_ssl_openssl(+)] 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] )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~alexxy/distfiles/boinc-7.0.29.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=b9331b7fb651a4d7f11b86a843f03c86
diff --git a/metadata/md5-cache/sci-misc/gcam-2010.07.27-r1 b/metadata/md5-cache/sci-misc/gcam-2010.07.27-r1
index d0846c7d9912..5d0dcbb4df5c 100644
--- a/metadata/md5-cache/sci-misc/gcam-2010.07.27-r1
+++ b/metadata/md5-cache/sci-misc/gcam-2010.07.27-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/expat dev-libs/glib:2 >=media-libs/libpng-1.5 virtual/opengl virtual/glu x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/gtkglext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/expat dev-libs/glib:2 >=media-libs/libpng-1.5 virtual/opengl virtual/glu x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/gtkglext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU Computer Aided Manufacturing
 EAPI=5
 HOMEPAGE=http://gcam.js.cx
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/expat dev-libs/glib:2 >=media-libs/libpng-1.5 virtual/opengl virtual/glu x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/gtkglext
 SLOT=0
 SRC_URI=http://gcam.js.cx/files/gcam-2010.07.27.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9eb9687671dbd4c907a6a1622c336033
diff --git a/metadata/md5-cache/sci-misc/gcam-9999 b/metadata/md5-cache/sci-misc/gcam-9999
index c888dea7180c..8ca7d861fb28 100644
--- a/metadata/md5-cache/sci-misc/gcam-9999
+++ b/metadata/md5-cache/sci-misc/gcam-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install preinst prepare unpack
-DEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/libxml2 >=media-libs/libpng-1.5 virtual/opengl virtual/glu x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/gtkglext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/libxml2 >=media-libs/libpng-1.5 virtual/opengl virtual/glu x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/gtkglext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=GNU Computer Aided Manufacturing
 EAPI=5
 HOMEPAGE=http://gcam.js.cx
 LICENSE=GPL-3
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/libxml2 >=media-libs/libpng-1.5 virtual/opengl virtual/glu x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/gtkglext
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d13a95eb9b7d61fe5a40ddb1561b978e
diff --git a/metadata/md5-cache/sci-misc/h5utils-1.12.1-r2 b/metadata/md5-cache/sci-misc/h5utils-1.12.1-r2
index 0c1b87d09fd2..ebdbf0c1cf99 100644
--- a/metadata/md5-cache/sci-misc/h5utils-1.12.1-r2
+++ b/metadata/md5-cache/sci-misc/h5utils-1.12.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libpng sci-libs/hdf5 sys-libs/zlib hdf? ( sci-libs/hdf virtual/jpeg ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libpng sci-libs/hdf5 sys-libs/zlib hdf? ( sci-libs/hdf virtual/jpeg ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utilities for visualization and conversion of HDF5 files
 EAPI=4
 HOMEPAGE=http://ab-initio.mit.edu/h5utils/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng sci-libs/hdf5 sys-libs/zlib hdf? ( sci-libs/hdf virtual/jpeg )
 SLOT=0
 SRC_URI=http://ab-initio.mit.edu/h5utils/h5utils-1.12.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4f6a76890cbe2408d427350452a088b6
diff --git a/metadata/md5-cache/sci-misc/lttoolbox-3.2.0 b/metadata/md5-cache/sci-misc/lttoolbox-3.2.0
index 074761a39de7..b094ed7f9382 100644
--- a/metadata/md5-cache/sci-misc/lttoolbox-3.2.0
+++ b/metadata/md5-cache/sci-misc/lttoolbox-3.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/libxml2:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Toolbox for lexical processing, morphological analysis and generation of words
 EAPI=4
 HOMEPAGE=http://apertium.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2
 SLOT=0
 SRC_URI=mirror://sourceforge/apertium/lttoolbox-3.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5622f80019e329793ee48324f56059f5
diff --git a/metadata/md5-cache/sci-physics/clhep-2.0.4.6 b/metadata/md5-cache/sci-physics/clhep-2.0.4.6
index c7e670dd370a..a9ee7b082993 100644
--- a/metadata/md5-cache/sci-physics/clhep-2.0.4.6
+++ b/metadata/md5-cache/sci-physics/clhep-2.0.4.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=High Energy Physics C++ library
 EAPI=2
 HOMEPAGE=http://www.cern.ch/clhep
@@ -8,5 +8,5 @@ KEYWORDS=amd64 hppa ppc x86
 LICENSE=public-domain
 SLOT=2
 SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.0.4.6.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed4dfdb4e25778823f68857f6e40076e
diff --git a/metadata/md5-cache/sci-physics/clhep-2.1.0.1 b/metadata/md5-cache/sci-physics/clhep-2.1.0.1
index 6dd3a19133ef..9248aace0a75 100644
--- a/metadata/md5-cache/sci-physics/clhep-2.1.0.1
+++ b/metadata/md5-cache/sci-physics/clhep-2.1.0.1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 hppa ppc x86
 LICENSE=public-domain
 SLOT=2
 SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.1.0.1.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=08ed65a1bd68ee67b06deecf0b4438dc
diff --git a/metadata/md5-cache/sci-physics/espresso-3.1.0 b/metadata/md5-cache/sci-physics/espresso-3.1.0
index 1833dbb48443..4e7b359173b0 100644
--- a/metadata/md5-cache/sci-physics/espresso-3.1.0
+++ b/metadata/md5-cache/sci-physics/espresso-3.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=tk? ( X )
 RESTRICT=tk? ( test )
 SLOT=0
 SRC_URI=mirror://nongnu/espressomd/espresso-3.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8dc0e05d0ffae5bb6b4fab920d5b8471
diff --git a/metadata/md5-cache/sci-physics/espresso-3.1.1 b/metadata/md5-cache/sci-physics/espresso-3.1.1
index b262bf6ac28f..a5f7b5efb820 100644
--- a/metadata/md5-cache/sci-physics/espresso-3.1.1
+++ b/metadata/md5-cache/sci-physics/espresso-3.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=tk? ( X )
 RESTRICT=tk? ( test )
 SLOT=0
 SRC_URI=mirror://nongnu/espressomd/espresso-3.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b25af327806722c35d4e76f4144e9898
diff --git a/metadata/md5-cache/sci-physics/espresso-3.1.2 b/metadata/md5-cache/sci-physics/espresso-3.1.2
index d0c6d321a896..cce524c0e602 100644
--- a/metadata/md5-cache/sci-physics/espresso-3.1.2
+++ b/metadata/md5-cache/sci-physics/espresso-3.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=tk? ( X )
 RESTRICT=tk? ( test )
 SLOT=0
 SRC_URI=mirror://nongnu/espressomd/espresso-3.1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=72fdc04e824f3377ab4ac33cdf79b829
diff --git a/metadata/md5-cache/sci-physics/fastjet-3.0.3-r1 b/metadata/md5-cache/sci-physics/fastjet-3.0.3-r1
index 360263383220..182815b95659 100644
--- a/metadata/md5-cache/sci-physics/fastjet-3.0.3-r1
+++ b/metadata/md5-cache/sci-physics/fastjet-3.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=cgal? ( sci-mathematics/cgal ) doc? ( app-doc/doxygen[dot] ) plugins? ( sci-physics/siscone ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool plugins? ( virtual/fortran )
+DEPEND=cgal? ( sci-mathematics/cgal ) doc? ( app-doc/doxygen[dot] ) plugins? ( sci-physics/siscone ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool plugins? ( virtual/fortran )
 DESCRIPTION=Fast implementation of several recombination jet algorithms
 EAPI=4
 HOMEPAGE=http://www.fastjet.fr/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 QPL
 RDEPEND=cgal? ( sci-mathematics/cgal ) plugins? ( virtual/fortran )
 SLOT=0
 SRC_URI=http://www.fastjet.fr//repo/fastjet-3.0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8fb82203eae896f7283633b8736133c4
diff --git a/metadata/md5-cache/sci-physics/h2o-gtk-0.1 b/metadata/md5-cache/sci-physics/h2o-gtk-0.1
index 768c33eb564b..827dd46b0ab6 100644
--- a/metadata/md5-cache/sci-physics/h2o-gtk-0.1
+++ b/metadata/md5-cache/sci-physics/h2o-gtk-0.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-cpp/gtkmm >=sci-libs/libh2oxx-0.2 sci-libs/plotmm
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/h2o-gtk/downloads/h2o-gtk-0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8590d794aa6685751a6d0d298ec1eb1f
diff --git a/metadata/md5-cache/sci-physics/h2o-gtk-9999 b/metadata/md5-cache/sci-physics/h2o-gtk-9999
index 8305975a62c7..9f65153b3a28 100644
--- a/metadata/md5-cache/sci-physics/h2o-gtk-9999
+++ b/metadata/md5-cache/sci-physics/h2o-gtk-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-cpp/gtkmm sci-libs/libh2oxx sci-libs/plotmm dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-cpp/gtkmm sci-libs/libh2oxx sci-libs/plotmm dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK+ UI for libh2o -- water & steam properties
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/h2o-gtk/
 LICENSE=BSD
 RDEPEND=dev-cpp/gtkmm sci-libs/libh2oxx sci-libs/plotmm
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eaf598bd7bf3fe1dca65664bda37d3d2
diff --git a/metadata/md5-cache/sci-physics/harminv-1.3.1 b/metadata/md5-cache/sci-physics/harminv-1.3.1
index 3ccc8650f729..2c2c7a42e945 100644
--- a/metadata/md5-cache/sci-physics/harminv-1.3.1
+++ b/metadata/md5-cache/sci-physics/harminv-1.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/lapack virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/lapack virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Extraction of complex frequencies and amplitudes from time series
 EAPI=4
 HOMEPAGE=http://ab-initio.mit.edu/harminv/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/lapack
 SLOT=0
 SRC_URI=http://ab-initio.mit.edu/harminv/harminv-1.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1ea4896410b333d276310cd695a53c55
diff --git a/metadata/md5-cache/sci-physics/heppdt-3.04.01 b/metadata/md5-cache/sci-physics/heppdt-3.04.01
index 9e15467e16ea..9fd99a8b5552 100644
--- a/metadata/md5-cache/sci-physics/heppdt-3.04.01
+++ b/metadata/md5-cache/sci-physics/heppdt-3.04.01
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Data about each particle from the Review of Particle Properties
 EAPI=4
 HOMEPAGE=http://lcgapp.cern.ch/project/simu/HepPDT/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://lcgapp.cern.ch/project/simu/HepPDT//download/HepPDT-3.04.01.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=67330971689530d8e4bb070b67d02ec1
diff --git a/metadata/md5-cache/sci-physics/herwig-6.5.10 b/metadata/md5-cache/sci-physics/herwig-6.5.10
index dc07e354e2b7..154bf187c4f3 100644
--- a/metadata/md5-cache/sci-physics/herwig-6.5.10
+++ b/metadata/md5-cache/sci-physics/herwig-6.5.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare setup unpack
-DEPEND=!sci-physics/cernlib-montecarlo[herwig] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=!sci-physics/cernlib-montecarlo[herwig] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=High Energy Physics Event Generator
 EAPI=2
 HOMEPAGE=http://hepwww.rl.ac.uk/theory/seymour/herwig/
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9503939442e4d9a950e288b41aa264d3
diff --git a/metadata/md5-cache/sci-physics/herwig-6.5.20 b/metadata/md5-cache/sci-physics/herwig-6.5.20
index 14acec65399e..bd971c616b9e 100644
--- a/metadata/md5-cache/sci-physics/herwig-6.5.20
+++ b/metadata/md5-cache/sci-physics/herwig-6.5.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=!sci-physics/cernlib-montecarlo[herwig] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=!sci-physics/cernlib-montecarlo[herwig] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=High Energy Physics Event Generator
 EAPI=4
 HOMEPAGE=http://www.hep.phy.cam.ac.uk/theory/webber/Herwig/
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=!sci-physics/cernlib-montecarlo[herwig] virtual/fortran
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ea3ef70b582a19cbb9517e07616d4ad7
diff --git a/metadata/md5-cache/sci-physics/lightspeed-1.2a-r1 b/metadata/md5-cache/sci-physics/lightspeed-1.2a-r1
index 71439ab07316..d23a0aa5d78d 100644
--- a/metadata/md5-cache/sci-physics/lightspeed-1.2a-r1
+++ b/metadata/md5-cache/sci-physics/lightspeed-1.2a-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenGL interactive relativistic simulator
 EAPI=4
 HOMEPAGE=http://lightspeed.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=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 )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=404d1e124059b2291aa42ede5c3b245e
diff --git a/metadata/md5-cache/sci-physics/meep-1.2 b/metadata/md5-cache/sci-physics/meep-1.2
index b2281ec37e78..4e14ba47d67d 100644
--- a/metadata/md5-cache/sci-physics/meep-1.2
+++ b/metadata/md5-cache/sci-physics/meep-1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/fftw sci-libs/gsl sci-physics/harminv guile? ( >=sci-libs/libctl-3.2 ) hdf5? ( sci-libs/hdf5 ) mpb? ( sci-physics/mpb ) mpi? ( virtual/mpi ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sci-libs/fftw sci-libs/gsl sci-physics/harminv guile? ( >=sci-libs/libctl-3.2 ) hdf5? ( sci-libs/hdf5 ) mpb? ( sci-physics/mpb ) mpi? ( virtual/mpi ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simulation software to model electromagnetic systems
 EAPI=4
 HOMEPAGE=http://ab-initio.mit.edu/meep/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-libs/fftw sci-libs/gsl sci-physics/harminv guile? ( >=sci-libs/libctl-3.2 ) hdf5? ( sci-libs/hdf5 ) mpb? ( sci-physics/mpb ) mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://ab-initio.mit.edu/meep/meep-1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=166ecbff747df8f7dd9711e324d76c13
diff --git a/metadata/md5-cache/sci-physics/mpb-1.4.2-r2 b/metadata/md5-cache/sci-physics/mpb-1.4.2-r2
index 42be2a58fa3a..ba1ea660edea 100644
--- a/metadata/md5-cache/sci-physics/mpb-1.4.2-r2
+++ b/metadata/md5-cache/sci-physics/mpb-1.4.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=virtual/lapack dev-scheme/guile sci-libs/libctl sci-libs/fftw:2.1[mpi?] sys-libs/readline hdf5? ( sci-libs/hdf5 ) mpi? ( virtual/mpi ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/lapack dev-scheme/guile sci-libs/libctl sci-libs/fftw:2.1[mpi?] sys-libs/readline hdf5? ( sci-libs/hdf5 ) mpi? ( virtual/mpi ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Photonic band structure program
 EAPI=4
 HOMEPAGE=http://ab-initio.mit.edu/mpb/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/lapack dev-scheme/guile sci-libs/libctl sci-libs/fftw:2.1[mpi?] sys-libs/readline hdf5? ( sci-libs/hdf5 ) mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://ab-initio.mit.edu/mpb/mpb-1.4.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=74a1fb3d12ab3c3be65d84ea50c36bc9
diff --git a/metadata/md5-cache/sci-physics/pythia-6.4.24 b/metadata/md5-cache/sci-physics/pythia-6.4.24
index 49591a21a280..0ea36c3424b3 100644
--- a/metadata/md5-cache/sci-physics/pythia-6.4.24
+++ b/metadata/md5-cache/sci-physics/pythia-6.4.24
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Lund Monte Carlo high-energy physics event generator
 EAPI=2
 HOMEPAGE=http://pythia6.hepforge.org/
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=virtual/fortran
 SLOT=6
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=52a53cea1f68a423a6948ad2d0d093c6
diff --git a/metadata/md5-cache/sci-physics/pythia-6.4.26 b/metadata/md5-cache/sci-physics/pythia-6.4.26
index 1be89dff0b9f..5c3006bfcb14 100644
--- a/metadata/md5-cache/sci-physics/pythia-6.4.26
+++ b/metadata/md5-cache/sci-physics/pythia-6.4.26
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Lund Monte Carlo high-energy physics event generator
 EAPI=4
 HOMEPAGE=http://pythia6.hepforge.org/
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=virtual/fortran
 SLOT=6
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a46571ced76988f5c39f6cc421c5a34a
diff --git a/metadata/md5-cache/sci-physics/pythia-6.4.27 b/metadata/md5-cache/sci-physics/pythia-6.4.27
index 5fdb7dde863a..d56da244722b 100644
--- a/metadata/md5-cache/sci-physics/pythia-6.4.27
+++ b/metadata/md5-cache/sci-physics/pythia-6.4.27
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
 DESCRIPTION=Lund Monte Carlo high-energy physics event generator
 EAPI=4
 HOMEPAGE=http://pythia6.hepforge.org/
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=virtual/fortran
 SLOT=6
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/pythia-6.4.27.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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=848576be079dd5b75ec64f7a9f01489d
diff --git a/metadata/md5-cache/sci-physics/siscone-2.0.5 b/metadata/md5-cache/sci-physics/siscone-2.0.5
index d95261f201be..887cb1c5bb64 100644
--- a/metadata/md5-cache/sci-physics/siscone-2.0.5
+++ b/metadata/md5-cache/sci-physics/siscone-2.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Hadron Seedless Infrared-Safe Cone jet algorithm
 EAPI=4
 HOMEPAGE=http://siscone.hepforge.org/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.hepforge.org/archive/siscone/siscone-2.0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f4e1bb262374204c0e36628931307202
diff --git a/metadata/md5-cache/sci-visualization/epix-1.2.10 b/metadata/md5-cache/sci-visualization/epix-1.2.10
index 0b61f5d48944..bd8098ede06e 100644
--- a/metadata/md5-cache/sci-visualization/epix-1.2.10
+++ b/metadata/md5-cache/sci-visualization/epix-1.2.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=2- and 3-D plotter for creating images (to be used in LaTeX)
 EAPI=4
 HOMEPAGE=http://mathcs.holycross.edu/~ahwang/current/ePiX.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra dev-tex/xcolor emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=http://mathcs.holycross.edu/~ahwang/epix/epix-1.2.10_withpdf.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e63be1fd07f08d3650f2bd9a360f3e5f
diff --git a/metadata/md5-cache/sci-visualization/fityk-1.1.1 b/metadata/md5-cache/sci-visualization/fityk-1.1.1
index 5b5a1bbbb2cd..9a01a784ebc9 100644
--- a/metadata/md5-cache/sci-visualization/fityk-1.1.1
+++ b/metadata/md5-cache/sci-visualization/fityk-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=General-purpose nonlinear curve fitting and data analysis
 EAPI=4
 HOMEPAGE=http://fityk.nieto.pl/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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* )
 SLOT=0
 SRC_URI=http://github.com/wojdyr/fityk/tarball/v1.1.1 -> fityk-1.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=2c07aebb6165b8754da6f37d5ee6d8ef
diff --git a/metadata/md5-cache/sci-visualization/fityk-1.2.0 b/metadata/md5-cache/sci-visualization/fityk-1.2.0
index d04f78da9e94..781f12c0eab7 100644
--- a/metadata/md5-cache/sci-visualization/fityk-1.2.0
+++ b/metadata/md5-cache/sci-visualization/fityk-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=sci-libs/xylib-0.8 >=dev-lang/lua-5.1 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sci-libs/xylib-0.8 >=dev-lang/lua-5.1 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=General-purpose nonlinear curve fitting and data analysis
 EAPI=4
 HOMEPAGE=http://fityk.nieto.pl/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sci-libs/xylib-0.8 >=dev-lang/lua-5.1 readline? ( sys-libs/readline ) wxwidgets? ( >=x11-libs/wxGTK-2.9.2 ) gnuplot? ( sci-visualization/gnuplot ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://github.com/downloads/wojdyr/fityk/fityk-1.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=48b51f9f46c597f350b69bd61d7b8d8b
diff --git a/metadata/md5-cache/sci-visualization/g3data-1.5.4 b/metadata/md5-cache/sci-visualization/g3data-1.5.4
index af285345fac8..e0c89702ac44 100644
--- a/metadata/md5-cache/sci-visualization/g3data-1.5.4
+++ b/metadata/md5-cache/sci-visualization/g3data-1.5.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://github.com/downloads/pn2200/g3data/g3data-1.5.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9506d916b7e25cfcea68e088df8f1260
diff --git a/metadata/md5-cache/sci-visualization/gfsview-20120706 b/metadata/md5-cache/sci-visualization/gfsview-20120706
index 56aa0bbee097..b68a748bce0b 100644
--- a/metadata/md5-cache/sci-visualization/gfsview-20120706
+++ b/metadata/md5-cache/sci-visualization/gfsview-20120706
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-libs/gerris media-libs/ftgl media-libs/mesa[osmesa] x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0.6 x11-libs/startup-notification
 SLOT=0
 SRC_URI=http://gerris.dalembert.upmc.fr/gerris/tarballs/gfsview-snapshot-120706.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3e7cc445e46c310944ad3c2f9c96c75f
diff --git a/metadata/md5-cache/sci-visualization/ggobi-2.1.10 b/metadata/md5-cache/sci-visualization/ggobi-2.1.10
index f3b89c8453cc..7024b85821b1 100644
--- a/metadata/md5-cache/sci-visualization/ggobi-2.1.10
+++ b/metadata/md5-cache/sci-visualization/ggobi-2.1.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libxml2:2 media-gfx/graphviz x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2:2 media-gfx/graphviz x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Visualization program for exploring high-dimensional data
 EAPI=5
 HOMEPAGE=http://www.ggobi.org/
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=dev-libs/libxml2:2 media-gfx/graphviz x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/g/ggobi/ggobi_2.1.10.orig.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=efe0a087e87a213d1fccfc578495ba29
diff --git a/metadata/md5-cache/sci-visualization/ggobi-2.1.8 b/metadata/md5-cache/sci-visualization/ggobi-2.1.8
index 63ac43d2b68d..bcfd058af393 100644
--- a/metadata/md5-cache/sci-visualization/ggobi-2.1.8
+++ b/metadata/md5-cache/sci-visualization/ggobi-2.1.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=media-gfx/graphviz-2.6 x11-libs/gtk+:2 dev-libs/libxml2:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-gfx/graphviz-2.6 x11-libs/gtk+:2 dev-libs/libxml2:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Visualization program for exploring high-dimensional data
 EAPI=2
 HOMEPAGE=http://www.ggobi.org
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=media-gfx/graphviz-2.6 x11-libs/gtk+:2 dev-libs/libxml2:2
 SLOT=0
 SRC_URI=http://www.ggobi.org/downloads/ggobi-2.1.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=719088e0d8ac6a13aeaab33c3e54ef13
diff --git a/metadata/md5-cache/sci-visualization/ggobi-2.1.9-r1 b/metadata/md5-cache/sci-visualization/ggobi-2.1.9-r1
index b25fe5d88864..1cdd35b1b9f9 100644
--- a/metadata/md5-cache/sci-visualization/ggobi-2.1.9-r1
+++ b/metadata/md5-cache/sci-visualization/ggobi-2.1.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=media-gfx/graphviz x11-libs/gtk+:2 dev-libs/libxml2:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-gfx/graphviz x11-libs/gtk+:2 dev-libs/libxml2:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Visualization program for exploring high-dimensional data
 EAPI=4
 HOMEPAGE=http://www.ggobi.org/
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=media-gfx/graphviz x11-libs/gtk+:2 dev-libs/libxml2:2
 SLOT=0
 SRC_URI=http://www.ggobi.org/downloads/ggobi-2.1.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6a181277c49704bd58d3b438369c9278
diff --git a/metadata/md5-cache/sci-visualization/gle-4.2.4b b/metadata/md5-cache/sci-visualization/gle-4.2.4b
index 3b871f50cc5d..6420c7a468f2 100644
--- a/metadata/md5-cache/sci-visualization/gle-4.2.4b
+++ b/metadata/md5-cache/sci-visualization/gle-4.2.4b
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=sys-libs/ncurses X? ( x11-libs/libX11 ) qt4? ( dev-qt/qtopengl:4 ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses X? ( x11-libs/libX11 ) qt4? ( dev-qt/qtopengl:4 ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Graphics Layout Engine
 EAPI=4
 HOMEPAGE=http://glx.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD-2 emacs? ( GPL-2 ) qt4? ( GPL-2 )
 RDEPEND=sys-libs/ncurses X? ( x11-libs/libX11 ) qt4? ( dev-qt/qtopengl: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 ) )
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4574f64278d2ef58135fca3b36441da9
diff --git a/metadata/md5-cache/sci-visualization/gle-4.2.4c b/metadata/md5-cache/sci-visualization/gle-4.2.4c
index 6a7b3b0c7867..d696afe7f368 100644
--- a/metadata/md5-cache/sci-visualization/gle-4.2.4c
+++ b/metadata/md5-cache/sci-visualization/gle-4.2.4c
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=sys-libs/ncurses X? ( x11-libs/libX11 ) qt4? ( dev-qt/qtopengl:4 ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses X? ( x11-libs/libX11 ) qt4? ( dev-qt/qtopengl:4 ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Graphics Layout Engine
 EAPI=5
 HOMEPAGE=http://glx.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD-2 emacs? ( GPL-2 ) qt4? ( GPL-2 )
 RDEPEND=sys-libs/ncurses X? ( x11-libs/libX11 ) qt4? ( dev-qt/qtopengl: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 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/glx/gle-graphics-4.2.4cf-src.tar.gz doc? ( mirror://sourceforge/glx/gle-manual-4.2.2.pdf mirror://sourceforge/glx/GLEusersguide.pdf )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c1dddfecc4b459e420aad80a3e7a9a70
diff --git a/metadata/md5-cache/sci-visualization/gwyddion-2.29 b/metadata/md5-cache/sci-visualization/gwyddion-2.29
index c79f06bd061f..562247f8c2d1 100644
--- a/metadata/md5-cache/sci-visualization/gwyddion-2.29
+++ b/metadata/md5-cache/sci-visualization/gwyddion-2.29
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXmu x11-libs/pango fftw? ( >=sci-libs/fftw-3 ) gnome? ( gnome-base/gconf:2 ) kde? ( >=kde-base/kdelibs-4 ) opengl? ( virtual/opengl x11-libs/gtkglext ) perl? ( dev-lang/perl ) python? ( dev-python/pygtk:2 ) ruby? ( dev-ruby/narray ) sourceview? ( x11-libs/gtksourceview:2.0 ) xml? ( dev-libs/libxml2:2 ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://gwyddion.net/download/2.29/gwyddion-2.29.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d490fa62b27537aa9dc2bcf5d5360594
diff --git a/metadata/md5-cache/sci-visualization/gwyddion-2.30 b/metadata/md5-cache/sci-visualization/gwyddion-2.30
index 5628be98c396..e0943e54bdab 100644
--- a/metadata/md5-cache/sci-visualization/gwyddion-2.30
+++ b/metadata/md5-cache/sci-visualization/gwyddion-2.30
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXmu x11-libs/pango fftw? ( >=sci-libs/fftw-3 ) gnome? ( gnome-base/gconf:2 ) kde? ( >=kde-base/kdelibs-4 ) opengl? ( virtual/opengl x11-libs/gtkglext ) perl? ( dev-lang/perl ) python? ( dev-python/pygtk:2 ) ruby? ( dev-ruby/narray ) sourceview? ( x11-libs/gtksourceview:2.0 ) xml? ( dev-libs/libxml2:2 ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://gwyddion.net/download/2.30/gwyddion-2.30.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=821b7fdaa000350d15d7a4bbe3947c3e
diff --git a/metadata/md5-cache/sci-visualization/gwyddion-2.30-r1 b/metadata/md5-cache/sci-visualization/gwyddion-2.30-r1
index b052dc531f93..90a917519549 100644
--- a/metadata/md5-cache/sci-visualization/gwyddion-2.30-r1
+++ b/metadata/md5-cache/sci-visualization/gwyddion-2.30-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXmu x11-libs/pango fftw? ( sci-libs/fftw:3.0 ) gnome? ( gnome-base/gconf:2 ) kde? ( kde-base/kdelibs:4 ) opengl? ( virtual/opengl x11-libs/gtkglext ) perl? ( dev-lang/perl ) python? ( dev-python/pygtk:2 ) ruby? ( dev-ruby/narray ) sourceview? ( x11-libs/gtksourceview:2.0 ) xml? ( dev-libs/libxml2:2 ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://gwyddion.net/download/2.30/gwyddion-2.30.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bbc87fa3b6fd0c720d8de66656a1583d
diff --git a/metadata/md5-cache/sci-visualization/opendx-4.4.4-r4 b/metadata/md5-cache/sci-visualization/opendx-4.4.4-r4
index d60fe9ae2a64..238121337100 100644
--- a/metadata/md5-cache/sci-visualization/opendx-4.4.4-r4
+++ b/metadata/md5-cache/sci-visualization/opendx-4.4.4-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/libXmu x11-libs/libXi x11-libs/libXp x11-libs/libXpm >=x11-libs/motif-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 media-gfx/graphicsmagick ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libXmu x11-libs/libXi x11-libs/libXp x11-libs/libXpm >=x11-libs/motif-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 media-gfx/graphicsmagick ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=3D data visualization tool
 EAPI=4
 HOMEPAGE=http://www.opendx.org/
@@ -9,5 +9,5 @@ LICENSE=IBM
 RDEPEND=x11-libs/libXmu x11-libs/libXi x11-libs/libXp x11-libs/libXpm >=x11-libs/motif-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 media-gfx/graphicsmagick ) )
 SLOT=0
 SRC_URI=http://opendx.sdsc.edu/source/dx-4.4.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=771ebe6adeb04b70c2b374da54dfbbdf
diff --git a/metadata/md5-cache/sci-visualization/opendx-samples-4.4.0-r1 b/metadata/md5-cache/sci-visualization/opendx-samples-4.4.0-r1
index 9da09b2b6395..5f70285c3aa7 100644
--- a/metadata/md5-cache/sci-visualization/opendx-samples-4.4.0-r1
+++ b/metadata/md5-cache/sci-visualization/opendx-samples-4.4.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=>=sci-visualization/opendx-4.4.4-r2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sci-visualization/opendx-4.4.4-r2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Samples for IBM Data Explorer
 EAPI=4
 HOMEPAGE=http://www.opendx.org/
@@ -8,5 +8,5 @@ LICENSE=IBM
 RDEPEND=>=sci-visualization/opendx-4.4.4-r2
 SLOT=0
 SRC_URI=http://opendx.sdsc.edu/source/dxsamples-4.4.0.tar.gz mirror://gentoo/opendx-samples-4.4.0-install.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cedafe8e932fc3ce15abf1c86588636e
diff --git a/metadata/md5-cache/sci-visualization/quickplot-0.10.2 b/metadata/md5-cache/sci-visualization/quickplot-0.10.2
index c2f43a584dd9..bb0a84028d6f 100644
--- a/metadata/md5-cache/sci-visualization/quickplot-0.10.2
+++ b/metadata/md5-cache/sci-visualization/quickplot-0.10.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsndfile >=sys-libs/readline-0.6.2 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=mirror://sourceforge/quickplot/quickplot-0.10.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9769dcc325aa1ebf8e1570153965049d
diff --git a/metadata/md5-cache/sci-visualization/quickplot-0.10.3 b/metadata/md5-cache/sci-visualization/quickplot-0.10.3
index 116928c91fa8..9224b6361b03 100644
--- a/metadata/md5-cache/sci-visualization/quickplot-0.10.3
+++ b/metadata/md5-cache/sci-visualization/quickplot-0.10.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsndfile >=sys-libs/readline-0.6.2 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=mirror://sourceforge/quickplot/quickplot-0.10.3.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0e2f08f940320159d69602d080919851
diff --git a/metadata/md5-cache/sci-visualization/quickplot-0.10.4 b/metadata/md5-cache/sci-visualization/quickplot-0.10.4
index ce9a6d999cd3..e9b5c2ccf2e3 100644
--- a/metadata/md5-cache/sci-visualization/quickplot-0.10.4
+++ b/metadata/md5-cache/sci-visualization/quickplot-0.10.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libsndfile >=sys-libs/readline-0.6.2 x11-libs/gtk+:3 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsndfile >=sys-libs/readline-0.6.2 x11-libs/gtk+:3 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fast interactive 2D plotter
 EAPI=5
 HOMEPAGE=http://quickplot.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsndfile >=sys-libs/readline-0.6.2 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=mirror://sourceforge/quickplot/quickplot-0.10.4.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5cd11ffbbadcc880b178ef3db3350a65
diff --git a/metadata/md5-cache/sci-visualization/xgraph-12.1-r2 b/metadata/md5-cache/sci-visualization/xgraph-12.1-r2
index af1280ea973c..774a9210a32d 100644
--- a/metadata/md5-cache/sci-visualization/xgraph-12.1-r2
+++ b/metadata/md5-cache/sci-visualization/xgraph-12.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libSM x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libSM x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=X11 Plotting Utility
 EAPI=3
 HOMEPAGE=http://www.isi.edu/nsnam/xgraph/
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=x11-libs/libSM x11-libs/libX11
 SLOT=0
 SRC_URI=http://www.isi.edu/nsnam/dist/xgraph-12.1.tar.gz mirror://debian/pool/main/x/xgraph/xgraph_12.1-10.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=28eb20c2795730279dc1c6572a7e4e62
diff --git a/metadata/md5-cache/sci-visualization/xgraph-12.1-r3 b/metadata/md5-cache/sci-visualization/xgraph-12.1-r3
index c0d276af5ede..b8c2e3a9e5f2 100644
--- a/metadata/md5-cache/sci-visualization/xgraph-12.1-r3
+++ b/metadata/md5-cache/sci-visualization/xgraph-12.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libSM x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libSM x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=X11 Plotting Utility
 EAPI=4
 HOMEPAGE=http://www.isi.edu/nsnam/xgraph/
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=x11-libs/libSM x11-libs/libX11
 SLOT=0
 SRC_URI=http://www.isi.edu/nsnam/dist/xgraph-12.1.tar.gz mirror://debian/pool/main/x/xgraph/xgraph_12.1-16.debian.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c21b4350ceec3970e7483bfb7f7ae5f2
diff --git a/metadata/md5-cache/sys-apps/agedu-9671 b/metadata/md5-cache/sys-apps/agedu-9671
index d69bf99a1628..0e4a89d4a6c4 100644
--- a/metadata/md5-cache/sys-apps/agedu-9671
+++ b/metadata/md5-cache/sys-apps/agedu-9671
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=doc? ( app-doc/halibut ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/halibut ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A utility for tracking down wasted disk space
 EAPI=4
 HOMEPAGE=http://www.chiark.greenend.org.uk/~sgtatham/agedu/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=doc? ( app-doc/halibut )
 SLOT=0
 SRC_URI=http://www.chiark.greenend.org.uk/~sgtatham/agedu/agedu-r9671.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=21c93255e8cfcf5c4bb744d0c97902d4
diff --git a/metadata/md5-cache/sys-apps/agedu-9723 b/metadata/md5-cache/sys-apps/agedu-9723
index 44a8d959501f..20f454703d26 100644
--- a/metadata/md5-cache/sys-apps/agedu-9723
+++ b/metadata/md5-cache/sys-apps/agedu-9723
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=doc? ( app-doc/halibut ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/halibut ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A utility for tracking down wasted disk space
 EAPI=4
 HOMEPAGE=http://www.chiark.greenend.org.uk/~sgtatham/agedu/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=doc? ( app-doc/halibut )
 SLOT=0
 SRC_URI=http://www.chiark.greenend.org.uk/~sgtatham/agedu/agedu-r9723.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b1cb9c06c5efdd15574a0a82e546e552
diff --git a/metadata/md5-cache/sys-apps/arrayprobe-2.0-r2 b/metadata/md5-cache/sys-apps/arrayprobe-2.0-r2
index bcb22ed4923e..cf7e5fbdb6ee 100644
--- a/metadata/md5-cache/sys-apps/arrayprobe-2.0-r2
+++ b/metadata/md5-cache/sys-apps/arrayprobe-2.0-r2
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=CLI utility that reports the status of a HP (Compaq) array controller (both IDA & CCISS supported).
 HOMEPAGE=http://www.strocamp.net/opensource/arrayprobe.php
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.strocamp.net/opensource/compaq/downloads/arrayprobe-2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=93e850c601dc5bb5add834fc74a80085
diff --git a/metadata/md5-cache/sys-apps/attr-2.4.43 b/metadata/md5-cache/sys-apps/attr-2.4.43
index e96d86c431a1..40dcf234a10a 100644
--- a/metadata/md5-cache/sys-apps/attr-2.4.43
+++ b/metadata/md5-cache/sys-apps/attr-2.4.43
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=nls? ( sys-devel/gettext ) sys-devel/autoconf || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=nls? ( sys-devel/gettext ) sys-devel/autoconf || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Extended attributes tools
 HOMEPAGE=http://oss.sgi.com/projects/xfs/
 IUSE=nls
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=ftp://oss.sgi.com/projects/xfs/download/cmd_tars/attr_2.4.43-1.tar.gz ftp://xfs.org/mirror/SGI/cmd_tars/attr_2.4.43-1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=60ffcfc9213e2d6adc3b3b2b0e67e3dc
diff --git a/metadata/md5-cache/sys-apps/bar-1.11.1 b/metadata/md5-cache/sys-apps/bar-1.11.1
index a2b7c89db6c4..57cde915fbde 100644
--- a/metadata/md5-cache/sys-apps/bar-1.11.1
+++ b/metadata/md5-cache/sys-apps/bar-1.11.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( >=app-doc/doxygen-1.3.5 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( >=app-doc/doxygen-1.3.5 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Console Progress Bar
 EAPI=4
 HOMEPAGE=http://clpbar.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/clpbar/bar_1.11.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=4d6513ab46887843a862466c7776ef66
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.2 b/metadata/md5-cache/sys-apps/baselayout-2.2
index 30b5f0ee3e56..83e7be519405 100644
--- a/metadata/md5-cache/sys-apps/baselayout-2.2
+++ b/metadata/md5-cache/sys-apps/baselayout-2.2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst preinst setup
 DESCRIPTION=Filesystem baselayout and init scripts
 HOMEPAGE=http://www.gentoo.org/
 IUSE=build kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=sys-apps/openrc
 SLOT=0
 SRC_URI=mirror://gentoo/baselayout-2.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/baselayout-2.2.tar.bz2
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=167e96ea004d66a3ea149e344e70e380
+_md5_=a15718bb5ffe26a3a1445d3278858590
diff --git a/metadata/md5-cache/sys-apps/conspy-1.8 b/metadata/md5-cache/sys-apps/conspy-1.8
index 83ca16ed3a41..850f20ea04a3 100644
--- a/metadata/md5-cache/sys-apps/conspy-1.8
+++ b/metadata/md5-cache/sys-apps/conspy-1.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Remote control for virtual consoles
 EAPI=4
 HOMEPAGE=http://ace-host.stuart.id.au/russell/files/conspy
@@ -8,5 +8,5 @@ LICENSE=EPL-1.0
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://ace-host.stuart.id.au/russell/files/conspy/conspy-1.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=0da3a8b8c4b8799be91db04fa146650a
diff --git a/metadata/md5-cache/sys-apps/dbus-1.6.8 b/metadata/md5-cache/sys-apps/dbus-1.6.8
index b4b2b15f5e6f..e66bc6edc4b3 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.6.8
+++ b/metadata/md5-cache/sys-apps/dbus-1.6.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) X? ( x11-libs/libX11 x11-libs/libXt ) virtual/pkgconfig doc? ( app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) test? ( >=dev-libs/glib-2.24 dev-lang/python:2.7 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) X? ( x11-libs/libX11 x11-libs/libXt ) virtual/pkgconfig doc? ( app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) test? ( >=dev-libs/glib-2.24 dev-lang/python:2.7 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A message bus system, a simple way for applications to talk to each other
 EAPI=4
 HOMEPAGE=http://dbus.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=|| ( AFL-2.1 GPL-2 )
 RDEPEND=>=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) X? ( x11-libs/libX11 x11-libs/libXt )
 SLOT=0
 SRC_URI=http://dbus.freedesktop.org/releases/dbus/dbus-1.6.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=cba8544a7f979b4683f0dd7550e85b57
diff --git a/metadata/md5-cache/sys-apps/dbus-1.6.8-r1 b/metadata/md5-cache/sys-apps/dbus-1.6.8-r1
index c4810cad604f..4758b7bcb5b6 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.6.8-r1
+++ b/metadata/md5-cache/sys-apps/dbus-1.6.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-44-r1 ) X? ( x11-libs/libX11 x11-libs/libXt ) virtual/pkgconfig doc? ( app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) test? ( >=dev-libs/glib-2.24 || ( dev-lang/python:2.7 ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-44-r1 ) X? ( x11-libs/libX11 x11-libs/libXt ) virtual/pkgconfig doc? ( app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) test? ( >=dev-libs/glib-2.24 || ( dev-lang/python:2.7 ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A message bus system, a simple way for applications to talk to each other
 EAPI=4
 HOMEPAGE=http://dbus.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=|| ( AFL-2.1 GPL-2 )
 RDEPEND=>=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-44-r1 ) X? ( x11-libs/libX11 x11-libs/libXt )
 SLOT=0
 SRC_URI=http://dbus.freedesktop.org/releases/dbus/dbus-1.6.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=e67e504075d60c5c763c8275a3f8b924
diff --git a/metadata/md5-cache/sys-apps/dmapi-2.2.8 b/metadata/md5-cache/sys-apps/dmapi-2.2.8
index e4d92323e4af..a51480ed4d3f 100644
--- a/metadata/md5-cache/sys-apps/dmapi-2.2.8
+++ b/metadata/md5-cache/sys-apps/dmapi-2.2.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-fs/xfsprogs || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-fs/xfsprogs || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=XFS data management API library
 HOMEPAGE=http://oss.sgi.com/projects/xfs/
 KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 ~sparc x86
@@ -7,5 +7,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-fs/xfsprogs
 SLOT=0
 SRC_URI=ftp://oss.sgi.com/projects/xfs/download/cmd_tars/dmapi_2.2.8-1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bfbac3083bf8c1fd393469053c0abd56
diff --git a/metadata/md5-cache/sys-apps/dmtcp-1.2.1 b/metadata/md5-cache/sys-apps/dmtcp-1.2.1
index d1f76569b5f3..7b0f0c6820c4 100644
--- a/metadata/md5-cache/sys-apps/dmtcp-1.2.1
+++ b/metadata/md5-cache/sys-apps/dmtcp-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=DMTCP is the Distributed MultiThreaded Checkpointing tool.
 EAPI=3
 HOMEPAGE=http://dmtcp.sourceforge.net/index.html
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dmtcp/dmtcp-1.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3abf8086c0ef5b542c14d0273029222a
diff --git a/metadata/md5-cache/sys-apps/fakechroot-2.16 b/metadata/md5-cache/sys-apps/fakechroot-2.16
index 38b821e14683..e178859f4180 100644
--- a/metadata/md5-cache/sys-apps/fakechroot-2.16
+++ b/metadata/md5-cache/sys-apps/fakechroot-2.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Provide a faked chroot environment without requiring root privileges
 EAPI=4
 HOMEPAGE=http://fakechroot.alioth.debian.org/
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/f/fakechroot/fakechroot_2.16.orig.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=940f625ef08dc371aa096b782f43382c
diff --git a/metadata/md5-cache/sys-apps/fakechroot-2.9 b/metadata/md5-cache/sys-apps/fakechroot-2.9
index 14d8eaa3c1a7..522d12e1d52c 100644
--- a/metadata/md5-cache/sys-apps/fakechroot-2.9
+++ b/metadata/md5-cache/sys-apps/fakechroot-2.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Provide a faked chroot environment without requiring root privileges
 HOMEPAGE=http://fakechroot.alioth.debian.org/
 KEYWORDS=amd64 x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/f/fakechroot/fakechroot_2.9.orig.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0d01b129f795f06f193d53c38393cc45
diff --git a/metadata/md5-cache/sys-apps/file-9999 b/metadata/md5-cache/sys-apps/file-9999
index d2cede0a4f4e..39cbbfc28a33 100644
--- a/metadata/md5-cache/sys-apps/file-9999
+++ b/metadata/md5-cache/sys-apps/file-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=zlib? ( sys-libs/zlib ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=zlib? ( sys-libs/zlib ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=identify a file's format by scanning binary data for patterns
 EAPI=4
 HOMEPAGE=http://www.darwinsys.com/file/
@@ -7,5 +7,5 @@ IUSE=python static-libs zlib
 LICENSE=BSD-2
 RDEPEND=zlib? ( sys-libs/zlib ) python? ( dev-lang/python )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e1faef8b5bb374abe74128eeca17e3f4
diff --git a/metadata/md5-cache/sys-apps/gnome-disk-utility-2.32.1-r1 b/metadata/md5-cache/sys-apps/gnome-disk-utility-2.32.1-r1
index fdfd80b6a140..76766f088333 100644
--- a/metadata/md5-cache/sys-apps/gnome-disk-utility-2.32.1-r1
+++ b/metadata/md5-cache/sys-apps/gnome-disk-utility-2.32.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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*: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 virtual/pkgconfig >=dev-util/intltool-0.35 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.3 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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*: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 virtual/pkgconfig >=dev-util/intltool-0.35 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.3 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Disk Utility for GNOME using udisks
 EAPI=3
 HOMEPAGE=http://git.gnome.org/browse/gnome-disk-utility
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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*: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 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-disk-utility/2.32/gnome-disk-utility-2.32.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4fa82ea9b09f790c0cc7bb1d5fe4a3db
diff --git a/metadata/md5-cache/sys-apps/gnome-disk-utility-3.0.2-r201 b/metadata/md5-cache/sys-apps/gnome-disk-utility-3.0.2-r201
index c3294b79ec1d..929de47f5aa4 100644
--- a/metadata/md5-cache/sys-apps/gnome-disk-utility-3.0.2-r201
+++ b/metadata/md5-cache/sys-apps/gnome-disk-utility-3.0.2-r201
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libunique-2.90.1:3 >=gnome-base/libgdu-3.0.2[gnome-keyring?] >=x11-libs/gtk+-2.90.7:3 >=x11-libs/libnotify-0.6.1 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 virtual/pkgconfig >=dev-util/intltool-0.35 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libunique-2.90.1:3 >=gnome-base/libgdu-3.0.2[gnome-keyring?] >=x11-libs/gtk+-2.90.7:3 >=x11-libs/libnotify-0.6.1 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 virtual/pkgconfig >=dev-util/intltool-0.35 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Disk Utility for GNOME using udisks
 EAPI=4
 HOMEPAGE=http://git.gnome.org/browse/gnome-disk-utility
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libunique-2.90.1:3 >=gnome-base/libgdu-3.0.2[gnome-keyring?] >=x11-libs/gtk+-2.90.7:3 >=x11-libs/libnotify-0.6.1 gnome-keyring? ( gnome-base/libgnome-keyring ) nautilus? ( >=gnome-base/nautilus-2.24.0 ) =sys-fs/udisks-1.0*:0[remote-access?] x11-misc/xdg-utils fat? ( sys-fs/dosfstools )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-disk-utility/3.0/gnome-disk-utility-3.0.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7554bfcb33b7d29363eeb3a0bd12b5d4
diff --git a/metadata/md5-cache/sys-apps/gnome-disk-utility-3.0.2-r301 b/metadata/md5-cache/sys-apps/gnome-disk-utility-3.0.2-r301
index db13b35ea686..dca603385c97 100644
--- a/metadata/md5-cache/sys-apps/gnome-disk-utility-3.0.2-r301
+++ b/metadata/md5-cache/sys-apps/gnome-disk-utility-3.0.2-r301
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libunique-2.90.1:3 >=gnome-base/libgdu-3.0.2[gnome-keyring?] >=x11-libs/gtk+-2.90.7:3 >=x11-libs/libnotify-0.6.1 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 virtual/pkgconfig >=dev-util/intltool-0.35 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libunique-2.90.1:3 >=gnome-base/libgdu-3.0.2[gnome-keyring?] >=x11-libs/gtk+-2.90.7:3 >=x11-libs/libnotify-0.6.1 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 virtual/pkgconfig >=dev-util/intltool-0.35 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Disk Utility for GNOME using udisks
 EAPI=4
 HOMEPAGE=http://git.gnome.org/browse/gnome-disk-utility
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libunique-2.90.1:3 >=gnome-base/libgdu-3.0.2[gnome-keyring?] >=x11-libs/gtk+-2.90.7:3 >=x11-libs/libnotify-0.6.1 gnome-keyring? ( gnome-base/libgnome-keyring ) nautilus? ( >=gnome-base/nautilus-2.91.0 ) =sys-fs/udisks-1.0*:0[remote-access?] x11-misc/xdg-utils fat? ( sys-fs/dosfstools )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-disk-utility/3.0/gnome-disk-utility-3.0.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=881a6026cd5f3562f9b63579f06d2e5e
diff --git a/metadata/md5-cache/sys-apps/groff-1.20.1-r1 b/metadata/md5-cache/sys-apps/groff-1.20.1-r1
index aba12a43d9ab..18edad01fd67 100644
--- a/metadata/md5-cache/sys-apps/groff-1.20.1-r1
+++ b/metadata/md5-cache/sys-apps/groff-1.20.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=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.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Text formatter used for man pages
 HOMEPAGE=http://www.gnu.org/software/groff/groff.html
 IUSE=examples X linguas_ja
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://gnu/groff/groff-1.20.1.tar.gz linguas_ja? ( mirror://gentoo/groff-1.20.1-japanese.patch.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bbc0cfd5663d3260826f85061584cb22
diff --git a/metadata/md5-cache/sys-apps/groff-1.20.1-r2 b/metadata/md5-cache/sys-apps/groff-1.20.1-r2
index ef98ba22c1d9..b1761cd0eba4 100644
--- a/metadata/md5-cache/sys-apps/groff-1.20.1-r2
+++ b/metadata/md5-cache/sys-apps/groff-1.20.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=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.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Text formatter used for man pages
 HOMEPAGE=http://www.gnu.org/software/groff/groff.html
 IUSE=examples X linguas_ja
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://gnu/groff/groff-1.20.1.tar.gz linguas_ja? ( mirror://gentoo/groff-1.20.1-r2-japanese.patch.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d5ba214bf9cbcfb3af7973ed426e20b4
diff --git a/metadata/md5-cache/sys-apps/groff-1.20.1-r3 b/metadata/md5-cache/sys-apps/groff-1.20.1-r3
index 7c3e3e3b9683..19b53527e080 100644
--- a/metadata/md5-cache/sys-apps/groff-1.20.1-r3
+++ b/metadata/md5-cache/sys-apps/groff-1.20.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=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.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Text formatter used for man pages
 HOMEPAGE=http://www.gnu.org/software/groff/groff.html
 IUSE=examples X linguas_ja
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://gnu/groff/groff-1.20.1.tar.gz linguas_ja? ( mirror://gentoo/groff-1.20.1-r2-japanese.patch.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c4ca7db20a814ed0dee3930e63ff02b7
diff --git a/metadata/md5-cache/sys-apps/groff-1.21 b/metadata/md5-cache/sys-apps/groff-1.21
index a89eda3362f1..ca056bb4f860 100644
--- a/metadata/md5-cache/sys-apps/groff-1.21
+++ b/metadata/md5-cache/sys-apps/groff-1.21
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=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 ) linguas_ja? ( virtual/yacc ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) linguas_ja? ( virtual/yacc ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Text formatter used for man pages
 HOMEPAGE=http://www.gnu.org/software/groff/groff.html
 IUSE=examples X linguas_ja
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://gnu/groff/groff-1.21.tar.gz linguas_ja? ( mirror://gentoo/groff-1.21-japanese.patch.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d372626d15118cef687d8934d3f16883
diff --git a/metadata/md5-cache/sys-apps/groff-1.21-r1 b/metadata/md5-cache/sys-apps/groff-1.21-r1
index 1050e92da0b5..a6e6961af6f8 100644
--- a/metadata/md5-cache/sys-apps/groff-1.21-r1
+++ b/metadata/md5-cache/sys-apps/groff-1.21-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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 ) linguas_ja? ( virtual/yacc ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) linguas_ja? ( virtual/yacc ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Text formatter used for man pages
 EAPI=3
 HOMEPAGE=http://www.gnu.org/software/groff/groff.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://gnu/groff/groff-1.21.tar.gz linguas_ja? ( mirror://gentoo/groff-1.21-japanese.patch.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=20073797701e01ee788b0715c9bfb6de
diff --git a/metadata/md5-cache/sys-apps/groff-1.22.1 b/metadata/md5-cache/sys-apps/groff-1.22.1
index 403c70eff387..0030c5700339 100644
--- a/metadata/md5-cache/sys-apps/groff-1.22.1
+++ b/metadata/md5-cache/sys-apps/groff-1.22.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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 ) linguas_ja? ( virtual/yacc ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) linguas_ja? ( virtual/yacc ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Text formatter used for man pages
 EAPI=3
 HOMEPAGE=http://www.gnu.org/software/groff/groff.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://gnu/groff/groff-1.22.1.tar.gz linguas_ja? ( http://dev.gentoo.org/~naota/patch/groff-1.22.1-japanese.patch.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b8dca80e67c94f58d9b4a39e3004f12d
diff --git a/metadata/md5-cache/sys-apps/groff-1.22.2 b/metadata/md5-cache/sys-apps/groff-1.22.2
index b68c189f1839..6a5886a5741c 100644
--- a/metadata/md5-cache/sys-apps/groff-1.22.2
+++ b/metadata/md5-cache/sys-apps/groff-1.22.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=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 ) linguas_ja? ( virtual/yacc ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) linguas_ja? ( virtual/yacc ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Text formatter used for man pages
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/groff/groff.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://gnu/groff/groff-1.22.2.tar.gz linguas_ja? ( http://dev.gentoo.org/~naota/patch/groff-1.22.1-japanese.patch.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e06bf8ca8e743a8e3ad380a3b2c74256
diff --git a/metadata/md5-cache/sys-apps/hardened-shadow-0.9.2 b/metadata/md5-cache/sys-apps/hardened-shadow-0.9.2
index c41b8524b009..a63980603adc 100644
--- a/metadata/md5-cache/sys-apps/hardened-shadow-0.9.2
+++ b/metadata/md5-cache/sys-apps/hardened-shadow-0.9.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/pam !sys-apps/shadow >=sys-auth/pambase-20120417
 SLOT=0
 SRC_URI=http://hardened-shadow.googlecode.com/files/hardened-shadow-0.9.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=677714e1c63587a191e83e0f1c1717cb
diff --git a/metadata/md5-cache/sys-apps/haveged-1.7a b/metadata/md5-cache/sys-apps/haveged-1.7a
index 729d8d8c860a..2c780c7ae099 100644
--- a/metadata/md5-cache/sys-apps/haveged-1.7a
+++ b/metadata/md5-cache/sys-apps/haveged-1.7a
@@ -7,5 +7,5 @@ LICENSE=GPL-3+
 RDEPEND=!<sys-apps/openrc-0.11.8
 SLOT=0
 SRC_URI=http://www.issihosts.com/haveged/haveged-1.7a.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c54dab414a03cd47006ad14ac3763cac
diff --git a/metadata/md5-cache/sys-apps/iotools-1.5 b/metadata/md5-cache/sys-apps/iotools-1.5
new file mode 100644
index 000000000000..41749e84145b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/iotools-1.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Simple commands to access hardware device registers
+EAPI=4
+HOMEPAGE=http://code.google.com/p/iotools/
+IUSE=static make-symlinks
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://iotools.googlecode.com/files/iotools-1.5.tar.gz
+_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1cba7788bf92276b13b368fbabdd5014
diff --git a/metadata/md5-cache/sys-apps/ipmiutil-2.7.7 b/metadata/md5-cache/sys-apps/ipmiutil-2.7.7
index d8c0bcc776b3..d08de66415d5 100644
--- a/metadata/md5-cache/sys-apps/ipmiutil-2.7.7
+++ b/metadata/md5-cache/sys-apps/ipmiutil-2.7.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/openssl:0 virtual/os-headers || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/openssl:0 virtual/os-headers || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=IPMI Management Utilities
 EAPI=4
 HOMEPAGE=http://ipmiutil.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/openssl:0
 SLOT=0
 SRC_URI=mirror://sourceforge/ipmiutil/ipmiutil-2.7.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=c42382a710353b295ee1d9364ef93361
diff --git a/metadata/md5-cache/sys-apps/ipmiutil-2.8.2 b/metadata/md5-cache/sys-apps/ipmiutil-2.8.2
index c3275ea00591..ffbf1675a7f1 100644
--- a/metadata/md5-cache/sys-apps/ipmiutil-2.8.2
+++ b/metadata/md5-cache/sys-apps/ipmiutil-2.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/openssl-1:0 virtual/os-headers || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=>=dev-libs/openssl-1:0 virtual/os-headers || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=IPMI Management Utilities
 EAPI=4
 HOMEPAGE=http://ipmiutil.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/openssl-1:0
 SLOT=0
 SRC_URI=mirror://sourceforge/ipmiutil/ipmiutil-2.8.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=8cb5750359fa1b9fb138216df13835fb
diff --git a/metadata/md5-cache/sys-apps/ipmiutil-2.8.5 b/metadata/md5-cache/sys-apps/ipmiutil-2.8.5
index 1d9067123486..8d15540ef5d3 100644
--- a/metadata/md5-cache/sys-apps/ipmiutil-2.8.5
+++ b/metadata/md5-cache/sys-apps/ipmiutil-2.8.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/openssl-1:0 virtual/os-headers || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=>=dev-libs/openssl-1:0 virtual/os-headers || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=IPMI Management Utilities
 EAPI=4
 HOMEPAGE=http://ipmiutil.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/openssl-1:0
 SLOT=0
 SRC_URI=mirror://sourceforge/ipmiutil/ipmiutil-2.8.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=8ca69fc855772e4773cf735f6e5b7cb5
diff --git a/metadata/md5-cache/sys-apps/iproute2-3.8.0 b/metadata/md5-cache/sys-apps/iproute2-3.8.0
index b7b3c5c987b4..3ba3b9743ec6 100644
--- a/metadata/md5-cache/sys-apps/iproute2-3.8.0
+++ b/metadata/md5-cache/sys-apps/iproute2-3.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=kernel routing and traffic control utilities
 EAPI=4
 HOMEPAGE=http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
 IUSE=atm berkdb +iptables ipv6 minimal
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2
 RDEPEND=!net-misc/arpd iptables? ( >=net-firewall/iptables-1.4.5 ) !minimal? ( berkdb? ( sys-libs/db ) ) atm? ( net-dialup/linux-atm )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/net/iproute2/iproute2-3.8.0.tar.xz
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bd4567319befbb37abd880e9433db2a7
+_md5_=a872d0c03145b31d698dd425e8ee9c1a
diff --git a/metadata/md5-cache/sys-apps/irqbalance-0.56 b/metadata/md5-cache/sys-apps/irqbalance-0.56
index 6e274ae88684..c61ddf3dde44 100644
--- a/metadata/md5-cache/sys-apps/irqbalance-0.56
+++ b/metadata/md5-cache/sys-apps/irqbalance-0.56
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Distribute hardware interrupts across processors on a multiprocessor system
 EAPI=2
 HOMEPAGE=http://www.irqbalance.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap-ng )
 SLOT=0
 SRC_URI=http://irqbalance.googlecode.com/files/irqbalance-0.56.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=06a4a0471527436a9c49160ba81f79f8
diff --git a/metadata/md5-cache/sys-apps/kbd-1.15.1 b/metadata/md5-cache/sys-apps/kbd-1.15.1
index 10aa50368878..21cba72fe803 100644
--- a/metadata/md5-cache/sys-apps/kbd-1.15.1
+++ b/metadata/md5-cache/sys-apps/kbd-1.15.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Keyboard and console utilities
 HOMEPAGE=http://freshmeat.net/projects/kbd/
 IUSE=nls
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-1.15.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=eb6067db03338931412e4dbe0105b8bc
diff --git a/metadata/md5-cache/sys-apps/kexec-tools-9999 b/metadata/md5-cache/sys-apps/kexec-tools-9999
index 05be4a773082..23db50ce1e67 100644
--- a/metadata/md5-cache/sys-apps/kexec-tools-9999
+++ b/metadata/md5-cache/sys-apps/kexec-tools-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install unpack
-DEPEND=zlib? ( sys-libs/zlib ) dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=zlib? ( sys-libs/zlib ) dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Load another kernel from the currently executing Linux kernel
 EAPI=2
 HOMEPAGE=http://kernel.org/pub/linux/utils/kernel/kexec/
@@ -7,5 +7,5 @@ IUSE=xen zlib
 LICENSE=GPL-2
 RDEPEND=zlib? ( sys-libs/zlib )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=8d6561593ff2a1c6d9d3e57c3736a1f3
diff --git a/metadata/md5-cache/sys-apps/kmod-12-r1 b/metadata/md5-cache/sys-apps/kmod-12-r1
index 0401f5c4de59..485d3a604d7f 100644
--- a/metadata/md5-cache/sys-apps/kmod-12-r1
+++ b/metadata/md5-cache/sys-apps/kmod-12-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) zlib? ( >=sys-libs/zlib-1.2.6 ) dev-libs/libxslt doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) zlib? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) zlib? ( >=sys-libs/zlib-1.2.6 ) dev-libs/libxslt doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) zlib? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=library and tools for managing linux kernel modules
 EAPI=4
 HOMEPAGE=http://git.kernel.org/?p=utils/kernel/kmod/kmod.git
@@ -10,5 +10,5 @@ RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-uti
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kmod/kmod-12.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6e1356afa9504e11c6c39bab3e38a8c3
diff --git a/metadata/md5-cache/sys-apps/kmod-13 b/metadata/md5-cache/sys-apps/kmod-13
index e3fb326364fc..d2ab93790332 100644
--- a/metadata/md5-cache/sys-apps/kmod-13
+++ b/metadata/md5-cache/sys-apps/kmod-13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) zlib? ( >=sys-libs/zlib-1.2.6 ) dev-libs/libxslt doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) zlib? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) zlib? ( >=sys-libs/zlib-1.2.6 ) dev-libs/libxslt doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) zlib? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=library and tools for managing linux kernel modules
 EAPI=5
 HOMEPAGE=http://git.kernel.org/?p=utils/kernel/kmod/kmod.git
@@ -10,5 +10,5 @@ RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-uti
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kmod/kmod-13.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0da9d53185c911240880bb72f15e320f
diff --git a/metadata/md5-cache/sys-apps/kmod-9999 b/metadata/md5-cache/sys-apps/kmod-9999
index 11fb8cb44f1c..277c4f23cabd 100644
--- a/metadata/md5-cache/sys-apps/kmod-9999
+++ b/metadata/md5-cache/sys-apps/kmod-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) zlib? ( >=sys-libs/zlib-1.2.6 ) dev-libs/libxslt doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) zlib? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) zlib? ( >=sys-libs/zlib-1.2.6 ) dev-libs/libxslt doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) zlib? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=library and tools for managing linux kernel modules
 EAPI=5
 HOMEPAGE=http://git.kernel.org/?p=utils/kernel/kmod/kmod.git
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) zlib? ( >=sys-libs/zlib-1.2.6 )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c803763519b8a5994ce35e880cbf98ff
diff --git a/metadata/md5-cache/sys-apps/kmscon-7 b/metadata/md5-cache/sys-apps/kmscon-7
index 2e92c99b38c5..67c4d2fc3c59 100644
--- a/metadata/md5-cache/sys-apps/kmscon-7
+++ b/metadata/md5-cache/sys-apps/kmscon-7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 >=virtual/udev-172 x11-libs/libxkbcommon dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm >=media-libs/mesa-8.0.3[egl,gbm] ) truetype? ( media-libs/freetype:2 ) gles2? ( >=media-libs/mesa-8.0.3[gles2] ) pango? ( x11-libs/pango ) systemd? ( sys-apps/systemd ) udev? ( virtual/udev ) cairo? ( x11-libs/cairo ) pixman? ( x11-libs/pixman ) wayland? ( dev-libs/wayland ) virtual/pkgconfig x11-proto/xproto doc? ( dev-util/gtk-doc ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=dev-libs/glib:2 >=virtual/udev-172 x11-libs/libxkbcommon dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm >=media-libs/mesa-8.0.3[egl,gbm] ) truetype? ( media-libs/freetype:2 ) gles2? ( >=media-libs/mesa-8.0.3[gles2] ) pango? ( x11-libs/pango ) systemd? ( sys-apps/systemd ) udev? ( virtual/udev ) cairo? ( x11-libs/cairo ) pixman? ( x11-libs/pixman ) wayland? ( dev-libs/wayland ) virtual/pkgconfig x11-proto/xproto doc? ( dev-util/gtk-doc ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=KMS/DRM based virtual Console Emulator
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/kmscon
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 >=virtual/udev-172 x11-libs/libxkbcommon dbus? ( sys-app
 REQUIRED_USE=gles2? ( drm ) multiseat? ( systemd )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/kmscon/releases/kmscon-7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=966ad3f72dcd60570ed84be84db4c290
diff --git a/metadata/md5-cache/sys-apps/linux-misc-apps-3.6-r1 b/metadata/md5-cache/sys-apps/linux-misc-apps-3.6-r1
index 69522c1c8930..6869daf5880c 100644
--- a/metadata/md5-cache/sys-apps/linux-misc-apps-3.6-r1
+++ b/metadata/md5-cache/sys-apps/linux-misc-apps-3.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=sys-apps/pciutils sys-apps/hwids >=sys-fs/sysfsutils-2 >=dev-libs/glib-2.6 tcpd? ( sys-apps/tcp-wrappers ) !sys-power/pmtools !net-misc/usbip virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/pciutils sys-apps/hwids >=sys-fs/sysfsutils-2 >=dev-libs/glib-2.6 tcpd? ( sys-apps/tcp-wrappers ) !sys-power/pmtools !net-misc/usbip virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Misc tools bundled with kernel sources
 EAPI=4
 HOMEPAGE=http://kernel.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils sys-apps/hwids >=sys-fs/sysfsutils-2 >=dev-libs/glib-2.6 tcpd? ( sys-apps/tcp-wrappers ) !sys-power/pmtools !net-misc/usbip
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v3.6/linux-3.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e762c4ab583fe405bf37f5f5459d996e
diff --git a/metadata/md5-cache/sys-apps/lomoco-1.0-r9 b/metadata/md5-cache/sys-apps/lomoco-1.0-r9
index f9119a0d9fb2..1f07050ef7c6 100644
--- a/metadata/md5-cache/sys-apps/lomoco-1.0-r9
+++ b/metadata/md5-cache/sys-apps/lomoco-1.0-r9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=virtual/libusb:0 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=virtual/libusb:0 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Lomoco can configure vendor-specific options on Logitech USB mice.
 EAPI=4
 HOMEPAGE=http://www.lomoco.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0
 SLOT=0
 SRC_URI=http://www.lomoco.org/lomoco-1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c03e3fdf7d532b2a0e8ba4f456b9d38e
diff --git a/metadata/md5-cache/sys-apps/pacman-4.0.1 b/metadata/md5-cache/sys-apps/pacman-4.0.1
index 38216d22fe02..aab1d518cb9c 100644
--- a/metadata/md5-cache/sys-apps/pacman-4.0.1
+++ b/metadata/md5-cache/sys-apps/pacman-4.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Archlinux's binary package manager
 EAPI=4
 HOMEPAGE=http://archlinux.org/pacman/
@@ -10,5 +10,5 @@ RDEPEND=app-arch/libarchive dev-libs/openssl virtual/libiconv virtual/libintl sy
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.archlinux.org/other/pacman/pacman-4.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2995614ee76574fc03028111642376cf
diff --git a/metadata/md5-cache/sys-apps/pacman-4.0.3 b/metadata/md5-cache/sys-apps/pacman-4.0.3
index 9779c374c6b7..da60d53c1c9d 100644
--- a/metadata/md5-cache/sys-apps/pacman-4.0.3
+++ b/metadata/md5-cache/sys-apps/pacman-4.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Archlinux's binary package manager
 EAPI=4
 HOMEPAGE=http://archlinux.org/pacman/
@@ -10,5 +10,5 @@ RDEPEND=app-arch/libarchive dev-libs/openssl virtual/libiconv virtual/libintl sy
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.archlinux.org/other/pacman/pacman-4.0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=42ed05608cc12360dda795d3feb692d6
diff --git a/metadata/md5-cache/sys-apps/preload-0.6.4-r2 b/metadata/md5-cache/sys-apps/preload-0.6.4-r2
index d7f51b146c96..6940e372ac66 100644
--- a/metadata/md5-cache/sys-apps/preload-0.6.4-r2
+++ b/metadata/md5-cache/sys-apps/preload-0.6.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.6:2 virtual/pkgconfig sys-apps/help2man || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.6:2 virtual/pkgconfig sys-apps/help2man || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Adaptive readahead daemon.
 EAPI=3
 HOMEPAGE=http://sourceforge.net/projects/preload/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6:2
 SLOT=0
 SRC_URI=mirror://sourceforge/preload/preload-0.6.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d867422eea1b89644bb1a4b60d8f8e77
diff --git a/metadata/md5-cache/sys-apps/preload-0.6.4-r3 b/metadata/md5-cache/sys-apps/preload-0.6.4-r3
index 8d72497440ac..ea5642ffe825 100644
--- a/metadata/md5-cache/sys-apps/preload-0.6.4-r3
+++ b/metadata/md5-cache/sys-apps/preload-0.6.4-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.6:2 virtual/pkgconfig sys-apps/help2man || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.6:2 virtual/pkgconfig sys-apps/help2man || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Adaptive readahead daemon.
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/preload/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6:2
 SLOT=0
 SRC_URI=mirror://sourceforge/preload/preload-0.6.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5bccc4b95e2727ce8df529c9bcc985bc
diff --git a/metadata/md5-cache/sys-apps/qingy-1.0.0 b/metadata/md5-cache/sys-apps/qingy-1.0.0
index 1858c642acd7..e14e8a1ab156 100644
--- a/metadata/md5-cache/sys-apps/qingy-1.0.0
+++ b/metadata/md5-cache/sys-apps/qingy-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=sys-libs/ncurses-5.7-r7:= opensslcrypt? ( dev-libs/openssl:0= ) crypt? ( >=dev-libs/libgcrypt-1.2.1:= ) directfb? ( >=dev-libs/DirectFB-1.4.2[fbcon,jpeg,png,truetype] ) emacs? ( virtual/emacs ) pam? ( >=sys-libs/pam-0.75-r11 ) X? ( x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-proto/scrnsaverproto ) >=sys-apps/sed-4.1.4-r1 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.7-r7:= opensslcrypt? ( dev-libs/openssl:0= ) crypt? ( >=dev-libs/libgcrypt-1.2.1:= ) directfb? ( >=dev-libs/DirectFB-1.4.2[fbcon,jpeg,png,truetype] ) emacs? ( virtual/emacs ) pam? ( >=sys-libs/pam-0.75-r11 ) X? ( x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-proto/scrnsaverproto ) >=sys-apps/sed-4.1.4-r1 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a DirectFB getty replacement
 EAPI=5
 HOMEPAGE=http://qingy.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.7-r7:= opensslcrypt? ( dev-libs/openssl:0= ) crypt? ( >=dev-libs/libgcrypt-1.2.1:= ) directfb? ( >=dev-libs/DirectFB-1.4.2[fbcon,jpeg,png,truetype] ) emacs? ( virtual/emacs ) pam? ( >=sys-libs/pam-0.75-r11 ) X? ( x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-proto/scrnsaverproto ) pam? ( sys-auth/pambase )
 SLOT=0
 SRC_URI=mirror://sourceforge/qingy/qingy-1.0.0.tar.bz2 mirror://gentoo/qingy-gentoo-theme-2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7e7e716cb5f26eccb5d02d8d248f1d24
diff --git a/metadata/md5-cache/sys-apps/renameutils-0.10.0 b/metadata/md5-cache/sys-apps/renameutils-0.10.0
index 6ee309da59ce..957bf7ca16ad 100644
--- a/metadata/md5-cache/sys-apps/renameutils-0.10.0
+++ b/metadata/md5-cache/sys-apps/renameutils-0.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/readline-5.0-r2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/readline-5.0-r2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Use your favorite text editor to rename files
 EAPI=2
 HOMEPAGE=http://www.nongnu.org/renameutils/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/readline-5.0-r2
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/renameutils/renameutils-0.10.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1b865bac939b4f64abe56741bddbc5aa
diff --git a/metadata/md5-cache/sys-apps/renameutils-0.11.0 b/metadata/md5-cache/sys-apps/renameutils-0.11.0
index d78f776b2396..9971e53bcfca 100644
--- a/metadata/md5-cache/sys-apps/renameutils-0.11.0
+++ b/metadata/md5-cache/sys-apps/renameutils-0.11.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=sys-libs/readline-5.0-r2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/readline-5.0-r2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Use your favorite text editor to rename files
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/renameutils/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/readline-5.0-r2
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/renameutils/renameutils-0.11.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4645b1b5c5820d57e2157a842303dca3
diff --git a/metadata/md5-cache/sys-apps/renameutils-0.12.0 b/metadata/md5-cache/sys-apps/renameutils-0.12.0
index bb678288049b..bbd22555e94d 100644
--- a/metadata/md5-cache/sys-apps/renameutils-0.12.0
+++ b/metadata/md5-cache/sys-apps/renameutils-0.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=sys-libs/readline-5.0-r2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/readline-5.0-r2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Use your favorite text editor to rename files
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/renameutils/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/readline-5.0-r2
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/renameutils/renameutils-0.12.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e4006fb076ab3fc0f7b1d8a14f3f9142
diff --git a/metadata/md5-cache/sys-apps/rng-tools-2-r1 b/metadata/md5-cache/sys-apps/rng-tools-2-r1
index 5a65e2053e7b..0dee7ef55701 100644
--- a/metadata/md5-cache/sys-apps/rng-tools-2-r1
+++ b/metadata/md5-cache/sys-apps/rng-tools-2-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Daemon to use hardware random number generators.
 HOMEPAGE=http://gkernel.sourceforge.net/
 KEYWORDS=alpha amd64 ia64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/gkernel/rng-tools-2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=ba8b921723f3b8433c3711e6f3f43b96
diff --git a/metadata/md5-cache/sys-apps/rng-tools-3 b/metadata/md5-cache/sys-apps/rng-tools-3
index 739cedcfdf26..286a7ba138ff 100644
--- a/metadata/md5-cache/sys-apps/rng-tools-3
+++ b/metadata/md5-cache/sys-apps/rng-tools-3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Daemon to use hardware random number generators.
 EAPI=2
 HOMEPAGE=http://gkernel.sourceforge.net/
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/gkernel/rng-tools-3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=a20fab9bc802279f7b6c7f0dc3c40878
diff --git a/metadata/md5-cache/sys-apps/rng-tools-3-r1 b/metadata/md5-cache/sys-apps/rng-tools-3-r1
index 891e11bcfecd..953142114b3a 100644
--- a/metadata/md5-cache/sys-apps/rng-tools-3-r1
+++ b/metadata/md5-cache/sys-apps/rng-tools-3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Daemon to use hardware random number generators.
 EAPI=2
 HOMEPAGE=http://gkernel.sourceforge.net/
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/gkernel/rng-tools-3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e4cc586d7ac56e36c1766c61f750cc18
diff --git a/metadata/md5-cache/sys-apps/rng-tools-4-r1 b/metadata/md5-cache/sys-apps/rng-tools-4-r1
index 4de74b022902..51d84a33b3aa 100644
--- a/metadata/md5-cache/sys-apps/rng-tools-4-r1
+++ b/metadata/md5-cache/sys-apps/rng-tools-4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Daemon to use hardware random number generators
 EAPI=4
 HOMEPAGE=http://gkernel.sourceforge.net/
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/gkernel/rng-tools-4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c5c22d3e56daeca0e5ed3c4d637102ea
diff --git a/metadata/md5-cache/sys-apps/rng-tools-4-r5 b/metadata/md5-cache/sys-apps/rng-tools-4-r5
index c7f9c4c2b48a..359927f16ebc 100644
--- a/metadata/md5-cache/sys-apps/rng-tools-4-r5
+++ b/metadata/md5-cache/sys-apps/rng-tools-4-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Daemon to use hardware random number generators
 EAPI=4
 HOMEPAGE=http://gkernel.sourceforge.net/
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/gkernel/rng-tools-4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b8dca26dd20548f344c35a0c1536aab5
diff --git a/metadata/md5-cache/sys-apps/smartmontools-9999 b/metadata/md5-cache/sys-apps/smartmontools-9999
index 7512cfb52cb1..af57b6e7cc37 100644
--- a/metadata/md5-cache/sys-apps/smartmontools-9999
+++ b/metadata/md5-cache/sys-apps/smartmontools-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install preinst prepare unpack
-DEPEND=caps? ( sys-libs/libcap-ng ) selinux? ( sys-libs/libselinux ) virtual/pkgconfig || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=caps? ( sys-libs/libcap-ng ) selinux? ( sys-libs/libselinux ) virtual/pkgconfig || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.) monitoring tools
 EAPI=3
 HOMEPAGE=http://smartmontools.sourceforge.net/
@@ -7,5 +7,5 @@ IUSE=caps minimal selinux static
 LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap-ng ) selinux? ( sys-libs/libselinux ) !minimal? ( virtual/mailx )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b137aca21406c3eb75012a26fe29a921
diff --git a/metadata/md5-cache/sys-apps/systemd-197-r1 b/metadata/md5-cache/sys-apps/systemd-197-r1
index 6bf68bc94501..f9b918e7473a 100644
--- a/metadata/md5-cache/sys-apps/systemd-197-r1
+++ b/metadata/md5-cache/sys-apps/systemd-197-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 MIT
 RDEPEND=>=sys-apps/dbus-1.6.8-r1 >=sys-apps/util-linux-2.20 ~sys-fs/udev-197 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5 ) http? ( net-libs/libmicrohttpd ) kmod? ( >=sys-apps/kmod-12 ) lzma? ( app-arch/xz-utils ) pam? ( virtual/pam ) python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers ) xattr? ( sys-apps/attr ) sys-apps/hwids || ( >=sys-apps/util-linux-2.22 <sys-apps/sysvinit-2.88-r4 ) !sys-auth/nss-myhostname !<sys-libs/glibc-2.10 !<sys-fs/udev-197-r3
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-197.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0676c5d1aa73acf60ec58cf641fa89b1
diff --git a/metadata/md5-cache/sys-apps/systemd-200-r1 b/metadata/md5-cache/sys-apps/systemd-200-r1
index 9ec878977498..af519dc6aa3e 100644
--- a/metadata/md5-cache/sys-apps/systemd-200-r1
+++ b/metadata/md5-cache/sys-apps/systemd-200-r1
@@ -10,5 +10,5 @@ PDEPEND=>=sys-apps/hwids-20130326.1[udev]
 RDEPEND=>=sys-apps/dbus-1.6.8-r1 >=sys-apps/util-linux-2.20 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5 ) gudev? ( >=dev-libs/glib-2 ) http? ( net-libs/libmicrohttpd ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-12 ) lzma? ( app-arch/xz-utils ) pam? ( virtual/pam ) python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers ) xattr? ( sys-apps/attr ) >=sys-apps/baselayout-2.2 openrc? ( >=sys-fs/udev-init-scripts-25 ) || ( >=sys-apps/util-linux-2.22 <sys-apps/sysvinit-2.88-r4 ) !sys-auth/nss-myhostname !<sys-libs/glibc-2.10 !sys-fs/udev
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-200.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d94e31d623efc61188290a4cdf696b04
diff --git a/metadata/md5-cache/sys-apps/systemd-201 b/metadata/md5-cache/sys-apps/systemd-201
index 8e4cbb4d7072..8ef3ed8cc163 100644
--- a/metadata/md5-cache/sys-apps/systemd-201
+++ b/metadata/md5-cache/sys-apps/systemd-201
@@ -10,5 +10,5 @@ PDEPEND=>=sys-apps/hwids-20130326.1[udev]
 RDEPEND=>=sys-apps/dbus-1.6.8-r1 >=sys-apps/util-linux-2.20 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5 ) gudev? ( >=dev-libs/glib-2 ) http? ( net-libs/libmicrohttpd ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-12 ) lzma? ( app-arch/xz-utils ) pam? ( virtual/pam ) python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers ) xattr? ( sys-apps/attr ) >=sys-apps/baselayout-2.2 openrc? ( >=sys-fs/udev-init-scripts-25 ) policykit? ( sys-auth/polkit ) || ( >=sys-apps/util-linux-2.22 <sys-apps/sysvinit-2.88-r4 ) !sys-auth/nss-myhostname !<sys-libs/glibc-2.10 !sys-fs/udev
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-201.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=963be946ffdcf22eb8baf849c1e0322e
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 0e71ac89af9f..3e04f2f17c80 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/dbus-1.6.8-r1 >=sys-apps/util-linux-2.20 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5 ) gudev? ( >=dev-libs/glib-2 ) http? ( net-libs/libmicrohttpd ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-12 ) lzma? ( app-arch/xz-utils ) pam? ( virtual/pam ) python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers ) xattr? ( sys-apps/attr ) app-arch/xz-utils app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=dev-util/intltool-0.50 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-2.6.39 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) dev-libs/gobject-introspection >=dev-libs/libgcrypt-1.4.5 >=dev-util/gtk-doc-1.18 dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig virtual/pkgconfig
+DEPEND=>=sys-apps/dbus-1.6.8-r1 >=sys-apps/util-linux-2.20 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5 ) gudev? ( >=dev-libs/glib-2 ) http? ( net-libs/libmicrohttpd ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-12 ) lzma? ( app-arch/xz-utils ) pam? ( virtual/pam ) python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers ) xattr? ( sys-apps/attr ) app-arch/xz-utils app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=dev-util/intltool-0.50 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-2.6.39 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) dev-libs/gobject-introspection >=dev-libs/libgcrypt-1.4.5 >=dev-util/gtk-doc-1.18 dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=System and service manager for Linux
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1 MIT
 PDEPEND=>=sys-apps/hwids-20130326.1[udev]
 RDEPEND=>=sys-apps/dbus-1.6.8-r1 >=sys-apps/util-linux-2.20 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5 ) gudev? ( >=dev-libs/glib-2 ) http? ( net-libs/libmicrohttpd ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-12 ) lzma? ( app-arch/xz-utils ) pam? ( virtual/pam ) python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers ) xattr? ( sys-apps/attr ) >=sys-apps/baselayout-2.2 openrc? ( >=sys-fs/udev-init-scripts-25 ) policykit? ( sys-auth/polkit ) || ( >=sys-apps/util-linux-2.22 <sys-apps/sysvinit-2.88-r4 ) !sys-auth/nss-myhostname !<sys-libs/glibc-2.10 !sys-fs/udev
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e5e6e3ef4aa63bec602d803af9d3b58c
diff --git a/metadata/md5-cache/sys-apps/systemd-ui-2 b/metadata/md5-cache/sys-apps/systemd-ui-2
index f2b83f6c1047..5823cc84dba5 100644
--- a/metadata/md5-cache/sys-apps/systemd-ui-2
+++ b/metadata/md5-cache/sys-apps/systemd-ui-2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-apps/systemd[gtk] >=dev-libs/glib-2.26 dev-libs/libgee:0.8 sys-apps/dbus x11-libs/gtk+:2 >=x11-libs/libnotify-0.7
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-ui-2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
 _md5_=be5d263579b988c659065988a7ffb315
diff --git a/metadata/md5-cache/sys-apps/systemd-ui-9999 b/metadata/md5-cache/sys-apps/systemd-ui-9999
index a433a7da6616..1916cfa6835a 100644
--- a/metadata/md5-cache/sys-apps/systemd-ui-9999
+++ b/metadata/md5-cache/sys-apps/systemd-ui-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!sys-apps/systemd[gtk] >=dev-libs/glib-2.26 dev-libs/libgee:0.8 sys-apps/dbus x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 app-arch/xz-utils || ( dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) app-text/docbook-xml-dtd:4.2 dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!sys-apps/systemd[gtk] >=dev-libs/glib-2.26 dev-libs/libgee:0.8 sys-apps/dbus x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 app-arch/xz-utils || ( dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) app-text/docbook-xml-dtd:4.2 dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=System and service manager for Linux
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
 LICENSE=GPL-2
 RDEPEND=!sys-apps/systemd[gtk] >=dev-libs/glib-2.26 dev-libs/libgee:0.8 sys-apps/dbus x11-libs/gtk+:2 >=x11-libs/libnotify-0.7
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
 _md5_=8279391f52599df6989ac7ed3cca2f95
diff --git a/metadata/md5-cache/sys-apps/the_silver_searcher-0.13.1 b/metadata/md5-cache/sys-apps/the_silver_searcher-0.13.1
index 1237d1176acc..e7224efe29d4 100644
--- a/metadata/md5-cache/sys-apps/the_silver_searcher-0.13.1
+++ b/metadata/md5-cache/sys-apps/the_silver_searcher-0.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=dev-libs/libpcre virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libpcre virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A code-searching tool similar to ack, but faster
 EAPI=5
 HOMEPAGE=http://github.com/ggreer/the_silver_searcher
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/libpcre
 SLOT=0
 SRC_URI=mirror://github/ggreer/the_silver_searcher/the_silver_searcher-0.13.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=85f1879aba2b0d1988b1b24003aad2ef
diff --git a/metadata/md5-cache/sys-apps/the_silver_searcher-0.14 b/metadata/md5-cache/sys-apps/the_silver_searcher-0.14
index c96405aa5411..55bdbbb53df5 100644
--- a/metadata/md5-cache/sys-apps/the_silver_searcher-0.14
+++ b/metadata/md5-cache/sys-apps/the_silver_searcher-0.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/libpcre virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libpcre virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A code-searching tool similar to ack, but faster
 EAPI=5
 HOMEPAGE=http://github.com/ggreer/the_silver_searcher
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/libpcre
 SLOT=0
 SRC_URI=https://github.com/ggreer/the_silver_searcher/archive/0.14.tar.gz -> the_silver_searcher-0.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=bf09d4460b2c1811cb16d207f5e08b03
diff --git a/metadata/md5-cache/sys-apps/uam-0.3 b/metadata/md5-cache/sys-apps/uam-0.3
index 7f93b148ed8d..485fe9bd16a1 100644
--- a/metadata/md5-cache/sys-apps/uam-0.3
+++ b/metadata/md5-cache/sys-apps/uam-0.3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/udev
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/uam/downloads/uam-0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=03c65273cd160040ef0b39f912f3285f
diff --git a/metadata/md5-cache/sys-apps/uam-9999 b/metadata/md5-cache/sys-apps/uam-9999
index 8e19cec16363..e60f1c2edb64 100644
--- a/metadata/md5-cache/sys-apps/uam-9999
+++ b/metadata/md5-cache/sys-apps/uam-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=virtual/udev virtual/pkgconfig dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/udev virtual/pkgconfig dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple udev-based automounter for removable USB media
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/uam/
 LICENSE=BSD
 RDEPEND=virtual/udev
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ad39b6c7a909f19ddf8bf109b00bf6eb
diff --git a/metadata/md5-cache/sys-apps/udevil-0.3.6 b/metadata/md5-cache/sys-apps/udevil-0.3.6
index af26db085a56..8169264e044b 100644
--- a/metadata/md5-cache/sys-apps/udevil-0.3.6
+++ b/metadata/md5-cache/sys-apps/udevil-0.3.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=>=app-shells/bash-4.0 dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143 systemd? ( sys-apps/systemd ) dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-shells/bash-4.0 dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143 systemd? ( sys-apps/systemd ) dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=mount and unmount removable devices without a password
 EAPI=5
 HOMEPAGE=http://ignorantguru.github.com/udevil/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-shells/bash-4.0 dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143 systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=https://github.com/IgnorantGuru/udevil/archive/0.3.6.tar.gz -> udevil-0.3.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
 _md5_=71fa05426be584eb22ba6dfb3b31ddb2
diff --git a/metadata/md5-cache/sys-apps/udevil-0.4.0 b/metadata/md5-cache/sys-apps/udevil-0.4.0
index 95262d3d3dc8..bad059c80dca 100644
--- a/metadata/md5-cache/sys-apps/udevil-0.4.0
+++ b/metadata/md5-cache/sys-apps/udevil-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=>=app-shells/bash-4.0 dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143 systemd? ( sys-apps/systemd ) dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-shells/bash-4.0 dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143 systemd? ( sys-apps/systemd ) dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=mount and unmount removable devices without a password
 EAPI=5
 HOMEPAGE=http://ignorantguru.github.com/udevil/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-shells/bash-4.0 dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143 systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=https://github.com/IgnorantGuru/udevil/archive/0.4.0.tar.gz -> udevil-0.4.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
 _md5_=c1e0a84a3e72dce5ebbc1dc22f419c5e
diff --git a/metadata/md5-cache/sys-apps/udevil-0.4.1 b/metadata/md5-cache/sys-apps/udevil-0.4.1
index 77a0554eec08..6f66e338de3f 100644
--- a/metadata/md5-cache/sys-apps/udevil-0.4.1
+++ b/metadata/md5-cache/sys-apps/udevil-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=app-shells/bash-4.0 dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143 systemd? ( sys-apps/systemd ) dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-shells/bash-4.0 dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143 systemd? ( sys-apps/systemd ) dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=mount and unmount removable devices without a password
 EAPI=5
 HOMEPAGE=http://ignorantguru.github.com/udevil/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-shells/bash-4.0 dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143 systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/udevil-0.4.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=87bfd7c4c352f3b0fbb4a14c55fc4e54
diff --git a/metadata/md5-cache/sys-apps/usbredir-9999 b/metadata/md5-cache/sys-apps/usbredir-9999
index 456223277735..ce9213cd82a7 100644
--- a/metadata/md5-cache/sys-apps/usbredir-9999
+++ b/metadata/md5-cache/sys-apps/usbredir-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install unpack
-DEPEND=virtual/libusb:1 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=virtual/libusb:1 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=A simple TCP daemon and set of libraries for the usbredir protocol (redirecting USB traffic)
 EAPI=5
 HOMEPAGE=http://spice-space.org/page/UsbRedir
@@ -7,5 +7,5 @@ IUSE=static-libs
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=virtual/libusb:1
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=98099e9674b55225aecfe401fe3f564c
diff --git a/metadata/md5-cache/sys-apps/usbutils-006-r1 b/metadata/md5-cache/sys-apps/usbutils-006-r1
index 2ad095dfb86b..38900b4c6408 100644
--- a/metadata/md5-cache/sys-apps/usbutils-006-r1
+++ b/metadata/md5-cache/sys-apps/usbutils-006-r1
@@ -4,10 +4,10 @@ DESCRIPTION=USB enumeration utilities
 EAPI=5
 HOMEPAGE=http://linux-usb.sourceforge.net/
 IUSE=python zlib python_targets_python2_7 python_single_target_python2_7
-KEYWORDS=~alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1= zlib? ( sys-libs/zlib:= ) sys-apps/hwids python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/usb/usbutils/usbutils-006.tar.xz
 _eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=72071ca560ce53462a6e9e253c3bebf8
+_md5_=625a89bd6c8aa92a2cbf1a9f997343e3
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.20.1-r1 b/metadata/md5-cache/sys-apps/util-linux-2.20.1-r1
index 138f36eba21f..82e71f72c55e 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.20.1-r1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.20.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=!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 uclibc? ( || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool )
+DEPEND=!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 uclibc? ( || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool )
 DESCRIPTION=Various useful Linux utilities
 EAPI=3
 HOMEPAGE=http://www.kernel.org/pub/linux/utils/util-linux/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=!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 )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.20/util-linux-2.20.1.tar.bz2 loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.20-20110905.diff.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5a8161c8b6bfe5bb590caeb5ece05a95
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.20.1-r2 b/metadata/md5-cache/sys-apps/util-linux-2.20.1-r2
index db975ac23549..bf2d2c282a8c 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.20.1-r2
+++ b/metadata/md5-cache/sys-apps/util-linux-2.20.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=!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 uclibc? ( || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool )
+DEPEND=!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 uclibc? ( || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool )
 DESCRIPTION=Various useful Linux utilities
 EAPI=3
 HOMEPAGE=http://www.kernel.org/pub/linux/utils/util-linux/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=!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 )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.20/util-linux-2.20.1.tar.bz2 loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.20-20110905.diff.bz2 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=869234edea0244db132362bc11aed761
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.21.1 b/metadata/md5-cache/sys-apps/util-linux-2.21.1
index 919c7236e8fc..4631534d61fa 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.21.1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.21.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=!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 uclibc? ( || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool )
+DEPEND=!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 uclibc? ( || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool )
 DESCRIPTION=Various useful Linux utilities
 EAPI=3
 HOMEPAGE=http://www.kernel.org/pub/linux/utils/util-linux/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=!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 )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.21/util-linux-2.21.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3905acb65c08fd974c19c1ab081ff7fa
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.21.2 b/metadata/md5-cache/sys-apps/util-linux-2.21.2
index f1e5d777e185..b540fd04b045 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.21.2
+++ b/metadata/md5-cache/sys-apps/util-linux-2.21.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=!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 ) udev? ( virtual/udev ) nls? ( sys-devel/gettext ) virtual/os-headers uclibc? ( || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool )
+DEPEND=!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 ) udev? ( virtual/udev ) nls? ( sys-devel/gettext ) virtual/os-headers uclibc? ( || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool )
 DESCRIPTION=Various useful Linux utilities
 EAPI=3
 HOMEPAGE=http://www.kernel.org/pub/linux/utils/util-linux/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=!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 ) udev? ( virtual/udev )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.21/util-linux-2.21.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0cc4a0364c77db9323c1dc917259eb95
diff --git a/metadata/md5-cache/sys-apps/util-linux-9999 b/metadata/md5-cache/sys-apps/util-linux-9999
index 57d8d2abc480..11ff80fe9d4f 100644
--- a/metadata/md5-cache/sys-apps/util-linux-9999
+++ b/metadata/md5-cache/sys-apps/util-linux-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r4 !sys-block/eject !<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 ) udev? ( virtual/udev ) nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r4 !sys-block/eject !<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 ) udev? ( virtual/udev ) nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Various useful Linux utilities
 EAPI=3
 HOMEPAGE=http://www.kernel.org/pub/linux/utils/util-linux/
@@ -7,5 +7,5 @@ IUSE=+cramfs crypt ddate ncurses nls old-linux perl selinux slang static-libs +s
 LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r4 !sys-block/eject !<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 ) udev? ( virtual/udev )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cc25b6f04ff651a75b67645444214db7
diff --git a/metadata/md5-cache/sys-apps/vbetool-1.1 b/metadata/md5-cache/sys-apps/vbetool-1.1
index 63c7c28c33d5..f3e6d226dea2 100644
--- a/metadata/md5-cache/sys-apps/vbetool-1.1
+++ b/metadata/md5-cache/sys-apps/vbetool-1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=sys-libs/zlib sys-apps/pciutils >=dev-libs/libx86-1.1-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib sys-apps/pciutils >=dev-libs/libx86-1.1-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Run real-mode video BIOS code to alter hardware state (i.e. reinitialize video card)
 EAPI=4
 HOMEPAGE=http://www.codon.org.uk/~mjg59/vbetool/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib sys-apps/pciutils >=dev-libs/libx86-1.1-r1
 SLOT=0
 SRC_URI=http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=764ffecb295e7f9c34d884ba99217b3c
diff --git a/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320-r1 b/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320-r1
index 5a4c31b4e041..0e448d21bf40 100644
--- a/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320-r1
+++ b/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.22:2= sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-171 ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.110 ) dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xmlto ) test? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.22:2= sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-171 ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.110 ) dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xmlto ) test? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Framework for defining and tracking users, login sessions and seats.
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/ConsoleKit
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.22:2= sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-171 ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.110 ) kernel_linux? ( sys-apps/coreutils[acl?] ) selinux? ( sec-policy/selinux-consolekit )
 SLOT=0
 SRC_URI=mirror://gentoo/ConsoleKit-0.4.5_p20120320.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4515c210336f29bd2e6e18d081a00801
diff --git a/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320-r2 b/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320-r2
index 5d725a38962d..dd37a6aa3ddd 100644
--- a/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320-r2
+++ b/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.22:2= sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-171 ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.110 ) dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xmlto ) test? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.22:2= sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-171 ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.110 ) dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xmlto ) test? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Framework for defining and tracking users, login sessions and seats.
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/ConsoleKit
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.22:2= sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-171 ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.110 ) kernel_linux? ( sys-apps/coreutils[acl?] ) selinux? ( sec-policy/selinux-consolekit )
 SLOT=0
 SRC_URI=mirror://gentoo/ConsoleKit-0.4.5_p20120320.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=86854b1960462151e5dffbb7af8281ce
diff --git a/metadata/md5-cache/sys-auth/fprintd-0.2.0-r1 b/metadata/md5-cache/sys-auth/fprintd-0.2.0-r1
index 6a3ecc474e11..b1e65dbfb61a 100644
--- a/metadata/md5-cache/sys-auth/fprintd-0.2.0-r1
+++ b/metadata/md5-cache/sys-auth/fprintd-0.2.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-auth/libfprint sys-auth/polkit pam? ( sys-libs/pam ) dev-util/gtk-doc dev-util/gtk-doc-am dev-util/intltool doc? ( dev-libs/libxml2 dev-libs/libxslt ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-auth/libfprint sys-auth/polkit pam? ( sys-libs/pam ) dev-util/gtk-doc dev-util/gtk-doc-am dev-util/intltool doc? ( dev-libs/libxml2 dev-libs/libxslt ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=D-Bus service to access fingerprint readers
 EAPI=4
 HOMEPAGE=http://cgit.freedesktop.org/libfprint/fprintd/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-auth/libfprint sys-auth/polkit pam? ( sys-libs/pam )
 SLOT=0
 SRC_URI=http://cgit.freedesktop.org/libfprint/fprintd/snapshot/V_0_2_0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=589a7e973070c01c09be845d3b21cb46
diff --git a/metadata/md5-cache/sys-auth/fprintd-0.4.1 b/metadata/md5-cache/sys-auth/fprintd-0.4.1
index 34b7a6f6f5fa..ee7e2a0cfdba 100644
--- a/metadata/md5-cache/sys-auth/fprintd-0.4.1
+++ b/metadata/md5-cache/sys-auth/fprintd-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-auth/libfprint sys-auth/polkit pam? ( sys-libs/pam ) dev-util/gtk-doc dev-util/gtk-doc-am dev-util/intltool doc? ( dev-libs/libxml2 dev-libs/libxslt ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-auth/libfprint sys-auth/polkit pam? ( sys-libs/pam ) dev-util/gtk-doc dev-util/gtk-doc-am dev-util/intltool doc? ( dev-libs/libxml2 dev-libs/libxslt ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=D-Bus service to access fingerprint readers
 EAPI=4
 HOMEPAGE=http://cgit.freedesktop.org/libfprint/fprintd/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-auth/libfprint sys-auth/polkit pam? ( sys-libs/pam )
 SLOT=0
 SRC_URI=http://cgit.freedesktop.org/libfprint/fprintd/snapshot/V_0_4_1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f1a39554d0df56a59fd8c5dc2bf3fa42
diff --git a/metadata/md5-cache/sys-auth/libfprint-0.4.0 b/metadata/md5-cache/sys-auth/libfprint-0.4.0
index 6858633de79e..cdbdc42d8e6c 100644
--- a/metadata/md5-cache/sys-auth/libfprint-0.4.0
+++ b/metadata/md5-cache/sys-auth/libfprint-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=virtual/libusb:1 dev-libs/nss || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] x11-libs/gdk-pixbuf ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=virtual/libusb:1 dev-libs/nss || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] x11-libs/gdk-pixbuf ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=library to add support for consumer fingerprint readers
 EAPI=4
 HOMEPAGE=http://cgit.freedesktop.org/libfprint/libfprint/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:1 dev-libs/nss || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] x11-libs/gdk-pixbuf )
 SLOT=0
 SRC_URI=http://cgit.freedesktop.org/libfprint/libfprint/snapshot/v_0_4_0.tar.bz2 -> libfprint-0.4.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4b46e4abf99918d6ad9d01bd9a98b06c
diff --git a/metadata/md5-cache/sys-auth/libfprint-0.5.0 b/metadata/md5-cache/sys-auth/libfprint-0.5.0
index 16887d85161b..9ccc3599d573 100644
--- a/metadata/md5-cache/sys-auth/libfprint-0.5.0
+++ b/metadata/md5-cache/sys-auth/libfprint-0.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=virtual/libusb:1 dev-libs/nss || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] x11-libs/gdk-pixbuf ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=virtual/libusb:1 dev-libs/nss || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] x11-libs/gdk-pixbuf ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=library to add support for consumer fingerprint readers
 EAPI=4
 HOMEPAGE=http://cgit.freedesktop.org/libfprint/libfprint/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:1 dev-libs/nss || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] x11-libs/gdk-pixbuf )
 SLOT=0
 SRC_URI=http://cgit.freedesktop.org/libfprint/libfprint/snapshot/v_0_5_0.tar.bz2 -> libfprint-0.5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
 _md5_=e6238845a006dac103668e76e2d566ba
diff --git a/metadata/md5-cache/sys-auth/libnss-mysql-1.5_p20060915-r1 b/metadata/md5-cache/sys-auth/libnss-mysql-1.5_p20060915-r1
index 72215b2fd41b..104ccb0e23af 100644
--- a/metadata/md5-cache/sys-auth/libnss-mysql-1.5_p20060915-r1
+++ b/metadata/md5-cache/sys-auth/libnss-mysql-1.5_p20060915-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=virtual/mysql || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/mysql || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NSS MySQL Library.
 EAPI=2
 HOMEPAGE=http://libnss-mysql.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/mysql
 SLOT=0
 SRC_URI=http://libnss-mysql.sourceforge.net/snapshot/libnss-mysql-20060915.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e90915c67a5992fa9224b649aee2d958
diff --git a/metadata/md5-cache/sys-auth/libnss-mysql-1.5_p20060915-r2 b/metadata/md5-cache/sys-auth/libnss-mysql-1.5_p20060915-r2
index e2a0f02e80c0..eff1beffd4fd 100644
--- a/metadata/md5-cache/sys-auth/libnss-mysql-1.5_p20060915-r2
+++ b/metadata/md5-cache/sys-auth/libnss-mysql-1.5_p20060915-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=virtual/mysql || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/mysql || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NSS MySQL Library.
 EAPI=2
 HOMEPAGE=http://libnss-mysql.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/mysql
 SLOT=0
 SRC_URI=http://libnss-mysql.sourceforge.net/snapshot/libnss-mysql-20060915.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c0989bd510843a0031b85d28804c916a
diff --git a/metadata/md5-cache/sys-auth/libnss-pgsql-1.4.0 b/metadata/md5-cache/sys-auth/libnss-pgsql-1.4.0
index 235a1c36b591..7e5279749ba8 100644
--- a/metadata/md5-cache/sys-auth/libnss-pgsql-1.4.0
+++ b/metadata/md5-cache/sys-auth/libnss-pgsql-1.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=dev-db/postgresql-base app-text/xmlto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-db/postgresql-base app-text/xmlto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Name Service Switch module for use with PostgreSQL
 HOMEPAGE=http://pgfoundry.org/projects/sysauth/
 KEYWORDS=~x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/postgresql-base app-text/xmlto
 SLOT=0
 SRC_URI=http://pgfoundry.org/frs/download.php/605/libnss-pgsql-1.4.0.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6572e84cacaca8db1ad960d25dcf9ebb
diff --git a/metadata/md5-cache/sys-auth/libnss-pgsql-1.5.0_beta b/metadata/md5-cache/sys-auth/libnss-pgsql-1.5.0_beta
index a9e7fe5bc4cc..068677e22820 100644
--- a/metadata/md5-cache/sys-auth/libnss-pgsql-1.5.0_beta
+++ b/metadata/md5-cache/sys-auth/libnss-pgsql-1.5.0_beta
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=dev-db/postgresql-base app-text/xmlto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-db/postgresql-base app-text/xmlto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Name Service Switch module for use with PostgreSQL
 HOMEPAGE=http://pgfoundry.org/projects/sysauth/
 KEYWORDS=~amd64 ~x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/postgresql-base
 SLOT=0
 SRC_URI=http://pgfoundry.org/frs/download.php/1878/libnss-pgsql-1.5.0-beta.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5048d702f1ab20955a02b7cb21c0719b
diff --git a/metadata/md5-cache/sys-auth/libyubikey-1.10 b/metadata/md5-cache/sys-auth/libyubikey-1.10
index e251726c163c..8d5ed0f89484 100644
--- a/metadata/md5-cache/sys-auth/libyubikey-1.10
+++ b/metadata/md5-cache/sys-auth/libyubikey-1.10
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://yubico-c.googlecode.com/files/libyubikey-1.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=98ae42b8377a635cdb5dc55a9bd15a30
diff --git a/metadata/md5-cache/sys-auth/nss-mdns-0.10-r1 b/metadata/md5-cache/sys-auth/nss-mdns-0.10-r1
index f78bc30bcf5e..a617bd4139c2 100644
--- a/metadata/md5-cache/sys-auth/nss-mdns-0.10-r1
+++ b/metadata/md5-cache/sys-auth/nss-mdns-0.10-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=net-dns/avahi || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-dns/avahi || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Name Service Switch module for Multicast DNS
 EAPI=4
 HOMEPAGE=http://0pointer.de/lennart/projects/nss-mdns/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-dns/avahi
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ba32631151822960ad5ec19d23ff3e7f
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-258 b/metadata/md5-cache/sys-auth/nss_ldap-258
index 4e51a5b4735a..0251b50b850b 100644
--- a/metadata/md5-cache/sys-auth/nss_ldap-258
+++ b/metadata/md5-cache/sys-auth/nss_ldap-258
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NSS LDAP Module
 HOMEPAGE=http://www.padl.com/OSS/nss_ldap.html
 IUSE=debug sasl kerberos
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) !<net-fs/autofs-4.1.3
 SLOT=0
 SRC_URI=http://www.padl.com/download/nss_ldap-258.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ba2b5a85d812e5912495db459609eb06
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-259 b/metadata/md5-cache/sys-auth/nss_ldap-259
index 1ad2ba94be98..ac847268e7da 100644
--- a/metadata/md5-cache/sys-auth/nss_ldap-259
+++ b/metadata/md5-cache/sys-auth/nss_ldap-259
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NSS LDAP Module
 HOMEPAGE=http://www.padl.com/OSS/nss_ldap.html
 IUSE=debug sasl kerberos
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) !<net-fs/autofs-4.1.3
 SLOT=0
 SRC_URI=http://www.padl.com/download/nss_ldap-259.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b0e7b2baa3fdb7f1cada5acc39cda662
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-261 b/metadata/md5-cache/sys-auth/nss_ldap-261
index 4cfb20a06eed..0b0431862ee7 100644
--- a/metadata/md5-cache/sys-auth/nss_ldap-261
+++ b/metadata/md5-cache/sys-auth/nss_ldap-261
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NSS LDAP Module
 HOMEPAGE=http://www.padl.com/OSS/nss_ldap.html
 IUSE=debug sasl kerberos
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) !<net-fs/autofs-4.1.3
 SLOT=0
 SRC_URI=http://www.padl.com/download/nss_ldap-261.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=90cf44ae5ac71051d65b8d8d89e26683
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-262 b/metadata/md5-cache/sys-auth/nss_ldap-262
index 187a120efd45..d17e5e603d71 100644
--- a/metadata/md5-cache/sys-auth/nss_ldap-262
+++ b/metadata/md5-cache/sys-auth/nss_ldap-262
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NSS LDAP Module
 HOMEPAGE=http://www.padl.com/OSS/nss_ldap.html
 IUSE=debug sasl kerberos
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) !<net-fs/autofs-4.1.3
 SLOT=0
 SRC_URI=http://www.padl.com/download/nss_ldap-262.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a2ffe708b720ae3f43203d8767a4ab3
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-264 b/metadata/md5-cache/sys-auth/nss_ldap-264
index 315cc305e224..30f361cedccc 100644
--- a/metadata/md5-cache/sys-auth/nss_ldap-264
+++ b/metadata/md5-cache/sys-auth/nss_ldap-264
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NSS LDAP Module
 EAPI=2
 HOMEPAGE=http://www.padl.com/OSS/nss_ldap.html
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=http://www.padl.com/download/nss_ldap-264.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e02373161a25ee251bc814db143a907d
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-264-r1 b/metadata/md5-cache/sys-auth/nss_ldap-264-r1
index 2c7ef818ce1b..990cb466487e 100644
--- a/metadata/md5-cache/sys-auth/nss_ldap-264-r1
+++ b/metadata/md5-cache/sys-auth/nss_ldap-264-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NSS LDAP Module
 EAPI=2
 HOMEPAGE=http://www.padl.com/OSS/nss_ldap.html
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=http://www.padl.com/download/nss_ldap-264.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=960019d48946697da1bf9abb8e1cf197
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-265 b/metadata/md5-cache/sys-auth/nss_ldap-265
index 61224b19c943..cbb1c9303d64 100644
--- a/metadata/md5-cache/sys-auth/nss_ldap-265
+++ b/metadata/md5-cache/sys-auth/nss_ldap-265
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NSS LDAP Module
 EAPI=2
 HOMEPAGE=http://www.padl.com/OSS/nss_ldap.html
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=http://www.padl.com/download/nss_ldap-265.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db3f2705ff2866a0ee76bde0c6307c4d
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-265-r1 b/metadata/md5-cache/sys-auth/nss_ldap-265-r1
index b9be324e6fd9..1fe5ebb4fe19 100644
--- a/metadata/md5-cache/sys-auth/nss_ldap-265-r1
+++ b/metadata/md5-cache/sys-auth/nss_ldap-265-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NSS LDAP Module
 EAPI=2
 HOMEPAGE=http://www.padl.com/OSS/nss_ldap.html
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=http://www.padl.com/download/nss_ldap-265.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=26e30f7a1668da8910af2d091f982542
diff --git a/metadata/md5-cache/sys-auth/openpam-20071221 b/metadata/md5-cache/sys-auth/openpam-20071221
index 8c9ab2247487..9a1c3e6f244c 100644
--- a/metadata/md5-cache/sys-auth/openpam-20071221
+++ b/metadata/md5-cache/sys-auth/openpam-20071221
@@ -10,5 +10,5 @@ PDEPEND=sys-auth/pambase vim-syntax? ( app-vim/pam-syntax )
 RDEPEND=!sys-libs/pam
 SLOT=0
 SRC_URI=mirror://sourceforge/openpam/openpam-20071221.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b2fa9201b3bc09ed5f3ea52d434b7811
diff --git a/metadata/md5-cache/sys-auth/openpam-20111218 b/metadata/md5-cache/sys-auth/openpam-20111218
index 88091750147d..442aa1630990 100644
--- a/metadata/md5-cache/sys-auth/openpam-20111218
+++ b/metadata/md5-cache/sys-auth/openpam-20111218
@@ -10,5 +10,5 @@ PDEPEND=sys-auth/pambase vim-syntax? ( app-vim/pam-syntax )
 RDEPEND=!sys-libs/pam
 SLOT=0
 SRC_URI=mirror://sourceforge/openpam/openpam-20111218.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b05caaf4a83be54630e52ae2e0375aed
diff --git a/metadata/md5-cache/sys-auth/openpam-20120526 b/metadata/md5-cache/sys-auth/openpam-20120526
index 1f6407602168..b2daaa952b82 100644
--- a/metadata/md5-cache/sys-auth/openpam-20120526
+++ b/metadata/md5-cache/sys-auth/openpam-20120526
@@ -10,5 +10,5 @@ PDEPEND=sys-auth/pambase vim-syntax? ( app-vim/pam-syntax )
 RDEPEND=!sys-libs/pam
 SLOT=0
 SRC_URI=mirror://sourceforge/openpam/openpam-20120526.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=150d4054e093dd1021131f3504de2415
diff --git a/metadata/md5-cache/sys-auth/pam_blue-0.9.0 b/metadata/md5-cache/sys-auth/pam_blue-0.9.0
index b3214a87004a..bdefbcb5eff3 100644
--- a/metadata/md5-cache/sys-auth/pam_blue-0.9.0
+++ b/metadata/md5-cache/sys-auth/pam_blue-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=virtual/pam net-wireless/bluez || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pam net-wireless/bluez || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Linux PAM module providing ability to authenticate via a bluetooth compatible device
 HOMEPAGE=http://pam.0xdef.net/
 KEYWORDS=~amd64 ~x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/pam net-wireless/bluez
 SLOT=0
 SRC_URI=http://pam.0xdef.net/source/pam_blue-0.9.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=62059b46b271ebc7f5285efa3925b429
diff --git a/metadata/md5-cache/sys-auth/pam_dotfile-0.7-r1 b/metadata/md5-cache/sys-auth/pam_dotfile-0.7-r1
index acae397e1efd..2a5196802a0d 100644
--- a/metadata/md5-cache/sys-auth/pam_dotfile-0.7-r1
+++ b/metadata/md5-cache/sys-auth/pam_dotfile-0.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=virtual/pam doc? ( www-client/lynx ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pam doc? ( www-client/lynx ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=pam module to allow password-storing in $HOME/dotfiles
 HOMEPAGE=http://0pointer.de/lennart/projects/pam_dotfile/
 IUSE=doc
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/pam
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/pam_dotfile/pam_dotfile-0.7.tar.gz http://digilander.libero.it/dgp85/gentoo/pam_dotfile-patches-1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=43b60577b4253887c9458ec9753f1637
diff --git a/metadata/md5-cache/sys-auth/pam_dotfile-0.7-r2 b/metadata/md5-cache/sys-auth/pam_dotfile-0.7-r2
index 4b31f5dce737..0615758746ce 100644
--- a/metadata/md5-cache/sys-auth/pam_dotfile-0.7-r2
+++ b/metadata/md5-cache/sys-auth/pam_dotfile-0.7-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pam doc? ( www-client/lynx ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pam doc? ( www-client/lynx ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=pam module to allow password-storing in $HOME/dotfiles
 EAPI=5
 HOMEPAGE=http://0pointer.de/lennart/projects/pam_dotfile/ https://github.com/gentoo/pam_dotfile/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/pam
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/pam_dotfile/pam_dotfile-0.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cd0f8365ccc43d1f6f4a3a756f0e1df8
diff --git a/metadata/md5-cache/sys-auth/pam_ldap-183 b/metadata/md5-cache/sys-auth/pam_ldap-183
index 12a8bb1d28b7..9a36672d6c5b 100644
--- a/metadata/md5-cache/sys-auth/pam_ldap-183
+++ b/metadata/md5-cache/sys-auth/pam_ldap-183
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=sys-libs/glibc-2.1.3 >=sys-libs/pam-0.72 >=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/glibc-2.1.3 >=sys-libs/pam-0.72 >=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=PAM LDAP Module
 HOMEPAGE=http://www.padl.com/OSS/pam_ldap.html
 IUSE=ssl sasl
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 LGPL-2 )
 RDEPEND=>=sys-libs/glibc-2.1.3 >=sys-libs/pam-0.72 >=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://www.padl.com/download/pam_ldap-183.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dc2a5ab46f2a26596a0f1a81b44d1f7e
diff --git a/metadata/md5-cache/sys-auth/pam_ldap-184 b/metadata/md5-cache/sys-auth/pam_ldap-184
index 861f31fbc6a9..5b5d75468ba1 100644
--- a/metadata/md5-cache/sys-auth/pam_ldap-184
+++ b/metadata/md5-cache/sys-auth/pam_ldap-184
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=sys-libs/glibc-2.1.3 >=sys-libs/pam-0.72 >=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/glibc-2.1.3 >=sys-libs/pam-0.72 >=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=PAM LDAP Module
 HOMEPAGE=http://www.padl.com/OSS/pam_ldap.html
 IUSE=ssl sasl
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 LGPL-2 )
 RDEPEND=>=sys-libs/glibc-2.1.3 >=sys-libs/pam-0.72 >=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://www.padl.com/download/pam_ldap-184.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a027266586160e25b5e16e6e905f2ea
diff --git a/metadata/md5-cache/sys-auth/pam_mount-2.11 b/metadata/md5-cache/sys-auth/pam_mount-2.11
index 8863ff9c9a0f..437b050f922a 100644
--- a/metadata/md5-cache/sys-auth/pam_mount-2.11
+++ b/metadata/md5-cache/sys-auth/pam_mount-2.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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 ) virtual/pkgconfig app-arch/xz-utils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig app-arch/xz-utils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A PAM module that can mount volumes for a user session
 EAPI=4
 HOMEPAGE=http://pam-mount.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-mount/pam_mount-2.11.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b3c24c6737bb0be787f65433601b8489
diff --git a/metadata/md5-cache/sys-auth/pam_mount-2.13-r1 b/metadata/md5-cache/sys-auth/pam_mount-2.13-r1
index 77f1ae4f96f0..ded2038a52c3 100644
--- a/metadata/md5-cache/sys-auth/pam_mount-2.13-r1
+++ b/metadata/md5-cache/sys-auth/pam_mount-2.13-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/pam-0.99 >=sys-libs/libhx-3.12.1 >=dev-libs/libxml2-2.6 crypt? ( >=sys-fs/cryptsetup-1.1.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) selinux? ( sys-libs/libselinux ) virtual/pkgconfig app-arch/xz-utils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/pam-0.99 >=sys-libs/libhx-3.12.1 >=dev-libs/libxml2-2.6 crypt? ( >=sys-fs/cryptsetup-1.1.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) selinux? ( sys-libs/libselinux ) virtual/pkgconfig app-arch/xz-utils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A PAM module that can mount volumes for a user session
 EAPI=4
 HOMEPAGE=http://pam-mount.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/pam-0.99 >=sys-libs/libhx-3.12.1 >=dev-libs/libxml2-2.6 crypt? ( >=sys-fs/cryptsetup-1.1.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) selinux? ( sys-libs/libselinux ) >=sys-apps/util-linux-2.20
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-mount/pam_mount-2.13.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=232211d0b1303f1517b6c1afce0e570a
diff --git a/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r3 b/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r3
index 0b0cbf6c2f94..0984521b0690 100644
--- a/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r3
+++ b/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-libs/pam-0.72 virtual/mysql || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/pam-0.72 virtual/mysql || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=pam_mysql is a module for pam to authenticate users with mysql
 EAPI=2
 HOMEPAGE=http://pam-mysql.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/pam-0.72 virtual/mysql
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-mysql/pam_mysql-0.7RC1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=27b794c1ea351d521ae8cfc7339a629a
diff --git a/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r4 b/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r4
index a3c2f1af5c74..84d2f5113449 100644
--- a/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r4
+++ b/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-libs/pam-0.72 virtual/mysql || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/pam-0.72 virtual/mysql || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=pam_mysql is a module for pam to authenticate users with mysql
 EAPI=2
 HOMEPAGE=http://pam-mysql.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/pam-0.72 virtual/mysql
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-mysql/pam_mysql-0.7RC1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e2bebadd1c8edbeb8e33f65af6b66843
diff --git a/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r3 b/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r3
index 48cf4ec5137e..02370369d7dc 100644
--- a/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r3
+++ b/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst prepare
-DEPEND=>=sys-libs/pam-0.78-r3 >=sys-auth/skey-1.1.5-r4 app-arch/xz-utils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/pam-0.78-r3 >=sys-auth/skey-1.1.5-r4 app-arch/xz-utils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=PAM interface for the S/Key authentication system
 EAPI=4
 HOMEPAGE=http://freshmeat.net/projects/pam_skey/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/pam-0.78-r3 >=sys-auth/skey-1.1.5-r4
 SLOT=0
 SRC_URI=http://dkorunic.net/tarballs/pam_skey-1.1.5.tar.gz mirror://gentoo/pam_skey-1.1.5-patches-4.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=347b78a1557186aa8911736f3abad8c9
diff --git a/metadata/md5-cache/sys-auth/pam_ssh-1.97-r1 b/metadata/md5-cache/sys-auth/pam_ssh-1.97-r1
index 2f126d80c810..67d06391322a 100644
--- a/metadata/md5-cache/sys-auth/pam_ssh-1.97-r1
+++ b/metadata/md5-cache/sys-auth/pam_ssh-1.97-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-libs/pam sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/pam sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Uses ssh-agent to provide single sign-on
 EAPI=2
 HOMEPAGE=http://pam-ssh.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=BSD-2 BSD ISC
 RDEPEND=sys-libs/pam virtual/ssh
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-ssh/pam_ssh-1.97.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=508ffc4ffed6a2f3bd546882649d2eaa
diff --git a/metadata/md5-cache/sys-auth/pam_ssh-1.97-r2 b/metadata/md5-cache/sys-auth/pam_ssh-1.97-r2
index 4c19d56679c1..926566b1d19d 100644
--- a/metadata/md5-cache/sys-auth/pam_ssh-1.97-r2
+++ b/metadata/md5-cache/sys-auth/pam_ssh-1.97-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-libs/pam net-misc/openssh sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/pam net-misc/openssh sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Uses ssh-agent to provide single sign-on
 EAPI=2
 HOMEPAGE=http://pam-ssh.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=BSD-2 BSD ISC
 RDEPEND=sys-libs/pam net-misc/openssh
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-ssh/pam_ssh-1.97.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=72ef5460a78cd736a93d76ae82de3658
diff --git a/metadata/md5-cache/sys-auth/pam_ssh-1.97-r3 b/metadata/md5-cache/sys-auth/pam_ssh-1.97-r3
index 6cd0269d3309..1c1a70b6cbac 100644
--- a/metadata/md5-cache/sys-auth/pam_ssh-1.97-r3
+++ b/metadata/md5-cache/sys-auth/pam_ssh-1.97-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-libs/pam net-misc/openssh sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/pam net-misc/openssh sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Uses ssh-agent to provide single sign-on
 EAPI=2
 HOMEPAGE=http://pam-ssh.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=BSD-2 BSD ISC
 RDEPEND=sys-libs/pam net-misc/openssh
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-ssh/pam_ssh-1.97.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b094ce33afb799df2e5fe5d5ec25b578
diff --git a/metadata/md5-cache/sys-auth/pam_yubico-2.13 b/metadata/md5-cache/sys-auth/pam_yubico-2.13
index 8b2b70852ccb..909fb45444eb 100644
--- a/metadata/md5-cache/sys-auth/pam_yubico-2.13
+++ b/metadata/md5-cache/sys-auth/pam_yubico-2.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=virtual/pam >=sys-auth/ykclient-2.4 >=sys-auth/ykpers-1.6 ldap? ( net-nds/openldap ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pam >=sys-auth/ykclient-2.4 >=sys-auth/ykpers-1.6 ldap? ( net-nds/openldap ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for authenticating against PAM with a Yubikey
 EAPI=5
 HOMEPAGE=https://code.google.com/p/yubico-pam/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/pam >=sys-auth/ykclient-2.4 >=sys-auth/ykpers-1.6 ldap? ( net-nds/openldap )
 SLOT=0
 SRC_URI=http://yubico-pam.googlecode.com/files/pam_yubico-2.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=31d5146e913dcbbd00c5f0b475335e6a
diff --git a/metadata/md5-cache/sys-auth/sssd-1.8.6 b/metadata/md5-cache/sys-auth/sssd-1.8.6
index 4e6130990cb4..e33f27fbe48a 100644
--- a/metadata/md5-cache/sys-auth/sssd-1.8.6
+++ b/metadata/md5-cache/sys-auth/sssd-1.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=virtual/pam dev-libs/popt dev-libs/glib:2 >=dev-libs/ding-libs-0.1.2 >=sys-libs/talloc-2.0 sys-libs/tdb sys-libs/tevent sys-libs/ldb >=net-nds/openldap-2.4.19 !!~net-nds/openldap-2.4.28 dev-libs/libpcre >=app-crypt/mit-krb5-1.9.1 sys-apps/keyutils >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.0.94 >=sys-libs/libsemanage-2.0.45 sec-policy/selinux-sssd ) net-dns/bind-tools dev-libs/cyrus-sasl sys-apps/dbus nls? ( >=sys-devel/gettext-0.17 ) virtual/libintl netlink? ( dev-libs/libnl ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://fedorahosted.org/released/sssd/sssd-1.8.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0375ee20525d95aca5570f9bc19f0e1b
diff --git a/metadata/md5-cache/sys-auth/sssd-1.8.6-r1 b/metadata/md5-cache/sys-auth/sssd-1.8.6-r1
index 3654f8ace0b9..4a90ea56db47 100644
--- a/metadata/md5-cache/sys-auth/sssd-1.8.6-r1
+++ b/metadata/md5-cache/sys-auth/sssd-1.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=virtual/pam dev-libs/popt dev-libs/glib:2 >=dev-libs/ding-libs-0.1.2 >=sys-libs/talloc-2.0 sys-libs/tdb sys-libs/tevent sys-libs/ldb >=net-nds/openldap-2.4.19 !!~net-nds/openldap-2.4.28 dev-libs/libpcre >=app-crypt/mit-krb5-1.9.1 sys-apps/keyutils >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.0.94 >=sys-libs/libsemanage-2.0.45 sec-policy/selinux-sssd ) net-dns/bind-tools dev-libs/cyrus-sasl sys-apps/dbus nls? ( >=sys-devel/gettext-0.17 ) virtual/libintl netlink? ( dev-libs/libnl ) || ( <=sys-libs/glibc-2.16.9999 >=sys-libs/glibc-2.17[nscd] ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://fedorahosted.org/released/sssd/sssd-1.8.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1c887778b62670314171bb3d22d9ab9a
diff --git a/metadata/md5-cache/sys-auth/sssd-1.9.4 b/metadata/md5-cache/sys-auth/sssd-1.9.4
index 596952d86953..62aaead8cc2f 100644
--- a/metadata/md5-cache/sys-auth/sssd-1.9.4
+++ b/metadata/md5-cache/sys-auth/sssd-1.9.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=virtual/pam >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.13 >=net-nds/openldap-2.4.30 >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 >=net-fs/samba-4 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 >=sec-policy/selinux-sssd-2.20120725-r9 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) test? ( dev-libs/check ) manpages? ( >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.4 ) doc? ( app-doc/doxygen ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pam >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.13 >=net-nds/openldap-2.4.30 >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 >=net-fs/samba-4 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 >=sec-policy/selinux-sssd-2.20120725-r9 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) test? ( dev-libs/check ) manpages? ( >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.4 ) doc? ( app-doc/doxygen ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=System Security Services Daemon provides access to identity and authentication
 EAPI=4
 HOMEPAGE=http://fedorahosted.org/sssd/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=virtual/pam >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.13 >=net-nds/openldap-2.4.30 >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 >=net-fs/samba-4 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 >=sec-policy/selinux-sssd-2.20120725-r9 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://fedorahosted.org/released/sssd/sssd-1.9.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0e215f66c7dc0d5cdfc85456b6ce4db3
diff --git a/metadata/md5-cache/sys-auth/sssd-1.9.4-r1 b/metadata/md5-cache/sys-auth/sssd-1.9.4-r1
index 078bf81b87cd..d87f8f8862fb 100644
--- a/metadata/md5-cache/sys-auth/sssd-1.9.4-r1
+++ b/metadata/md5-cache/sys-auth/sssd-1.9.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=virtual/pam >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.13 >=net-nds/openldap-2.4.30 >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 >=sec-policy/selinux-sssd-2.20120725-r9 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) test? ( dev-libs/check ) manpages? ( >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.4 ) doc? ( app-doc/doxygen ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pam >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.13 >=net-nds/openldap-2.4.30 >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 >=sec-policy/selinux-sssd-2.20120725-r9 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) test? ( dev-libs/check ) manpages? ( >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.4 ) doc? ( app-doc/doxygen ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=System Security Services Daemon provides access to identity and authentication
 EAPI=4
 HOMEPAGE=http://fedorahosted.org/sssd/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=virtual/pam >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.13 >=net-nds/openldap-2.4.30 >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 >=sec-policy/selinux-sssd-2.20120725-r9 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://fedorahosted.org/released/sssd/sssd-1.9.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0aaa550fd4f69f67e5267d77a5c249ce
diff --git a/metadata/md5-cache/sys-auth/sssd-1.9.4-r2 b/metadata/md5-cache/sys-auth/sssd-1.9.4-r2
index d0e80deaf23c..faca7394227e 100644
--- a/metadata/md5-cache/sys-auth/sssd-1.9.4-r2
+++ b/metadata/md5-cache/sys-auth/sssd-1.9.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=virtual/pam >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.13 >=net-nds/openldap-2.4.30 >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 >=sec-policy/selinux-sssd-2.20120725-r9 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) test? ( dev-libs/check ) manpages? ( >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.4 ) doc? ( app-doc/doxygen ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pam >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.13 >=net-nds/openldap-2.4.30 >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 >=sec-policy/selinux-sssd-2.20120725-r9 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) test? ( dev-libs/check ) manpages? ( >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.4 ) doc? ( app-doc/doxygen ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=System Security Services Daemon provides access to identity and authentication
 EAPI=4
 HOMEPAGE=http://fedorahosted.org/sssd/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=virtual/pam >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.13 >=net-nds/openldap-2.4.30 >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 >=sec-policy/selinux-sssd-2.20120725-r9 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) || ( <=sys-libs/glibc-2.16.9999 >=sys-libs/glibc-2.17[nscd] ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://fedorahosted.org/released/sssd/sssd-1.9.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ef9353d848f2fd6f9a14790dfdb26f52
diff --git a/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3 b/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
index 10e0b415a689..c72a9f428d45 100644
--- a/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
+++ b/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://sourceforge/thinkfinger/thinkfinger-0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6091a08605e206d5193c9b4d9332f42d
diff --git a/metadata/md5-cache/sys-block/nbd-3.3 b/metadata/md5-cache/sys-block/nbd-3.3
new file mode 100644
index 000000000000..e346bc52fcb8
--- /dev/null
+++ b/metadata/md5-cache/sys-block/nbd-3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=>=dev-libs/glib-2.0 zlib? ( sys-libs/zlib ) virtual/pkgconfig
+DESCRIPTION=Userland client/server for kernel network block device
+EAPI=4
+HOMEPAGE=http://nbd.sourceforge.net/
+IUSE=debug zlib
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.0 zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=mirror://sourceforge/nbd/nbd-3.3.tar.bz2
+_eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_md5_=24e7031b5eaf710def19926b34a84718
diff --git a/metadata/md5-cache/sys-block/parted-2.3 b/metadata/md5-cache/sys-block/parted-2.3
index 992b6db382ba..4515ba12f123 100644
--- a/metadata/md5-cache/sys-block/parted-2.3
+++ b/metadata/md5-cache/sys-block/parted-2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-fs/e2fsprogs-1.27 >=sys-libs/ncurses-5.2 nls? ( >=sys-devel/gettext-0.12.1-r2 ) readline? ( >=sys-libs/readline-5.2 ) selinux? ( sys-libs/libselinux ) device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 SLOT=0
 SRC_URI=mirror://gnu/parted/parted-2.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a4c5c3fdbae5a3718c6b5f9a9a92887a
diff --git a/metadata/md5-cache/sys-block/parted-2.3-r1 b/metadata/md5-cache/sys-block/parted-2.3-r1
index a4431b9cb609..34d6e6357413 100644
--- a/metadata/md5-cache/sys-block/parted-2.3-r1
+++ b/metadata/md5-cache/sys-block/parted-2.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-fs/e2fsprogs-1.27 >=sys-libs/ncurses-5.2 nls? ( >=sys-devel/gettext-0.12.1-r2 ) readline? ( >=sys-libs/readline-5.2 ) selinux? ( sys-libs/libselinux ) device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 SLOT=0
 SRC_URI=mirror://gnu/parted/parted-2.3.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=836e266aced2d0ceb76af0dffd04b5c1
diff --git a/metadata/md5-cache/sys-block/parted-2.3-r2 b/metadata/md5-cache/sys-block/parted-2.3-r2
index 136773c96425..6a45b811afbb 100644
--- a/metadata/md5-cache/sys-block/parted-2.3-r2
+++ b/metadata/md5-cache/sys-block/parted-2.3-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-fs/e2fsprogs-1.27 >=sys-libs/ncurses-5.2 nls? ( >=sys-devel/gettext-0.12.1-r2 ) readline? ( >=sys-libs/readline-5.2 ) selinux? ( sys-libs/libselinux ) device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 SLOT=0
 SRC_URI=mirror://gnu/parted/parted-2.3.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5c2ab828662c5907a58d6a126ecc2c8d
diff --git a/metadata/md5-cache/sys-block/parted-2.4 b/metadata/md5-cache/sys-block/parted-2.4
index 4bf610f220e1..5e85e3337a09 100644
--- a/metadata/md5-cache/sys-block/parted-2.4
+++ b/metadata/md5-cache/sys-block/parted-2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-fs/e2fsprogs-1.27 >=sys-libs/ncurses-5.2 nls? ( >=sys-devel/gettext-0.12.1-r2 ) readline? ( >=sys-libs/readline-5.2 ) selinux? ( sys-libs/libselinux ) device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 SLOT=0
 SRC_URI=mirror://gnu/parted/parted-2.4.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ee73ca44bb5caf697ecb7279bd507ff7
diff --git a/metadata/md5-cache/sys-block/parted-3.0 b/metadata/md5-cache/sys-block/parted-3.0
index d68764f543a3..62977b6ff3fe 100644
--- a/metadata/md5-cache/sys-block/parted-3.0
+++ b/metadata/md5-cache/sys-block/parted-3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-fs/e2fsprogs-1.27 >=sys-libs/ncurses-5.2 nls? ( >=sys-devel/gettext-0.12.1-r2 ) readline? ( >=sys-libs/readline-5.2 ) selinux? ( sys-libs/libselinux ) device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 SLOT=0
 SRC_URI=mirror://gnu/parted/parted-3.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=49c7061c8d91b23f030b41a616826e1f
diff --git a/metadata/md5-cache/sys-block/parted-3.1 b/metadata/md5-cache/sys-block/parted-3.1
index 6dbf99923fef..f80f70e120ac 100644
--- a/metadata/md5-cache/sys-block/parted-3.1
+++ b/metadata/md5-cache/sys-block/parted-3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-fs/e2fsprogs-1.27 >=sys-libs/ncurses-5.7-r7 nls? ( >=sys-devel/gettext-0.12.1-r2 ) readline? ( >=sys-libs/readline-5.2 ) selinux? ( sys-libs/libselinux ) device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 SLOT=0
 SRC_URI=mirror://gnu/parted/parted-3.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a5e1d550275dfa7f0b5708000f09f9b
diff --git a/metadata/md5-cache/sys-block/parted-3.1-r1 b/metadata/md5-cache/sys-block/parted-3.1-r1
index 55474612ec7d..a82520f083c3 100644
--- a/metadata/md5-cache/sys-block/parted-3.1-r1
+++ b/metadata/md5-cache/sys-block/parted-3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-fs/e2fsprogs-1.27 >=sys-libs/ncurses-5.7-r7 nls? ( >=sys-devel/gettext-0.12.1-r2 ) readline? ( >=sys-libs/readline-5.2 ) selinux? ( sys-libs/libselinux ) device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 SLOT=0
 SRC_URI=mirror://gnu/parted/parted-3.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cd03b0b35a940f6c15d351316264c78f
diff --git a/metadata/md5-cache/sys-block/partimage-0.6.8 b/metadata/md5-cache/sys-block/partimage-0.6.8
index 9f2b4b9c9e6b..0280c8e616aa 100644
--- a/metadata/md5-cache/sys-block/partimage-0.6.8
+++ b/metadata/md5-cache/sys-block/partimage-0.6.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=!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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Console-based application to efficiently save raw partition data to an image file
 EAPI=3
 HOMEPAGE=http://www.partimage.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!static? ( pam? ( virtual/pam ) ) !static? ( app-arch/bzip2 >=dev-libs/newt-0.52 >=sys-libs/slang-2 sys-libs/zlib ssl? ( dev-libs/openssl ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/partimage/partimage-0.6.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=05b74de05dc529453ef23440591b2452
diff --git a/metadata/md5-cache/sys-block/scsirastools-1.5.4 b/metadata/md5-cache/sys-block/scsirastools-1.5.4
index 4c3dcbde4bbf..d220b7c8307c 100644
--- a/metadata/md5-cache/sys-block/scsirastools-1.5.4
+++ b/metadata/md5-cache/sys-block/scsirastools-1.5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-apps/rescan-scsi-bus sys-apps/sg3_utils || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/rescan-scsi-bus sys-apps/sg3_utils || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Serviceability for SCSI Disks and Arrays
 HOMEPAGE=http://scsirastools.sourceforge.net/
 KEYWORDS=~x86 ~ppc ~amd64
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=sys-apps/rescan-scsi-bus sys-apps/sg3_utils
 SLOT=0
 SRC_URI=mirror://sourceforge/scsirastools/scsirastools-1.5.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=ae9bd805e6fe49e1b513f2f489b52a33
diff --git a/metadata/md5-cache/sys-block/scsirastools-1.5.6 b/metadata/md5-cache/sys-block/scsirastools-1.5.6
index 98a8d4cc05d9..9531dc87ff46 100644
--- a/metadata/md5-cache/sys-block/scsirastools-1.5.6
+++ b/metadata/md5-cache/sys-block/scsirastools-1.5.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-apps/rescan-scsi-bus sys-apps/sg3_utils || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/rescan-scsi-bus sys-apps/sg3_utils || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Serviceability for SCSI Disks and Arrays
 HOMEPAGE=http://scsirastools.sourceforge.net/
 KEYWORDS=~x86 ~ppc ~amd64
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=sys-apps/rescan-scsi-bus sys-apps/sg3_utils
 SLOT=0
 SRC_URI=mirror://sourceforge/scsirastools/scsirastools-1.5.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0edaeb31cc96ef4aee33def49834f918
diff --git a/metadata/md5-cache/sys-block/scsirastools-1.5.7 b/metadata/md5-cache/sys-block/scsirastools-1.5.7
index 621556a44a22..f8338fe642b6 100644
--- a/metadata/md5-cache/sys-block/scsirastools-1.5.7
+++ b/metadata/md5-cache/sys-block/scsirastools-1.5.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-apps/rescan-scsi-bus sys-apps/sg3_utils || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/rescan-scsi-bus sys-apps/sg3_utils || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Serviceability for SCSI Disks and Arrays
 HOMEPAGE=http://scsirastools.sourceforge.net/
 KEYWORDS=~amd64 ~ppc ~x86
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=sys-apps/rescan-scsi-bus sys-apps/sg3_utils
 SLOT=0
 SRC_URI=mirror://sourceforge/scsirastools/scsirastools-1.5.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=adfe0b9cf09b59681dd3e55321549a1e
diff --git a/metadata/md5-cache/sys-block/smp_utils-0.97 b/metadata/md5-cache/sys-block/smp_utils-0.97
index cc93b22f8b63..eb7d3458664e 100644
--- a/metadata/md5-cache/sys-block/smp_utils-0.97
+++ b/metadata/md5-cache/sys-block/smp_utils-0.97
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://sg.danny.cz/sg/p/smp_utils-0.97.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=615a155762c0a6710c3fefeca7344e41
diff --git a/metadata/md5-cache/sys-boot/dvhtool-1.0.1-r2 b/metadata/md5-cache/sys-boot/dvhtool-1.0.1-r2
index 64a263da2876..2440c794e778 100644
--- a/metadata/md5-cache/sys-boot/dvhtool-1.0.1-r2
+++ b/metadata/md5-cache/sys-boot/dvhtool-1.0.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tool to copy kernel(s) into the volume header on SGI MIPS-based workstations.
 EAPI=4
 HOMEPAGE=http://packages.debian.org/unstable/utils/dvhtool
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~mips ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dvhtool/dvhtool_1.0.1.orig.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=01e0c92e4f1de0a9429903daa2138fbc
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r10 b/metadata/md5-cache/sys-boot/grub-0.97-r10
index bdbdda254ee5..6b4360ba6e05 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r10
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config install postinst postrm preinst prerm setup test unpack
-DEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU GRUB Legacy boot loader
 HOMEPAGE=http://www.gnu.org/software/grub/
 IUSE=custom-cflags ncurses netboot static
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) )
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.12.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8da2c3dbab83d5a5f6afee0a111c1685
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r11 b/metadata/md5-cache/sys-boot/grub-0.97-r11
index bd84db8af28a..4be556bf3a4d 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r11
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config install postinst postrm preinst prerm setup test unpack
-DEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU GRUB Legacy boot loader
 HOMEPAGE=http://www.gnu.org/software/grub/
 IUSE=custom-cflags ncurses netboot static
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) )
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.13.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4ae0644d8eccf0754eed45857a3d39c9
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r12 b/metadata/md5-cache/sys-boot/grub-0.97-r12
index 4443bb0a932e..c86fbf6ad114 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r12
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config install postinst postrm preinst prerm setup test unpack
-DEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU GRUB Legacy boot loader
 HOMEPAGE=http://www.gnu.org/software/grub/
 IUSE=custom-cflags ncurses netboot static
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) )
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.14.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=299e9eb0b4af2768ecf8b15b7c7d45f8
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r13 b/metadata/md5-cache/sys-boot/grub-0.97-r13
index ef8600418a49..ade9a25208a5 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r13
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=!static? ( ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) ) ) static? ( ncurses? ( >=sys-libs/ncurses-5.2-r5[static-libs(+)] amd64? ( app-emulation/emul-linux-x86-baselibs ) ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!static? ( ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) ) ) static? ( ncurses? ( >=sys-libs/ncurses-5.2-r5[static-libs(+)] amd64? ( app-emulation/emul-linux-x86-baselibs ) ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU GRUB Legacy boot loader
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/grub/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!static? ( ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) ) )
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.14.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=43b757f366ba2573757dbc83a2ef2472
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r3 b/metadata/md5-cache/sys-boot/grub-0.97-r3
index f8320d110a85..406063e4ffaf 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r3
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config install postinst postrm preinst prerm test unpack
-DEPEND=>=sys-libs/ncurses-5.2-r5 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.2-r5 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU GRUB Legacy boot loader
 HOMEPAGE=http://www.gnu.org/software/grub/
 IUSE=static netboot custom-cflags
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r5
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a02018573ddabda616c1345b4886ef3b
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r4 b/metadata/md5-cache/sys-boot/grub-0.97-r4
index ffb351b926fc..8edfbedd5173 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r4
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config install postinst postrm preinst prerm test unpack
-DEPEND=>=sys-libs/ncurses-5.2-r5 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.2-r5 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU GRUB Legacy boot loader
 HOMEPAGE=http://www.gnu.org/software/grub/
 IUSE=static netboot custom-cflags
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r5
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=81c022c52b4d5d7b0869076783de4e9d
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r5 b/metadata/md5-cache/sys-boot/grub-0.97-r5
index cb3dc451ec31..64336eb3b47d 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r5
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config install postinst postrm preinst prerm test unpack
-DEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU GRUB Legacy boot loader
 HOMEPAGE=http://www.gnu.org/software/grub/
 IUSE=custom-cflags ncurses netboot static
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) )
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a54ad3b12f9932026a60c3642901b6dc
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r6 b/metadata/md5-cache/sys-boot/grub-0.97-r6
index 76aaa70cd4f0..7e8017961fac 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r6
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config install postinst postrm preinst prerm test unpack
-DEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU GRUB Legacy boot loader
 HOMEPAGE=http://www.gnu.org/software/grub/
 IUSE=custom-cflags ncurses netboot static
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) )
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=89e6b111193d26fb312a13700917b8c9
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r8 b/metadata/md5-cache/sys-boot/grub-0.97-r8
index 874e3fdfc17e..64f5d1e06e19 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r8
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config install postinst postrm preinst prerm test unpack
-DEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU GRUB Legacy boot loader
 HOMEPAGE=http://www.gnu.org/software/grub/
 IUSE=custom-cflags ncurses netboot static
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) )
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5c41896252ba602903bab0923f38740c
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r9 b/metadata/md5-cache/sys-boot/grub-0.97-r9
index c6a2380fd22f..5a63e19a647c 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r9
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config install postinst postrm preinst prerm setup test unpack
-DEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU GRUB Legacy boot loader
 HOMEPAGE=http://www.gnu.org/software/grub/
 IUSE=custom-cflags ncurses netboot static
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) )
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d3e04b4392b0eabe876c8e31ca498cd1
diff --git a/metadata/md5-cache/sys-boot/grub-2.00-r1 b/metadata/md5-cache/sys-boot/grub-2.00-r1
index 4b235695d809..1bdffed7a813 100644
--- a/metadata/md5-cache/sys-boot/grub-2.00-r1
+++ b/metadata/md5-cache/sys-boot/grub-2.00-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend
-DEPEND=app-arch/xz-utils >=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/dejavu >=media-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) >=dev-lang/python-2.5.2 sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo static? ( truetype? ( app-arch/bzip2[static-libs(+)] media-libs/freetype[static-libs(+)] sys-libs/zlib[static-libs(+)] ) ) >=sys-devel/autogen-5.10 app-arch/xz-utils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/xz-utils >=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/dejavu >=media-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) >=dev-lang/python-2.5.2 sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo static? ( truetype? ( app-arch/bzip2[static-libs(+)] media-libs/freetype[static-libs(+)] sys-libs/zlib[static-libs(+)] ) ) >=sys-devel/autogen-5.10 app-arch/xz-utils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU GRUB boot loader
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/grub/
@@ -10,5 +10,5 @@ RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/l
 REQUIRED_USE=grub_platforms_qemu? ( truetype ) grub_platforms_yeeloong? ( truetype )
 SLOT=2
 SRC_URI=mirror://gnu/grub/grub-2.00.tar.xz mirror://gentoo/grub-2.00.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bc5df6468757330e775874e705132c63
diff --git a/metadata/md5-cache/sys-boot/grub-2.00-r2 b/metadata/md5-cache/sys-boot/grub-2.00-r2
index f7237a95ff4b..d2b236691975 100644
--- a/metadata/md5-cache/sys-boot/grub-2.00-r2
+++ b/metadata/md5-cache/sys-boot/grub-2.00-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend
-DEPEND=app-arch/xz-utils >=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/dejavu >=media-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) >=dev-lang/python-2.5.2 sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo static? ( truetype? ( app-arch/bzip2[static-libs(+)] media-libs/freetype[static-libs(+)] sys-libs/zlib[static-libs(+)] ) ) >=sys-devel/autogen-5.10 app-arch/xz-utils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/xz-utils >=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/dejavu >=media-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) >=dev-lang/python-2.5.2 sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo static? ( truetype? ( app-arch/bzip2[static-libs(+)] media-libs/freetype[static-libs(+)] sys-libs/zlib[static-libs(+)] ) ) >=sys-devel/autogen-5.10 app-arch/xz-utils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU GRUB boot loader
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/grub/
@@ -10,5 +10,5 @@ RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/l
 REQUIRED_USE=grub_platforms_qemu? ( truetype ) grub_platforms_yeeloong? ( truetype )
 SLOT=2
 SRC_URI=mirror://gnu/grub/grub-2.00.tar.xz mirror://gentoo/grub-2.00.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=87a60b18a558fcd03643a119ef6133ba
diff --git a/metadata/md5-cache/sys-boot/grub-9999 b/metadata/md5-cache/sys-boot/grub-9999
index bcd1d2aa2838..4b8acfcfbaea 100644
--- a/metadata/md5-cache/sys-boot/grub-9999
+++ b/metadata/md5-cache/sys-boot/grub-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend unpack
-DEPEND=app-arch/xz-utils >=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/dejavu >=media-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) >=dev-lang/python-2.5.2 sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo static? ( truetype? ( app-arch/bzip2[static-libs(+)] media-libs/freetype[static-libs(+)] sys-libs/zlib[static-libs(+)] ) ) >=sys-devel/autogen-5.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/bzr-2.0.1
+DEPEND=app-arch/xz-utils >=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/dejavu >=media-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) >=dev-lang/python-2.5.2 sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo static? ( truetype? ( app-arch/bzip2[static-libs(+)] media-libs/freetype[static-libs(+)] sys-libs/zlib[static-libs(+)] ) ) >=sys-devel/autogen-5.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/bzr-2.0.1
 DESCRIPTION=GNU GRUB boot loader
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/grub/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/xz-utils >=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/dejavu >=media-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) )
 REQUIRED_USE=grub_platforms_qemu? ( truetype ) grub_platforms_yeeloong? ( truetype )
 SLOT=2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bzr	876798528c0cd872742b74bf784738cf	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bzr	876798528c0cd872742b74bf784738cf	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ce3b829d5c55daa5be1fd0f369192b81
diff --git a/metadata/md5-cache/sys-boot/plymouth-0.8.3-r5 b/metadata/md5-cache/sys-boot/plymouth-0.8.3-r5
index 3e86b986ec34..8a0fa41751c2 100644
--- a/metadata/md5-cache/sys-boot/plymouth-0.8.3-r5
+++ b/metadata/md5-cache/sys-boot/plymouth-0.8.3-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2.16 >=x11-libs/gtk+-2.12:2 pango? ( >=x11-libs/pango-1.21 ) video_cards_intel? ( x11-libs/libdrm[video_cards_intel] ) video_cards_nouveau? ( x11-libs/libdrm[video_cards_nouveau] ) video_cards_radeon? ( x11-libs/libdrm[video_cards_radeon] ) >=sys-kernel/dracut-008-r1[dracut_modules_plymouth] openrc? ( sys-boot/plymouth-openrc-plugin !sys-apps/systemd )
 SLOT=0
 SRC_URI=http://cgit.freedesktop.org/plymouth/snapshot/plymouth-0.8.3.tar.bz2 http://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=437655e71439862eade878bb0d9f02e7
diff --git a/metadata/md5-cache/sys-boot/plymouth-0.8.4 b/metadata/md5-cache/sys-boot/plymouth-0.8.4
index 91b04bc1445a..53061d948343 100644
--- a/metadata/md5-cache/sys-boot/plymouth-0.8.4
+++ b/metadata/md5-cache/sys-boot/plymouth-0.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2.16 >=x11-libs/gtk+-2.12:2 libkms? ( x11-libs/libdrm[libkms] ) pango? ( >=x11-libs/pango-1.21 ) video_cards_intel? ( x11-libs/libdrm[video_cards_intel] ) video_cards_nouveau? ( x11-libs/libdrm[video_cards_nouveau] ) video_cards_radeon? ( x11-libs/libdrm[video_cards_radeon] ) >=sys-kernel/dracut-008-r1[dracut_modules_plymouth] openrc? ( sys-boot/plymouth-openrc-plugin !sys-apps/systemd )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/plymouth/releases/plymouth-0.8.4.tar.bz2 http://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fed2f860a6baf679fc56f8805b7f7808
diff --git a/metadata/md5-cache/sys-boot/plymouth-0.8.8 b/metadata/md5-cache/sys-boot/plymouth-0.8.8
index 4392d8c8f54e..2afc9b860cfa 100644
--- a/metadata/md5-cache/sys-boot/plymouth-0.8.8
+++ b/metadata/md5-cache/sys-boot/plymouth-0.8.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2.16 gtk? ( dev-libs/glib >=x11-libs/gtk+-2.12:2 ) libkms? ( x11-libs/libdrm[libkms] ) pango? ( >=x11-libs/pango-1.21 ) video_cards_intel? ( x11-libs/libdrm[video_cards_intel] ) video_cards_nouveau? ( x11-libs/libdrm[video_cards_nouveau] ) video_cards_radeon? ( x11-libs/libdrm[video_cards_radeon] ) >=sys-kernel/dracut-008-r1[dracut_modules_plymouth] openrc? ( sys-boot/plymouth-openrc-plugin !sys-apps/systemd )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/plymouth/releases/plymouth-0.8.8.tar.bz2 http://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c1341aae0cd01354d8898fc448db4833
diff --git a/metadata/md5-cache/sys-boot/plymouth-0.8.8-r1 b/metadata/md5-cache/sys-boot/plymouth-0.8.8-r1
index 0ceb7fcb1cf3..6112262494ce 100644
--- a/metadata/md5-cache/sys-boot/plymouth-0.8.8-r1
+++ b/metadata/md5-cache/sys-boot/plymouth-0.8.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2.16 gtk? ( dev-libs/glib >=x11-libs/gtk+-2.12:2 ) libkms? ( x11-libs/libdrm[libkms] ) pango? ( >=x11-libs/pango-1.21 ) video_cards_intel? ( x11-libs/libdrm[video_cards_intel] ) video_cards_radeon? ( x11-libs/libdrm[video_cards_radeon] ) >=sys-kernel/dracut-008-r1[dracut_modules_plymouth] openrc? ( sys-boot/plymouth-openrc-plugin !sys-apps/systemd )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/plymouth/releases/plymouth-0.8.8.tar.bz2 http://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f0310381b84c65f5910d3d7795ee461c
diff --git a/metadata/md5-cache/sys-cluster/ceph-0.56.3 b/metadata/md5-cache/sys-cluster/ceph-0.56.3
index f7dddfde5c38..927d7ca70b3e 100644
--- a/metadata/md5-cache/sys-cluster/ceph-0.56.3
+++ b/metadata/md5-cache/sys-cluster/ceph-0.56.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/boost dev-libs/fcgi dev-libs/libaio 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 net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=dev-libs/boost dev-libs/fcgi dev-libs/libaio 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 net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Ceph distributed filesystem
 EAPI=5
 HOMEPAGE=http://ceph.com/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/boost dev-libs/fcgi dev-libs/libaio 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 net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) sys-fs/btrfs-progs
 SLOT=0
 SRC_URI=http://ceph.com/download/ceph-0.56.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1c50766c7c20dbed22ec0083c61432c1
diff --git a/metadata/md5-cache/sys-cluster/ceph-0.56.4 b/metadata/md5-cache/sys-cluster/ceph-0.56.4
index 2ffb6ef78ef8..ee9e5a128306 100644
--- a/metadata/md5-cache/sys-cluster/ceph-0.56.4
+++ b/metadata/md5-cache/sys-cluster/ceph-0.56.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/boost dev-libs/fcgi dev-libs/libaio 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 net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=dev-libs/boost dev-libs/fcgi dev-libs/libaio 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 net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Ceph distributed filesystem
 EAPI=5
 HOMEPAGE=http://ceph.com/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/boost dev-libs/fcgi dev-libs/libaio 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 net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) sys-fs/btrfs-progs
 SLOT=0
 SRC_URI=http://ceph.com/download/ceph-0.56.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ecc73b167c7a6b741baa0f7e388c8fd4
diff --git a/metadata/md5-cache/sys-cluster/ceph-0.60-r1 b/metadata/md5-cache/sys-cluster/ceph-0.60-r1
index 4e439679766e..685c666b81aa 100644
--- a/metadata/md5-cache/sys-cluster/ceph-0.60-r1
+++ b/metadata/md5-cache/sys-cluster/ceph-0.60-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=app-arch/snappy dev-libs/boost dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/crypto++ dev-libs/leveldb 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 net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=app-arch/snappy dev-libs/boost dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/crypto++ dev-libs/leveldb 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 net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Ceph distributed filesystem
 EAPI=5
 HOMEPAGE=http://ceph.com/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-arch/snappy dev-libs/boost dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/crypto++ dev-libs/leveldb 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 net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) sys-fs/btrfs-progs
 SLOT=0
 SRC_URI=http://ceph.com/download/ceph-0.60.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c5f7328526d8e080ff968e08de2428ce
diff --git a/metadata/md5-cache/sys-cluster/ceph-9999 b/metadata/md5-cache/sys-cluster/ceph-9999
index c1f225793a92..34a86e2f407a 100644
--- a/metadata/md5-cache/sys-cluster/ceph-9999
+++ b/metadata/md5-cache/sys-cluster/ceph-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=app-arch/snappy dev-libs/boost dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/leveldb 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 net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig dev-vcs/git
+DEPEND=app-arch/snappy dev-libs/boost dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/leveldb 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 net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig dev-vcs/git
 DESCRIPTION=Ceph distributed filesystem
 EAPI=5
 HOMEPAGE=http://ceph.com/
@@ -7,5 +7,5 @@ IUSE=debug fuse gtk libatomic radosgw static-libs tcmalloc
 LICENSE=LGPL-2.1
 RDEPEND=app-arch/snappy dev-libs/boost dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/leveldb 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 net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) sys-fs/btrfs-progs
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9bee39dce8f713753c08bc857146be1f
diff --git a/metadata/md5-cache/sys-cluster/classads-1.0.10 b/metadata/md5-cache/sys-cluster/classads-1.0.10
index f089a2df63d0..3feaf74cbf41 100644
--- a/metadata/md5-cache/sys-cluster/classads-1.0.10
+++ b/metadata/md5-cache/sys-cluster/classads-1.0.10
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-1.0.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e8e0818ee7205ea40094e6be56512312
diff --git a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.10 b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.10
index 4ee404442ae9..7172ddcf5865 100644
--- a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.10
+++ b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=app-arch/bzip2 dev-libs/glib:2 dev-libs/libaio 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/bzip2 dev-libs/glib:2 dev-libs/libaio 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library pack for Heartbeat / Pacemaker
 EAPI=4
 HOMEPAGE=http://www.linux-ha.org/wiki/Cluster_Glue
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 dev-libs/glib:2 dev-libs/libaio 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
 SLOT=0
 SRC_URI=http://hg.linux-ha.org/glue/archive/glue-1.0.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bc85624bb79fdab88f58156d5bb9e5f3
diff --git a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.11 b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.11
index a1b6645e609d..ca4f191731f4 100644
--- a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.11
+++ b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=app-arch/bzip2 app-text/docbook-xml-dtd:4.4 dev-libs/glib:2 dev-libs/libaio 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/bzip2 app-text/docbook-xml-dtd:4.4 dev-libs/glib:2 dev-libs/libaio 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library pack for Heartbeat / Pacemaker
 EAPI=4
 HOMEPAGE=http://www.linux-ha.org/wiki/Cluster_Glue
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 app-text/docbook-xml-dtd:4.4 dev-libs/glib:2 dev-libs/libaio 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
 SLOT=0
 SRC_URI=http://hg.linux-ha.org/glue/archive/glue-1.0.11.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=755e729ecbb16f49c9739ca198770072
diff --git a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.9-r1 b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.9-r1
index 39375199f299..285df2e8d291 100644
--- a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.9-r1
+++ b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library pack for Heartbeat / Pacemaker
 EAPI=4
 HOMEPAGE=http://www.linux-ha.org/wiki/Cluster_Glue
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=http://hg.linux-ha.org/glue/archive/glue-1.0.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5dc1d127a647023edb0ad59a3f973819
diff --git a/metadata/md5-cache/sys-cluster/corosync-1.3.0 b/metadata/md5-cache/sys-cluster/corosync-1.3.0
index db9a43676faa..53e0b87f2547 100644
--- a/metadata/md5-cache/sys-cluster/corosync-1.3.0
+++ b/metadata/md5-cache/sys-cluster/corosync-1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) virtual/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) virtual/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OSI Certified implementation of a complete cluster engine
 EAPI=3
 HOMEPAGE=http://www.corosync.org/
@@ -9,5 +9,5 @@ LICENSE=BSD-2 public-domain
 RDEPEND=!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm )
 SLOT=0
 SRC_URI=ftp://ftp:corosync.org@corosync.org/downloads/corosync-1.3.0/corosync-1.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=41282a5f9a604c176a35a3cd73d95ef8
diff --git a/metadata/md5-cache/sys-cluster/corosync-1.3.3-r1 b/metadata/md5-cache/sys-cluster/corosync-1.3.3-r1
index 8c69ef37b19f..9a3d6d1e6329 100644
--- a/metadata/md5-cache/sys-cluster/corosync-1.3.3-r1
+++ b/metadata/md5-cache/sys-cluster/corosync-1.3.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) virtual/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) virtual/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OSI Certified implementation of a complete cluster engine
 EAPI=4
 HOMEPAGE=http://www.corosync.org/
@@ -9,5 +9,5 @@ LICENSE=BSD-2 public-domain
 RDEPEND=!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm )
 SLOT=0
 SRC_URI=ftp://ftp:corosync.org@corosync.org/downloads/corosync-1.3.3/corosync-1.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9f110c5921cac35cd9a2c022fd9394d5
diff --git a/metadata/md5-cache/sys-cluster/corosync-1.3.5 b/metadata/md5-cache/sys-cluster/corosync-1.3.5
index 84406842f720..950aa1045582 100644
--- a/metadata/md5-cache/sys-cluster/corosync-1.3.5
+++ b/metadata/md5-cache/sys-cluster/corosync-1.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) virtual/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) virtual/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OSI Certified implementation of a complete cluster engine
 EAPI=4
 HOMEPAGE=http://www.corosync.org/
@@ -9,5 +9,5 @@ LICENSE=BSD-2 public-domain
 RDEPEND=!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm )
 SLOT=0
 SRC_URI=ftp://ftp:corosync.org@corosync.org/downloads/corosync-1.3.5/corosync-1.3.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=973a78108dacc884035ded91ce63df62
diff --git a/metadata/md5-cache/sys-cluster/corosync-1.4.3-r1 b/metadata/md5-cache/sys-cluster/corosync-1.4.3-r1
index 5d3a76ef710c..acfdc6f6fcfd 100644
--- a/metadata/md5-cache/sys-cluster/corosync-1.4.3-r1
+++ b/metadata/md5-cache/sys-cluster/corosync-1.4.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) virtual/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) virtual/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OSI Certified implementation of a complete cluster engine
 EAPI=4
 HOMEPAGE=http://www.corosync.org/
@@ -9,5 +9,5 @@ LICENSE=BSD-2 public-domain
 RDEPEND=!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm )
 SLOT=0
 SRC_URI=ftp://ftp:corosync.org@corosync.org/downloads/corosync-1.4.3/corosync-1.4.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=811565f112ba16a4da22126589d124c3
diff --git a/metadata/md5-cache/sys-cluster/corosync-1.4.4 b/metadata/md5-cache/sys-cluster/corosync-1.4.4
index ab3a340b6740..818f84e285ee 100644
--- a/metadata/md5-cache/sys-cluster/corosync-1.4.4
+++ b/metadata/md5-cache/sys-cluster/corosync-1.4.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) virtual/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) virtual/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OSI Certified implementation of a complete cluster engine
 EAPI=4
 HOMEPAGE=http://www.corosync.org/
@@ -9,5 +9,5 @@ LICENSE=BSD-2 public-domain
 RDEPEND=!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm )
 SLOT=0
 SRC_URI=mirror://github/corosync/corosync/corosync-1.4.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f218e76b8a14f32ea0037d5a98ddecb8
diff --git a/metadata/md5-cache/sys-cluster/corosync-1.4.5 b/metadata/md5-cache/sys-cluster/corosync-1.4.5
index 9169b4c64bd2..1e3afd245e7b 100644
--- a/metadata/md5-cache/sys-cluster/corosync-1.4.5
+++ b/metadata/md5-cache/sys-cluster/corosync-1.4.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) virtual/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) virtual/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OSI Certified implementation of a complete cluster engine
 EAPI=4
 HOMEPAGE=http://www.corosync.org/
@@ -9,5 +9,5 @@ LICENSE=BSD-2 public-domain
 RDEPEND=!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm )
 SLOT=0
 SRC_URI=https://github.com/corosync/corosync/tarball/v1.4.5 -> corosync-1.4.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4b514b22d75513e54e2ee708beda61be
diff --git a/metadata/md5-cache/sys-cluster/corosync-2.3.0 b/metadata/md5-cache/sys-cluster/corosync-2.3.0
index ea53d95c36fb..e54aff65e916 100644
--- a/metadata/md5-cache/sys-cluster/corosync-2.3.0
+++ b/metadata/md5-cache/sys-cluster/corosync-2.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!sys-cluster/heartbeat infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) dev-libs/nss sys-cluster/libqb virtual/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!sys-cluster/heartbeat infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) dev-libs/nss sys-cluster/libqb virtual/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OSI Certified implementation of a complete cluster engine
 EAPI=4
 HOMEPAGE=http://www.corosync.org/
@@ -9,5 +9,5 @@ LICENSE=BSD-2 public-domain
 RDEPEND=!sys-cluster/heartbeat infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) dev-libs/nss sys-cluster/libqb
 SLOT=0
 SRC_URI=https://github.com/corosync/corosync/tarball/v2.3.0 -> corosync-2.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=43477e4e600538b82a2f9be25d91ce2e
diff --git a/metadata/md5-cache/sys-cluster/crmsh-1.2.1 b/metadata/md5-cache/sys-cluster/crmsh-1.2.1
index 63bd7763d940..e492a5223221 100644
--- a/metadata/md5-cache/sys-cluster/crmsh-1.2.1
+++ b/metadata/md5-cache/sys-cluster/crmsh-1.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-cluster/pacemaker-1.1.8
 SLOT=0
 SRC_URI=http://hg.savannah.gnu.org/hgweb/crmsh/archive/b6bb311c7bd3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2b13050956c5acf150031ed0cf09d9ef
diff --git a/metadata/md5-cache/sys-cluster/crmsh-1.2.4 b/metadata/md5-cache/sys-cluster/crmsh-1.2.4
index 94a042324a7c..03d965869b25 100644
--- a/metadata/md5-cache/sys-cluster/crmsh-1.2.4
+++ b/metadata/md5-cache/sys-cluster/crmsh-1.2.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-cluster/pacemaker-1.1.8
 SLOT=0
 SRC_URI=http://hg.savannah.gnu.org/hgweb/crmsh/archive/51379136d692.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e3ba7af6c724be0ca5bb0888390b3ce1
diff --git a/metadata/md5-cache/sys-cluster/crmsh-1.2.5 b/metadata/md5-cache/sys-cluster/crmsh-1.2.5
index 027273ae6128..3581c7070f50 100644
--- a/metadata/md5-cache/sys-cluster/crmsh-1.2.5
+++ b/metadata/md5-cache/sys-cluster/crmsh-1.2.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-cluster/pacemaker-1.1.8
 SLOT=0
 SRC_URI=http://hg.savannah.gnu.org/hgweb/crmsh/archive/51379136d692.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=86e7acaaaf00497a0522f06efa91b1c0
diff --git a/metadata/md5-cache/sys-cluster/csync2-1.34-r2 b/metadata/md5-cache/sys-cluster/csync2-1.34-r2
index 88704ca6a40e..c9d895464453 100644
--- a/metadata/md5-cache/sys-cluster/csync2-1.34-r2
+++ b/metadata/md5-cache/sys-cluster/csync2-1.34-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst prepare
-DEPEND=>=net-libs/librsync-0.9.5 =dev-db/sqlite-2.8* ssl? ( >=net-libs/gnutls-2.7.3 ) xinetd? ( sys-apps/xinetd ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-libs/librsync-0.9.5 =dev-db/sqlite-2.8* ssl? ( >=net-libs/gnutls-2.7.3 ) xinetd? ( sys-apps/xinetd ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Cluster synchronization tool.
 EAPI=2
 HOMEPAGE=http://oss.linbit.com/csync2/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/librsync-0.9.5 =dev-db/sqlite-2.8* ssl? ( >=net-libs/gnutls-2.7.3 ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=http://oss.linbit.com/csync2/csync2-1.34.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1767d6196f2030899a4eae10e13b3b39
diff --git a/metadata/md5-cache/sys-cluster/gearmand-0.34-r1 b/metadata/md5-cache/sys-cluster/gearmand-0.34-r1
index d19e58efd20b..f34bd7a12a46 100644
--- a/metadata/md5-cache/sys-cluster/gearmand-0.34-r1
+++ b/metadata/md5-cache/sys-cluster/gearmand-0.34-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libevent >=dev-libs/boost-1.39:=[threads(+)] || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) tcmalloc? ( dev-util/google-perftools ) memcache? ( >=dev-libs/libmemcached-0.47 ) drizzle? ( dev-db/drizzle ) sqlite? ( dev-db/sqlite:3 ) tokyocabinet? ( dev-db/tokyocabinet ) postgres? ( >=dev-db/postgresql-base-9.0 )
 SLOT=0
 SRC_URI=http://launchpad.net/gearmand/trunk/0.34/+download/gearmand-0.34.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f6296fc9e11f5d988c252280f3bbf11c
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-3.1.2 b/metadata/md5-cache/sys-cluster/glusterfs-3.1.2
index 119aa9eec48a..fda25d1b0a83 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-3.1.2
+++ b/metadata/md5-cache/sys-cluster/glusterfs-3.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs ) virtual/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs ) virtual/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
 EAPI=3
 HOMEPAGE=http://www.gluster.org/
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs )
 SLOT=0
 SRC_URI=http://ftp.gluster.com/pub/gluster/glusterfs/3.1/3.1.2/glusterfs-3.1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1b3067db824b6fb6147a9e4eae0660a5
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-3.2.7 b/metadata/md5-cache/sys-cluster/glusterfs-3.2.7
index cec02939ab47..0aa672ccc739 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-3.2.7
+++ b/metadata/md5-cache/sys-cluster/glusterfs-3.2.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs ) virtual/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs ) virtual/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
 EAPI=4
 HOMEPAGE=http://www.gluster.org/
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://ftp.gluster.com/pub/gluster/glusterfs/3.2/3.2.7/glusterfs-3.2.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1411b76798f65444fef6d3a113a29af4
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-3.3.0 b/metadata/md5-cache/sys-cluster/glusterfs-3.3.0
index c6a07e45239e..eed97c7e094c 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-3.3.0
+++ b/metadata/md5-cache/sys-cluster/glusterfs-3.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs ) virtual/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs ) virtual/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
 EAPI=4
 HOMEPAGE=http://www.gluster.org/
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://ftp.gluster.com/pub/gluster/glusterfs/3.3/3.3.0/glusterfs-3.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dd806755bb47a0c60c854f5c78f4e741
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-3.3.1-r2 b/metadata/md5-cache/sys-cluster/glusterfs-3.3.1-r2
index c20e6b695e81..1fd527ef9a86 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-3.3.1-r2
+++ b/metadata/md5-cache/sys-cluster/glusterfs-3.3.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs ) virtual/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs ) virtual/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
 EAPI=4
 HOMEPAGE=http://www.gluster.org/
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://download.gluster.org/pub/gluster/glusterfs/3.3/3.3.1/glusterfs-3.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e67f6681a2d87d6439e460b8987d2d33
diff --git a/metadata/md5-cache/sys-cluster/heartbeat-3.0.5 b/metadata/md5-cache/sys-cluster/heartbeat-3.0.5
index b310adad69a4..46f0f6105188 100644
--- a/metadata/md5-cache/sys-cluster/heartbeat-3.0.5
+++ b/metadata/md5-cache/sys-cluster/heartbeat-3.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp? ( net-analyzer/net-snmp ) virtual/pkgconfig dev-lang/swig doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp? ( net-analyzer/net-snmp ) virtual/pkgconfig dev-lang/swig doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Heartbeat high availability cluster manager
 EAPI=2
 HOMEPAGE=http://www.linux-ha.org/wiki/Heartbeat
@@ -10,5 +10,5 @@ PDEPEND=sys-cluster/resource-agents
 RDEPEND=sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp? ( net-analyzer/net-snmp ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://hg.linux-ha.org/heartbeat-STABLE_3_0/archive/STABLE-3.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c7f4e7e69506c378745cba019adb3d91
diff --git a/metadata/md5-cache/sys-cluster/heartbeat-3.0.5-r1 b/metadata/md5-cache/sys-cluster/heartbeat-3.0.5-r1
index 5e66a3bc968f..1f063c5b8c0e 100644
--- a/metadata/md5-cache/sys-cluster/heartbeat-3.0.5-r1
+++ b/metadata/md5-cache/sys-cluster/heartbeat-3.0.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp? ( net-analyzer/net-snmp ) virtual/pkgconfig dev-lang/swig doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp? ( net-analyzer/net-snmp ) virtual/pkgconfig dev-lang/swig doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Heartbeat high availability cluster manager
 EAPI=2
 HOMEPAGE=http://www.linux-ha.org/wiki/Heartbeat
@@ -10,5 +10,5 @@ PDEPEND=sys-cluster/resource-agents
 RDEPEND=sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp? ( net-analyzer/net-snmp ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://hg.linux-ha.org/heartbeat-STABLE_3_0/archive/STABLE-3.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b4a497210f0e47413c9f35eda8b3d9a6
diff --git a/metadata/md5-cache/sys-cluster/keepalived-1.2.2-r3 b/metadata/md5-cache/sys-cluster/keepalived-1.2.2-r3
index ceadb9cc9949..2216135e6ff3 100644
--- a/metadata/md5-cache/sys-cluster/keepalived-1.2.2-r3
+++ b/metadata/md5-cache/sys-cluster/keepalived-1.2.2-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A strong & robust keepalive facility to the Linux Virtual Server project
 EAPI=4
 HOMEPAGE=http://www.keepalived.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl
 SLOT=0
 SRC_URI=http://www.keepalived.org/software/keepalived-1.2.2.tar.gz mirror://debian/pool/main/k/keepalived/keepalived_1.2.2-3.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d7debbcacedbd97044a50d6b136d4a02
diff --git a/metadata/md5-cache/sys-cluster/keepalived-1.2.2-r4 b/metadata/md5-cache/sys-cluster/keepalived-1.2.2-r4
index 93f994c0d246..11a6e90d4bfd 100644
--- a/metadata/md5-cache/sys-cluster/keepalived-1.2.2-r4
+++ b/metadata/md5-cache/sys-cluster/keepalived-1.2.2-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A strong & robust keepalive facility to the Linux Virtual Server project
 EAPI=4
 HOMEPAGE=http://www.keepalived.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl
 SLOT=0
 SRC_URI=http://www.keepalived.org/software/keepalived-1.2.2.tar.gz mirror://debian/pool/main/k/keepalived/keepalived_1.2.2-3.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=70e7abc07f89affa96c8fdce66be9dc3
diff --git a/metadata/md5-cache/sys-cluster/keepalived-1.2.7-r1 b/metadata/md5-cache/sys-cluster/keepalived-1.2.7-r1
index 999f95d705c1..7984dd32f2da 100644
--- a/metadata/md5-cache/sys-cluster/keepalived-1.2.7-r1
+++ b/metadata/md5-cache/sys-cluster/keepalived-1.2.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl snmp? ( net-analyzer/net-snmp ) >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl snmp? ( net-analyzer/net-snmp ) >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A strong & robust keepalive facility to the Linux Virtual Server project
 EAPI=4
 HOMEPAGE=http://www.keepalived.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl snmp? ( net-analyzer/net-snmp )
 SLOT=0
 SRC_URI=http://www.keepalived.org/software/keepalived-1.2.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=790f97f251ed89781145465cb3126c7c
diff --git a/metadata/md5-cache/sys-cluster/keepalived-1.2.7-r2 b/metadata/md5-cache/sys-cluster/keepalived-1.2.7-r2
index 30313ef715b4..cb831784eb07 100644
--- a/metadata/md5-cache/sys-cluster/keepalived-1.2.7-r2
+++ b/metadata/md5-cache/sys-cluster/keepalived-1.2.7-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl snmp? ( net-analyzer/net-snmp ) >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl snmp? ( net-analyzer/net-snmp ) >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A strong & robust keepalive facility to the Linux Virtual Server project
 EAPI=4
 HOMEPAGE=http://www.keepalived.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl snmp? ( net-analyzer/net-snmp )
 SLOT=0
 SRC_URI=http://www.keepalived.org/software/keepalived-1.2.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=04871727d85c8da1ac05c271667a10ad
diff --git a/metadata/md5-cache/sys-cluster/knem-1.0.0 b/metadata/md5-cache/sys-cluster/knem-1.0.0
index 2e600714e2fc..30c7ed881370 100644
--- a/metadata/md5-cache/sys-cluster/knem-1.0.0
+++ b/metadata/md5-cache/sys-cluster/knem-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=sys-apps/hwloc virtual/linux-sources || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
+DEPEND=sys-apps/hwloc virtual/linux-sources || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
 DESCRIPTION=High-Performance Intra-Node MPI Communication
 EAPI=4
 HOMEPAGE=http://runtime.bordeaux.inria.fr/knem/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=sys-apps/hwloc virtual/modutils kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://runtime.bordeaux.inria.fr/knem/download/knem-1.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=26b16a2a35c3201cdc886b606447af1e
diff --git a/metadata/md5-cache/sys-cluster/libqb-0.13.0 b/metadata/md5-cache/sys-cluster/libqb-0.13.0
index 018831258ff4..2882c91a0fa1 100644
--- a/metadata/md5-cache/sys-cluster/libqb-0.13.0
+++ b/metadata/md5-cache/sys-cluster/libqb-0.13.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 app-arch/xz-utils test? ( dev-libs/check ) doc? ( app-doc/doxygen[dot] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 app-arch/xz-utils test? ( dev-libs/check ) doc? ( app-doc/doxygen[dot] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library providing high performance logging, tracing, ipc, and poll
 EAPI=4
 HOMEPAGE=https://github.com/asalkeld/libqb
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2
 SLOT=0
 SRC_URI=http://fedorahosted.org/releases/q/u/quarterback/libqb-0.13.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=be4b82e7013c3e09db7a967030c950df
diff --git a/metadata/md5-cache/sys-cluster/libqb-0.14.3 b/metadata/md5-cache/sys-cluster/libqb-0.14.3
index 3f5e9a28477c..0ca5e215da1a 100644
--- a/metadata/md5-cache/sys-cluster/libqb-0.14.3
+++ b/metadata/md5-cache/sys-cluster/libqb-0.14.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 app-arch/xz-utils test? ( dev-libs/check ) doc? ( app-doc/doxygen[dot] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 app-arch/xz-utils test? ( dev-libs/check ) doc? ( app-doc/doxygen[dot] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library providing high performance logging, tracing, ipc, and poll
 EAPI=4
 HOMEPAGE=https://github.com/asalkeld/libqb
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2
 SLOT=0
 SRC_URI=http://fedorahosted.org/releases/q/u/quarterback/libqb-0.14.3.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ff6221a6b37fb5dd8b8529b70ad65306
diff --git a/metadata/md5-cache/sys-cluster/libqb-0.14.4 b/metadata/md5-cache/sys-cluster/libqb-0.14.4
index 8115182b893f..cc602cf1c096 100644
--- a/metadata/md5-cache/sys-cluster/libqb-0.14.4
+++ b/metadata/md5-cache/sys-cluster/libqb-0.14.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 app-arch/xz-utils test? ( dev-libs/check ) doc? ( app-doc/doxygen[dot] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 app-arch/xz-utils test? ( dev-libs/check ) doc? ( app-doc/doxygen[dot] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library providing high performance logging, tracing, ipc, and poll
 EAPI=4
 HOMEPAGE=https://github.com/asalkeld/libqb
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2
 SLOT=0
 SRC_URI=http://fedorahosted.org/releases/q/u/quarterback/libqb-0.14.4.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=97c7912a72fc182ba071b67557486489
diff --git a/metadata/md5-cache/sys-cluster/maui-3.2.6_p16 b/metadata/md5-cache/sys-cluster/maui-3.2.6_p16
index ade850f557ab..2c432e86e836 100644
--- a/metadata/md5-cache/sys-cluster/maui-3.2.6_p16
+++ b/metadata/md5-cache/sys-cluster/maui-3.2.6_p16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-cluster/torque || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-cluster/torque || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Maui Cluster Scheduler
 HOMEPAGE=http://www.clusterresources.com/pages/products/maui-cluster-scheduler.php
 KEYWORDS=~x86 ~amd64
@@ -8,5 +8,5 @@ RDEPEND=sys-cluster/torque
 RESTRICT=fetch mirror
 SLOT=0
 SRC_URI=http://www.clusterresources.com/downloads/maui/maui-3.2.6p16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ba9c2ccb9775d77ab13076122cfc668a
diff --git a/metadata/md5-cache/sys-cluster/maui-3.2.6_p21 b/metadata/md5-cache/sys-cluster/maui-3.2.6_p21
index 8cd9730f78e6..df20d36408f7 100644
--- a/metadata/md5-cache/sys-cluster/maui-3.2.6_p21
+++ b/metadata/md5-cache/sys-cluster/maui-3.2.6_p21
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install nofetch unpack
-DEPEND=sys-cluster/torque || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-cluster/torque || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Maui Cluster Scheduler
 HOMEPAGE=http://www.clusterresources.com/pages/products/maui-cluster-scheduler.php
 KEYWORDS=~x86 ~amd64
@@ -8,5 +8,5 @@ RDEPEND=sys-cluster/torque
 RESTRICT=fetch mirror
 SLOT=0
 SRC_URI=http://www.clusterresources.com/downloads/maui/maui-3.2.6p21.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d977ddbe141ce75a4ffeee082ca73e15
diff --git a/metadata/md5-cache/sys-cluster/maui-3.2.6_p21-r1 b/metadata/md5-cache/sys-cluster/maui-3.2.6_p21-r1
index 6f6c7a3aa471..54c9ac8147fc 100644
--- a/metadata/md5-cache/sys-cluster/maui-3.2.6_p21-r1
+++ b/metadata/md5-cache/sys-cluster/maui-3.2.6_p21-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install nofetch unpack
-DEPEND=sys-cluster/torque || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-cluster/torque || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Maui Cluster Scheduler
 HOMEPAGE=http://www.clusterresources.com/pages/products/maui-cluster-scheduler.php
 KEYWORDS=~x86 ~amd64
@@ -8,5 +8,5 @@ RDEPEND=sys-cluster/torque
 RESTRICT=fetch mirror
 SLOT=0
 SRC_URI=http://www.clusterresources.com/downloads/maui/maui-3.2.6p21.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed61b1436887fcef0d7ea75069c4e37a
diff --git a/metadata/md5-cache/sys-cluster/maui-3.3 b/metadata/md5-cache/sys-cluster/maui-3.3
index 468c0967b2e6..2c8f1bd85c9f 100644
--- a/metadata/md5-cache/sys-cluster/maui-3.3
+++ b/metadata/md5-cache/sys-cluster/maui-3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install nofetch prepare
-DEPEND=sys-cluster/torque || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-cluster/torque || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Maui Cluster Scheduler
 EAPI=3
 HOMEPAGE=http://www.clusterresources.com/pages/products/maui-cluster-scheduler.php
@@ -9,5 +9,5 @@ RDEPEND=sys-cluster/torque
 RESTRICT=fetch mirror
 SLOT=0
 SRC_URI=http://www.clusterresources.com/downloads/maui/maui-3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e3ff14132d8ab81758ddb89d970c8e47
diff --git a/metadata/md5-cache/sys-cluster/mpi-dotnet-1.0.0 b/metadata/md5-cache/sys-cluster/mpi-dotnet-1.0.0
index 6cb34e588022..3b3c528231be 100644
--- a/metadata/md5-cache/sys-cluster/mpi-dotnet-1.0.0
+++ b/metadata/md5-cache/sys-cluster/mpi-dotnet-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=virtual/mpi >=dev-lang/mono-2.0 dev-lang/perl || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/mpi >=dev-lang/mono-2.0 dev-lang/perl || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C# bindings for various MPI-implementations
 HOMEPAGE=http://www.osl.iu.edu/research/mpi.net
 IUSE=doc examples
@@ -9,5 +9,5 @@ RDEPEND=virtual/mpi >=dev-lang/mono-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.osl.iu.edu/research/mpi.net/files/1.0.0/mpi.net-1.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5a2e4825d24ac411a0b03728a77b8cdc
diff --git a/metadata/md5-cache/sys-cluster/mpich2-1.4.1_p1 b/metadata/md5-cache/sys-cluster/mpich2-1.4.1_p1
index c916233831a6..dcb6f34752d0 100644
--- a/metadata/md5-cache/sys-cluster/mpich2-1.4.1_p1
+++ b/metadata/md5-cache/sys-cluster/mpich2-1.4.1_p1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/libaio <sys-apps/hwloc-1.5 romio? ( net-fs/nfs-utils ) dev-lang/perl sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool fortran? ( virtual/fortran )
+DEPEND=dev-libs/libaio <sys-apps/hwloc-1.5 romio? ( net-fs/nfs-utils ) dev-lang/perl sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool fortran? ( virtual/fortran )
 DESCRIPTION=A high performance and portable MPI implementation
 EAPI=4
 HOMEPAGE=http://www.mcs.anl.gov/research/projects/mpich2/index.php
@@ -9,5 +9,5 @@ LICENSE=mpich2
 RDEPEND=dev-libs/libaio <sys-apps/hwloc-1.5 romio? ( net-fs/nfs-utils ) !sys-cluster/openmpi fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/1.4.1p1/mpich2-1.4.1p1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fc7085defdf98db31694d02faa22460c
diff --git a/metadata/md5-cache/sys-cluster/open-mx-1.5.2-r1 b/metadata/md5-cache/sys-cluster/open-mx-1.5.2-r1
index 3ae1b360d2c9..c6b5819a5978 100644
--- a/metadata/md5-cache/sys-cluster/open-mx-1.5.2-r1
+++ b/metadata/md5-cache/sys-cluster/open-mx-1.5.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=sys-apps/hwloc virtual/linux-sources virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
+DEPEND=sys-apps/hwloc virtual/linux-sources virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
 DESCRIPTION=Open-MX - Myrinet Express over Generic Ethernet Hardware
 EAPI=4
 HOMEPAGE=http://open-mx.gforge.inria.fr/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=sys-apps/hwloc virtual/modutils kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://gforge.inria.fr/frs/download.php/30245/open-mx-1.5.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a26c32752bcae0640e13217f5162f776
diff --git a/metadata/md5-cache/sys-cluster/openais-1.1.4 b/metadata/md5-cache/sys-cluster/openais-1.1.4
index 1552484a764e..6341b7009e21 100644
--- a/metadata/md5-cache/sys-cluster/openais-1.1.4
+++ b/metadata/md5-cache/sys-cluster/openais-1.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=sys-cluster/corosync virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-cluster/corosync virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open Application Interface Specification cluster framework
 EAPI=2
 HOMEPAGE=http://www.openais.org/
@@ -8,5 +8,5 @@ LICENSE=BSD public-domain
 RDEPEND=sys-cluster/corosync
 SLOT=0
 SRC_URI=ftp://ftp:openais.org@openais.org/downloads/openais-1.1.4/openais-1.1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7616ab1b7877007c847f307d33506573
diff --git a/metadata/md5-cache/sys-cluster/openais-1.1.4-r1 b/metadata/md5-cache/sys-cluster/openais-1.1.4-r1
index a9d0f3282256..d0013c49e4c9 100644
--- a/metadata/md5-cache/sys-cluster/openais-1.1.4-r1
+++ b/metadata/md5-cache/sys-cluster/openais-1.1.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=sys-cluster/corosync virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-cluster/corosync virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open Application Interface Specification cluster framework
 EAPI=2
 HOMEPAGE=http://www.openais.org/
@@ -9,5 +9,5 @@ LICENSE=BSD public-domain
 RDEPEND=sys-cluster/corosync
 SLOT=0
 SRC_URI=ftp://ftp:openais.org@openais.org/downloads/openais-1.1.4/openais-1.1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=27935823054948f314cfade8cd76aad0
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-1.0.10 b/metadata/md5-cache/sys-cluster/pacemaker-1.0.10
index ae1b8c3d75db..ef6dc313a502 100644
--- a/metadata/md5-cache/sys-cluster/pacemaker-1.0.10
+++ b/metadata/md5-cache/sys-cluster/pacemaker-1.0.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=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-libs/glib-2.32* =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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-libs/glib-2.32* =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Pacemaker CRM
 EAPI=2
 HOMEPAGE=http://www.clusterlabs.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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*
 SLOT=0
 SRC_URI=http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/Pacemaker-1.0.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4509934c1d55729ca2615de47d55aaf7
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-1.0.12 b/metadata/md5-cache/sys-cluster/pacemaker-1.0.12
index d0ea092bc303..05ca53b1f742 100644
--- a/metadata/md5-cache/sys-cluster/pacemaker-1.0.12
+++ b/metadata/md5-cache/sys-cluster/pacemaker-1.0.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=Pacemaker CRM
 EAPI=2
 HOMEPAGE=http://www.linux-ha.org/wiki/Pacemaker
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 ) !=dev-libs/glib-2.32* =dev-lang/python-2*
 SLOT=0
 SRC_URI=https://github.com/ClusterLabs/pacemaker-1.0/tarball/Pacemaker-1.0.12 -> pacemaker-1.0.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fb5f6a5aa83ba32b525814a35e132dc5
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-1.1.10_rc1 b/metadata/md5-cache/sys-cluster/pacemaker-1.1.10_rc1
index 25248e25f7c5..e7bd8033fa2d 100644
--- a/metadata/md5-cache/sys-cluster/pacemaker-1.1.10_rc1
+++ b/metadata/md5-cache/sys-cluster/pacemaker-1.1.10_rc1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install prepare setup unpack
+DEFINED_PHASES=compile configure install postinst prepare setup unpack
 DEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue >=sys-cluster/libqb-0.14.0 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.12* >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=Pacemaker CRM
 EAPI=5
@@ -6,10 +6,9 @@ HOMEPAGE=http://www.linux-ha.org/wiki/Pacemaker
 IUSE=acl cman heartbeat smtp snmp static-libs
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=GPL-2
-PDEPEND=sys-cluster/crmsh
 RDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue >=sys-cluster/libqb-0.14.0 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 ) =dev-lang/python-2*
 REQUIRED_USE=cman? ( !heartbeat )
 SLOT=0
 SRC_URI=https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-1.1.10-rc1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b819d5a8810f3c2e6fd0c81de6863367
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c75e3c49163a1bf9703b4876db89c10b
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-1.1.7 b/metadata/md5-cache/sys-cluster/pacemaker-1.1.7
index f23828f1dfe0..5ff09f0a34ab 100644
--- a/metadata/md5-cache/sys-cluster/pacemaker-1.1.7
+++ b/metadata/md5-cache/sys-cluster/pacemaker-1.1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=Pacemaker CRM
 EAPI=4
 HOMEPAGE=http://www.linux-ha.org/wiki/Pacemaker
@@ -10,5 +10,5 @@ RDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-gl
 REQUIRED_USE=cman? ( !heartbeat )
 SLOT=0
 SRC_URI=https://github.com/ClusterLabs/pacemaker/tarball/Pacemaker-1.1.7 -> pacemaker-1.1.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7bb04e4f03214a38dc72c86a342f582d
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-1.1.8-r1 b/metadata/md5-cache/sys-cluster/pacemaker-1.1.8-r2
similarity index 81%
rename from metadata/md5-cache/sys-cluster/pacemaker-1.1.8-r1
rename to metadata/md5-cache/sys-cluster/pacemaker-1.1.8-r2
index 2c8227a05279..63e52a8785fc 100644
--- a/metadata/md5-cache/sys-cluster/pacemaker-1.1.8-r1
+++ b/metadata/md5-cache/sys-cluster/pacemaker-1.1.8-r2
@@ -1,15 +1,14 @@
-DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue >=sys-cluster/libqb-0.14.0 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue >=sys-cluster/libqb-0.14.0 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=Pacemaker CRM
 EAPI=4
 HOMEPAGE=http://www.linux-ha.org/wiki/Pacemaker
 IUSE=acl cman heartbeat smtp snmp static-libs
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=GPL-2
-PDEPEND=sys-cluster/crmsh
 RDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue >=sys-cluster/libqb-0.14.0 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 ) =dev-lang/python-2*
 REQUIRED_USE=cman? ( !heartbeat )
 SLOT=0
 SRC_URI=https://github.com/ClusterLabs/pacemaker/tarball/Pacemaker-1.1.8 -> pacemaker-1.1.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3829d67042bfd044541e3e8c87e5486d
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3df933059b7a64e8df6478c6c2c3fadb
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-gui-2.1.1 b/metadata/md5-cache/sys-cluster/pacemaker-gui-2.1.1
index b2339ab65191..3a14015b68d8 100644
--- a/metadata/md5-cache/sys-cluster/pacemaker-gui-2.1.1
+++ b/metadata/md5-cache/sys-cluster/pacemaker-gui-2.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=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 <sys-cluster/pacemaker-1.1.8 ) heartbeat? ( sys-cluster/pacemaker[heartbeat] ) gtk? ( dev-python/pygtk ) sys-libs/ncurses sys-libs/pam sys-libs/zlib gtk? ( dev-lang/swig ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 <sys-cluster/pacemaker-1.1.8 ) heartbeat? ( sys-cluster/pacemaker[heartbeat] ) gtk? ( dev-python/pygtk ) sys-libs/ncurses sys-libs/pam sys-libs/zlib gtk? ( dev-lang/swig ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Pacemaker python GUI and management daemon
 EAPI=4
 HOMEPAGE=http://hg.clusterlabs.org/pacemaker/pygui/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=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 <sys-cluster/pacemaker-1.1.8 ) 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*
 SLOT=0
 SRC_URI=https://github.com/gao-yan/pacemaker-mgmt/tarball/pacemaker-mgmt-2.1.1 -> pacemaker-gui-2.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7e667bf2ed9711c1ae49b6eb6f726989
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-gui-2.1.2 b/metadata/md5-cache/sys-cluster/pacemaker-gui-2.1.2
index a9755a2b6607..313f1998c52f 100644
--- a/metadata/md5-cache/sys-cluster/pacemaker-gui-2.1.2
+++ b/metadata/md5-cache/sys-cluster/pacemaker-gui-2.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=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 ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Pacemaker python GUI and management daemon
 EAPI=4
 HOMEPAGE=http://hg.clusterlabs.org/pacemaker/pygui/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=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*
 SLOT=0
 SRC_URI=https://github.com/gao-yan/pacemaker-mgmt/tarball/pacemaker-mgmt-2.1.2 -> pacemaker-gui-2.1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d6e9dcef211881c74c3ff122c15ae3cf
diff --git a/metadata/md5-cache/sys-cluster/resource-agents-1.0.4-r1 b/metadata/md5-cache/sys-cluster/resource-agents-1.0.4-r1
index fb7c295fc50a..98c7be64f5f7 100644
--- a/metadata/md5-cache/sys-cluster/resource-agents-1.0.4-r1
+++ b/metadata/md5-cache/sys-cluster/resource-agents-1.0.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=sys-apps/iproute2 sys-cluster/cluster-glue !<sys-cluster/heartbeat-3.0 libnet? ( net-libs/libnet:1.1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/iproute2 sys-cluster/cluster-glue !<sys-cluster/heartbeat-3.0 libnet? ( net-libs/libnet:1.1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Resources pack for Heartbeat / Pacemaker
 EAPI=2
 HOMEPAGE=http://www.linux-ha.org/wiki/Resource_Agents
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/iproute2 sys-cluster/cluster-glue !<sys-cluster/heartbeat-3.0 libnet? ( net-libs/libnet:1.1 )
 SLOT=0
 SRC_URI=http://hg.linux-ha.org/agents/archive/agents-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cbf23e27ebbd065809026fc426bb9a33
diff --git a/metadata/md5-cache/sys-cluster/resource-agents-1.0.4-r2 b/metadata/md5-cache/sys-cluster/resource-agents-1.0.4-r2
index 3ab8d1c5e4c6..08292583aa64 100644
--- a/metadata/md5-cache/sys-cluster/resource-agents-1.0.4-r2
+++ b/metadata/md5-cache/sys-cluster/resource-agents-1.0.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=sys-apps/iproute2 sys-cluster/cluster-glue !<sys-cluster/heartbeat-3.0 libnet? ( net-libs/libnet:1.1 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/iproute2 sys-cluster/cluster-glue !<sys-cluster/heartbeat-3.0 libnet? ( net-libs/libnet:1.1 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Resources pack for Heartbeat / Pacemaker
 EAPI=2
 HOMEPAGE=http://www.linux-ha.org/wiki/Resource_Agents
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/iproute2 sys-cluster/cluster-glue !<sys-cluster/heartbeat-3.0 libnet? ( net-libs/libnet:1.1 )
 SLOT=0
 SRC_URI=http://hg.linux-ha.org/agents/archive/agents-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=57e2111d985b2fcc290f004b5b3e5830
diff --git a/metadata/md5-cache/sys-cluster/resource-agents-3.9.4 b/metadata/md5-cache/sys-cluster/resource-agents-3.9.4
index 65d5bf903de1..abd2033e0ad3 100644
--- a/metadata/md5-cache/sys-cluster/resource-agents-3.9.4
+++ b/metadata/md5-cache/sys-cluster/resource-agents-3.9.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=sys-apps/iproute2 sys-cluster/cluster-glue !<sys-cluster/heartbeat-3.0 libnet? ( net-libs/libnet:1.1 ) doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/iproute2 sys-cluster/cluster-glue !<sys-cluster/heartbeat-3.0 libnet? ( net-libs/libnet:1.1 ) doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Resources pack for Heartbeat / Pacemaker
 EAPI=5
 HOMEPAGE=http://www.linux-ha.org/wiki/Resource_Agents
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/iproute2 sys-cluster/cluster-glue !<sys-cluster/heartbeat-3.0 libnet? ( net-libs/libnet:1.1 )
 SLOT=0
 SRC_URI=https://github.com/ClusterLabs/resource-agents/archive/v3.9.4.tar.gz -> resource-agents-3.9.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a01c3b8d816cd9c9bc2ebf9d1858fb33
diff --git a/metadata/md5-cache/sys-cluster/resource-agents-3.9.5 b/metadata/md5-cache/sys-cluster/resource-agents-3.9.5
index b682d810eafe..f9519cdaad7d 100644
--- a/metadata/md5-cache/sys-cluster/resource-agents-3.9.5
+++ b/metadata/md5-cache/sys-cluster/resource-agents-3.9.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=sys-apps/iproute2 sys-cluster/cluster-glue !<sys-cluster/heartbeat-3.0 libnet? ( net-libs/libnet:1.1 ) doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/iproute2 sys-cluster/cluster-glue !<sys-cluster/heartbeat-3.0 libnet? ( net-libs/libnet:1.1 ) doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Resources pack for Heartbeat / Pacemaker
 EAPI=5
 HOMEPAGE=http://www.linux-ha.org/wiki/Resource_Agents
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/iproute2 sys-cluster/cluster-glue !<sys-cluster/heartbeat-3.0 libnet? ( net-libs/libnet:1.1 )
 SLOT=0
 SRC_URI=https://github.com/ClusterLabs/resource-agents/archive/v3.9.5.tar.gz -> resource-agents-3.9.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a00a578b1e9239718e3593c601283354
diff --git a/metadata/md5-cache/sys-cluster/slurm-2.5.4 b/metadata/md5-cache/sys-cluster/slurm-2.5.4
index 80d55e0d797c..0ef3bbcd22f4 100644
--- a/metadata/md5-cache/sys-cluster/slurm-2.5.4
+++ b/metadata/md5-cache/sys-cluster/slurm-2.5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo mysql? ( dev-db/mysql ) munge? ( sys-auth/munge ) ypbind? ( net-nds/ypbind ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) lua? ( dev-lang/lua ) !lua? ( !dev-lang/lua ) >=sys-apps/hwloc-1.1.1-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+DEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo mysql? ( dev-db/mysql ) munge? ( sys-auth/munge ) ypbind? ( net-nds/ypbind ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) lua? ( dev-lang/lua ) !lua? ( !dev-lang/lua ) >=sys-apps/hwloc-1.1.1-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 DESCRIPTION=SLURM: A Highly Scalable Resource Manager
 EAPI=4
 HOMEPAGE=http://www.schedmd.com
@@ -11,5 +11,5 @@ REQUIRED_USE=torque? ( perl )
 RESTRICT=primaryuri
 SLOT=0
 SRC_URI=http://www.schedmd.com/download/total/slurm-2.5.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e2582c364af041c6f49f541ed0b0834d
diff --git a/metadata/md5-cache/sys-cluster/torque-2.3.13 b/metadata/md5-cache/sys-cluster/torque-2.3.13
index 0790463bb459..ddd2b5736424 100644
--- a/metadata/md5-cache/sys-cluster/torque-2.3.13
+++ b/metadata/md5-cache/sys-cluster/torque-2.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst preinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Resource manager and queuing system based on OpenPBS
 EAPI=2
 HOMEPAGE=http://www.adaptivecomputing.com/products/torque.php
@@ -9,5 +9,5 @@ LICENSE=openpbs
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://www.adaptivecomputing.com/resources/downloads/torque/torque-2.3.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d5bdbabf858e11cbde72c844e66cb95d
diff --git a/metadata/md5-cache/sys-cluster/torque-2.4.16 b/metadata/md5-cache/sys-cluster/torque-2.4.16
index eb4a8f97da2e..ce2dec1e2198 100644
--- a/metadata/md5-cache/sys-cluster/torque-2.4.16
+++ b/metadata/md5-cache/sys-cluster/torque-2.4.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst preinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Resource manager and queuing system based on OpenPBS
 EAPI=2
 HOMEPAGE=http://www.adaptivecomputing.com/products/torque.php
@@ -9,5 +9,5 @@ LICENSE=openpbs
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://www.adaptivecomputing.com/resources/downloads/torque/torque-2.4.16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=928b37c534cc5ed4117b6e1516a8dc45
diff --git a/metadata/md5-cache/sys-cluster/torque-2.5.12 b/metadata/md5-cache/sys-cluster/torque-2.5.12
index 3a7242e89c54..2255d41cc56d 100644
--- a/metadata/md5-cache/sys-cluster/torque-2.5.12
+++ b/metadata/md5-cache/sys-cluster/torque-2.5.12
@@ -9,5 +9,5 @@ LICENSE=torque-2.5
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://www.adaptivecomputing.com/resources/downloads/torque/torque-2.5.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=07ddafd3dcaa5692ddf600cc2d703f18
diff --git a/metadata/md5-cache/sys-cluster/torque-2.5.9-r1 b/metadata/md5-cache/sys-cluster/torque-2.5.9-r1
index f4817a7579a5..8d2b6b06f85a 100644
--- a/metadata/md5-cache/sys-cluster/torque-2.5.9-r1
+++ b/metadata/md5-cache/sys-cluster/torque-2.5.9-r1
@@ -9,5 +9,5 @@ LICENSE=torque-2.5
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://www.adaptivecomputing.com/resources/downloads/torque/torque-2.5.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8a2b311e7c9d0b6bfe1cacaf3eb93a0d
diff --git a/metadata/md5-cache/sys-cluster/torque-3.0.6-r1 b/metadata/md5-cache/sys-cluster/torque-3.0.6-r1
index d48c61c6e7c4..6ce836215739 100644
--- a/metadata/md5-cache/sys-cluster/torque-3.0.6-r1
+++ b/metadata/md5-cache/sys-cluster/torque-3.0.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Resource manager and queuing system based on OpenPBS
 EAPI=4
 HOMEPAGE=http://www.adaptivecomputing.com/products/torque.php
@@ -9,5 +9,5 @@ LICENSE=torque-2.5
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://www.adaptivecomputing.com/resources/downloads/torque/torque-3.0.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6f3c1371c564f91fb2511f286195c34a
diff --git a/metadata/md5-cache/sys-cluster/vzctl-9999 b/metadata/md5-cache/sys-cluster/vzctl-9999
index d3a5f7ca623e..f87b012f7be0 100644
--- a/metadata/md5-cache/sys-cluster/vzctl-9999
+++ b/metadata/md5-cache/sys-cluster/vzctl-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=net-firewall/iptables sys-apps/ed >=sys-apps/iproute2-3.3.0 sys-fs/vzquota ploop? ( >=sys-cluster/ploop-1.5 ) cgroup? ( >=dev-libs/libcgroup-0.37 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git virtual/pkgconfig
+DEPEND=net-firewall/iptables sys-apps/ed >=sys-apps/iproute2-3.3.0 sys-fs/vzquota ploop? ( >=sys-cluster/ploop-1.5 ) cgroup? ( >=dev-libs/libcgroup-0.37 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git virtual/pkgconfig
 DESCRIPTION=OpenVZ ConTainers control utility
 EAPI=5
 HOMEPAGE=http://openvz.org/
@@ -7,5 +7,5 @@ IUSE=cgroup +ploop
 LICENSE=GPL-2
 RDEPEND=net-firewall/iptables sys-apps/ed >=sys-apps/iproute2-3.3.0 sys-fs/vzquota ploop? ( >=sys-cluster/ploop-1.5 ) cgroup? ( >=dev-libs/libcgroup-0.37 )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de
 _md5_=23e33ebff877f39fae304ea8296331e0
diff --git a/metadata/md5-cache/sys-cluster/wulfware-2.6.0 b/metadata/md5-cache/sys-cluster/wulfware-2.6.0
index feb5d20fe669..050233d8c73f 100644
--- a/metadata/md5-cache/sys-cluster/wulfware-2.6.0
+++ b/metadata/md5-cache/sys-cluster/wulfware-2.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=dev-libs/libxml2 sys-libs/ncurses sys-libs/zlib !sys-cluster/wulfstat !sys-cluster/xmlsysd || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 sys-libs/ncurses sys-libs/zlib !sys-cluster/wulfstat !sys-cluster/xmlsysd || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Applications to monitor on a beowulf- or GRID-style clusters.
 HOMEPAGE=http://www.phy.duke.edu/~rgb/Beowulf/wulfware.php
 KEYWORDS=~amd64 ~x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/ncurses sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.phy.duke.edu/~rgb/Beowulf/wulfware/wulfware-2.6.0.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=af7617c4ddeee55f956d14062cae3960
diff --git a/metadata/md5-cache/sys-devel/ct-ng-1.14.1 b/metadata/md5-cache/sys-devel/ct-ng-1.14.1
index 3fc073b5c0cb..6793304e0675 100644
--- a/metadata/md5-cache/sys-devel/ct-ng-1.14.1
+++ b/metadata/md5-cache/sys-devel/ct-ng-1.14.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=crosstool-ng is a tool to build cross-compiling toolchains
 EAPI=4
 HOMEPAGE=http://crosstool-ng.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/curl dev-util/gperf dev-vcs/cvs dev-vcs/subversion
 SLOT=0
 SRC_URI=http://ymorin.is-a-geek.org/download/crosstool-ng/crosstool-ng-1.14.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=3e2a7e78661050c6c7a7386de0141201
diff --git a/metadata/md5-cache/sys-devel/ct-ng-1.15.3 b/metadata/md5-cache/sys-devel/ct-ng-1.15.3
index 12fdc95d4c2f..7b0fbb7bfdcf 100644
--- a/metadata/md5-cache/sys-devel/ct-ng-1.15.3
+++ b/metadata/md5-cache/sys-devel/ct-ng-1.15.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=crosstool-ng is a tool to build cross-compiling toolchains
 EAPI=4
 HOMEPAGE=http://crosstool-ng.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/curl dev-util/gperf dev-vcs/cvs dev-vcs/subversion
 SLOT=0
 SRC_URI=http://ymorin.is-a-geek.org/download/crosstool-ng/crosstool-ng-1.15.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=53960efd5ef0eeb5d480ff45fbd1d5bd
diff --git a/metadata/md5-cache/sys-devel/ct-ng-1.16.0 b/metadata/md5-cache/sys-devel/ct-ng-1.16.0
index fa0a061c1249..4cfc2a2a8a41 100644
--- a/metadata/md5-cache/sys-devel/ct-ng-1.16.0
+++ b/metadata/md5-cache/sys-devel/ct-ng-1.16.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=crosstool-ng is a tool to build cross-compiling toolchains
 EAPI=4
 HOMEPAGE=http://crosstool-ng.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/curl dev-util/gperf dev-vcs/cvs dev-vcs/subversion
 SLOT=0
 SRC_URI=http://ymorin.is-a-geek.org/download/crosstool-ng/crosstool-ng-1.16.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=56416f8e4aae93647cfd2dbc4e0f7833
diff --git a/metadata/md5-cache/sys-devel/ct-ng-1.17.0 b/metadata/md5-cache/sys-devel/ct-ng-1.17.0
index 1f1238a8fa4b..9c3d2cf2f641 100644
--- a/metadata/md5-cache/sys-devel/ct-ng-1.17.0
+++ b/metadata/md5-cache/sys-devel/ct-ng-1.17.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=crosstool-ng is a tool to build cross-compiling toolchains
 EAPI=4
 HOMEPAGE=http://crosstool-ng.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/curl dev-util/gperf dev-vcs/cvs dev-vcs/subversion
 SLOT=0
 SRC_URI=http://ymorin.is-a-geek.org/download/crosstool-ng/crosstool-ng-1.17.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3ffc91563e8e6395156b11c6547b2248
diff --git a/metadata/md5-cache/sys-devel/ct-ng-1.18.0 b/metadata/md5-cache/sys-devel/ct-ng-1.18.0
index 29143187875d..5946c147266b 100644
--- a/metadata/md5-cache/sys-devel/ct-ng-1.18.0
+++ b/metadata/md5-cache/sys-devel/ct-ng-1.18.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=crosstool-ng is a tool to build cross-compiling toolchains
 EAPI=4
 HOMEPAGE=http://crosstool-ng.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/curl dev-util/gperf dev-vcs/cvs dev-vcs/subversion
 SLOT=0
 SRC_URI=http://ymorin.is-a-geek.org/download/crosstool-ng/crosstool-ng-1.18.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=74c364e42900a091428453bdcc613e07
diff --git a/metadata/md5-cache/sys-devel/distcc-3.2_rc1 b/metadata/md5-cache/sys-devel/distcc-3.2_rc1
index 146d76b81288..368210140178 100644
--- a/metadata/md5-cache/sys-devel/distcc-3.2_rc1
+++ b/metadata/md5-cache/sys-devel/distcc-3.2_rc1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 DESCRIPTION=a program to distribute compilation of C code across several machines on a network
 EAPI=3
 HOMEPAGE=http://distcc.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/popt avahi? ( >=net-dns/avahi-0.6[dbus] ) gnome? ( >=gnome-base
 RESTRICT=test
 SLOT=0
 SRC_URI=http://distcc.googlecode.com/files/distcc-3.2rc1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=80121eb477ffe15989c12d47edc44838
diff --git a/metadata/md5-cache/sys-devel/flex-2.5.35_p10 b/metadata/md5-cache/sys-devel/flex-2.5.35_p10
index f658bedb4ede..1a5d5a5f1ab5 100644
--- a/metadata/md5-cache/sys-devel/flex-2.5.35_p10
+++ b/metadata/md5-cache/sys-devel/flex-2.5.35_p10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-devel/m4 nls? ( sys-devel/gettext ) test? ( sys-devel/bison ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-devel/m4 nls? ( sys-devel/gettext ) test? ( sys-devel/bison ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Fast Lexical Analyzer
 EAPI=3
 HOMEPAGE=http://flex.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=FLEX
 RDEPEND=sys-devel/m4
 SLOT=0
 SRC_URI=mirror://sourceforge/flex/flex-2.5.35.tar.bz2 mirror://debian/pool/main/f/flex/flex_2.5.35-10.diff.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=212b0b62b5517807bb0144daf3a503cf
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.4 b/metadata/md5-cache/sys-devel/gcc-4.6.4
new file mode 100644
index 000000000000..0218321749e4
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm setup test unpack
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.18 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig amd64? ( multilib? ( app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-xlibs ) ) x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+DESCRIPTION=The GNU Compiler Collection
+HOMEPAGE=http://gcc.gnu.org/
+IUSE=multislot nls nptl test vanilla altivec cxx fortran nopie nossp doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
+RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
+RESTRICT=strip
+SLOT=4.6
+SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.4-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.4-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.4-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.4-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-piepatches-v0.5.2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain	44098d83f6930cb8edd899dd45a61372	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=d036b2af656451156ee52f740baa1fba
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664
index 8b2f90fc4070..eacc8436b80e 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=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 nls? ( sys-devel/gettext ) virtual/libiconv >=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 nls? ( sys-devel/gettext ) virtual/libiconv >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Apple branch of the GNU Compiler Collection, Developer Tools 3.2.3
 EAPI=3
 HOMEPAGE=http://gcc.gnu.org
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=strip
 SLOT=42
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain	44098d83f6930cb8edd899dd45a61372	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain	44098d83f6930cb8edd899dd45a61372	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d5e5182e1ebf95a532a8ea011fcf95fc
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1
index 7d22a9e53514..9afecc00f13f 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=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 nls? ( sys-devel/gettext ) virtual/libiconv >=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 nls? ( sys-devel/gettext ) virtual/libiconv >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Apple branch of the GNU Compiler Collection, Developer Tools 4.0
 EAPI=3
 HOMEPAGE=http://gcc.gnu.org
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=strip
 SLOT=42
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain	44098d83f6930cb8edd899dd45a61372	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	prefix	21058c21ca48453d771df15500873ede	toolchain	44098d83f6930cb8edd899dd45a61372	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3bf52ae2cbf24b2891f95c393aac5e41
diff --git a/metadata/md5-cache/sys-devel/icecream-0.9.7-r1 b/metadata/md5-cache/sys-devel/icecream-0.9.7-r1
index 03a707a70c20..3c74cec4a349 100644
--- a/metadata/md5-cache/sys-devel/icecream-0.9.7-r1
+++ b/metadata/md5-cache/sys-devel/icecream-0.9.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=icecc is a program for distributed compiling of C(++) code across several machines; based on distcc
 EAPI=4
 HOMEPAGE=http://en.opensuse.org/Icecream
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~hppa ~ppc ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.suse.com/pub/projects/icecream/icecc-0.9.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f9cba1093e628b41de403eefd2223c8b
diff --git a/metadata/md5-cache/sys-devel/libtool-2.2.10 b/metadata/md5-cache/sys-devel/libtool-2.2.10
index e061259577a7..1b24925e6607 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.2.10
+++ b/metadata/md5-cache/sys-devel/libtool-2.2.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68
 DESCRIPTION=A shared library tool for developers
 EAPI=2
 HOMEPAGE=http://www.gnu.org/software/libtool/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.2.10.tar.lzma
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=27877f2e4e748426b0a04343f41bd97c
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4-r1 b/metadata/md5-cache/sys-devel/libtool-2.4-r1
index 99e765e044f0..f088066f700b 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4-r1
+++ b/metadata/md5-cache/sys-devel/libtool-2.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68
 DESCRIPTION=A shared library tool for developers
 EAPI=2
 HOMEPAGE=http://www.gnu.org/software/libtool/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig !<sys-devel/autoconf-2.62:2.5 !<sys-devel/automake-1.11.1:1.11 !=sys-devel/libtool-2*:1.5
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2bcbcfd74e08e81449f113f841d67fa7
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4-r4 b/metadata/md5-cache/sys-devel/libtool-2.4-r4
index 90bd011c645f..c791ba321276 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4-r4
+++ b/metadata/md5-cache/sys-devel/libtool-2.4-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68
 DESCRIPTION=A shared library tool for developers
 EAPI=2
 HOMEPAGE=http://www.gnu.org/software/libtool/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig !<sys-devel/autoconf-2.62:2.5 !<sys-devel/automake-1.11.1:1.11 !=sys-devel/libtool-2*:1.5
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d10180fe15e2160da45e8bff64115ad4
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.2 b/metadata/md5-cache/sys-devel/libtool-2.4.2
index 5a50797eb34c..893cc2243e4c 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4.2
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68
 DESCRIPTION=A shared library tool for developers
 EAPI=2
 HOMEPAGE=http://www.gnu.org/software/libtool/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig !<sys-devel/autoconf-2.62:2.5 !<sys-devel/automake-1.11.1:1.11 !=sys-devel/libtool-2*:1.5
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1a6b23f6ff3241dce9cf8f67f1205f6b
diff --git a/metadata/md5-cache/sys-devel/libtool-9999 b/metadata/md5-cache/sys-devel/libtool-9999
index a0914d479f24..74187a9526f1 100644
--- a/metadata/md5-cache/sys-devel/libtool-9999
+++ b/metadata/md5-cache/sys-devel/libtool-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 dev-vcs/git
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 dev-vcs/git
 DESCRIPTION=A shared library tool for developers
 EAPI=2
 HOMEPAGE=http://www.gnu.org/software/libtool/
@@ -7,5 +7,5 @@ IUSE=static-libs test vanilla
 LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.65 >=sys-devel/automake-1.11.1
 SLOT=2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=86ad7f39dadb63660eee922299ae0a5a
diff --git a/metadata/md5-cache/sys-devel/prelink-20120628 b/metadata/md5-cache/sys-devel/prelink-20120628
index 05c6f58d979c..a04cd3420f02 100644
--- a/metadata/md5-cache/sys-devel/prelink-20120628
+++ b/metadata/md5-cache/sys-devel/prelink-20120628
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=>=dev-libs/elfutils-0.100[static-libs(+)] !dev-libs/libelf >=sys-libs/glibc-2.8 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/elfutils-0.100[static-libs(+)] !dev-libs/libelf >=sys-libs/glibc-2.8 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times
 EAPI=4
 HOMEPAGE=http://people.redhat.com/jakub/prelink
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.100[static-libs(+)] !dev-libs/libelf >=sys-libs/glibc-2.8 >=sys-devel/binutils-2.18
 SLOT=0
 SRC_URI=mirror://gentoo/prelink-20120628.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d27c0eef056980591a4873b31c28dc0b
diff --git a/metadata/md5-cache/sys-devel/systemd-sdk-9999 b/metadata/md5-cache/sys-devel/systemd-sdk-9999
index aa8941265e0b..54dad80be12c 100644
--- a/metadata/md5-cache/sys-devel/systemd-sdk-9999
+++ b/metadata/md5-cache/sys-devel/systemd-sdk-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Macros and misc files for systemd daemons
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/systemd-sdk/
 LICENSE=BSD
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5e9dd22c1b040fca305a2c17611c99a1
diff --git a/metadata/md5-cache/sys-devel/ucpp-9999 b/metadata/md5-cache/sys-devel/ucpp-9999
index 432efa1c2a7d..180b4e13bbc4 100644
--- a/metadata/md5-cache/sys-devel/ucpp-9999
+++ b/metadata/md5-cache/sys-devel/ucpp-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A quick and light preprocessor, but anyway fully compliant to C99
 EAPI=5
 HOMEPAGE=http://code.google.com/p/ucpp/
 IUSE=static-libs
 LICENSE=BSD
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d2602ef28692bb44f561e7726ea86933
diff --git a/metadata/md5-cache/sys-firmware/alsa-firmware-1.0.24.1 b/metadata/md5-cache/sys-firmware/alsa-firmware-1.0.24.1
index 77bde5fde6ba..b33467d5d50c 100644
--- a/metadata/md5-cache/sys-firmware/alsa-firmware-1.0.24.1
+++ b/metadata/md5-cache/sys-firmware/alsa-firmware-1.0.24.1
@@ -6,8 +6,8 @@ HOMEPAGE=http://www.alsa-project.org/
 IUSE=alsa_cards_pcxhr alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart alsa_cards_asihpi alsa_cards_sb16 alsa_cards_korg1212 alsa_cards_maestro3 alsa_cards_emi26 alsa_cards_ymfpci alsa_cards_wavefront alsa_cards_msnd-pinnacle alsa_cards_aica alsa_cards_darla20 alsa_cards_gina20 alsa_cards_layla20 alsa_cards_darla24 alsa_cards_gina24 alsa_cards_layla24 alsa_cards_mona alsa_cards_mia alsa_cards_indigo alsa_cards_indigoio alsa_cards_echo3g alsa_cards_emu1212 alsa_cards_emu1616 alsa_cards_emu1820 alsa_cards_emu10k1
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
-RDEPEND=alsa_cards_usb-usx2y? ( sys-apps/fxload ) alsa_cards_hdsp? ( media-sound/alsa-tools ) alsa_cards_hdspm? ( media-sound/alsa-tools ) alsa_cards_mixart? ( || ( virtual/udev media-sound/alsa-tools ) ) alsa_cards_vx222? ( || ( virtual/udev media-sound/alsa-tools ) ) alsa_cards_pcxhr? ( || ( virtual/udev media-sound/alsa-tools ) )
+RDEPEND=alsa_cards_usb-usx2y? ( sys-apps/fxload ) alsa_cards_hdsp? ( media-sound/alsa-tools ) alsa_cards_hdspm? ( media-sound/alsa-tools )
 SLOT=0
 SRC_URI=mirror://alsaproject/firmware/alsa-firmware-1.0.24.1.tar.bz2
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de
-_md5_=507b75ef585ea4ea94b05934a9edc9c7
+_md5_=2dc411f94ec86d8c06fdeff13f4f6a57
diff --git a/metadata/md5-cache/sys-firmware/alsa-firmware-1.0.27 b/metadata/md5-cache/sys-firmware/alsa-firmware-1.0.27
new file mode 100644
index 000000000000..27b424d40efb
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/alsa-firmware-1.0.27
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Advanced Linux Sound Architecture firmware
+EAPI=5
+HOMEPAGE=http://www.alsa-project.org/
+IUSE=alsa_cards_pcxhr alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart alsa_cards_asihpi alsa_cards_sb16 alsa_cards_korg1212 alsa_cards_maestro3 alsa_cards_ymfpci alsa_cards_wavefront alsa_cards_msnd-pinnacle alsa_cards_aica alsa_cards_ca0132 alsa_cards_darla20 alsa_cards_gina20 alsa_cards_layla20 alsa_cards_darla24 alsa_cards_gina24 alsa_cards_layla24 alsa_cards_mona alsa_cards_mia alsa_cards_indigo alsa_cards_indigoio alsa_cards_echo3g alsa_cards_emu1212 alsa_cards_emu1616 alsa_cards_emu1820 alsa_cards_emu10k1
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=alsa_cards_usb-usx2y? ( sys-apps/fxload ) alsa_cards_hdsp? ( media-sound/alsa-tools ) alsa_cards_hdspm? ( media-sound/alsa-tools )
+SLOT=0
+SRC_URI=mirror://alsaproject/firmware/alsa-firmware-1.0.27.tar.bz2
+_eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de
+_md5_=2909e3faf9c61c764b574d2a787dad52
diff --git a/metadata/md5-cache/sys-fs/archfs-0.5.6b b/metadata/md5-cache/sys-fs/archfs-0.5.6b
index fe95bb114586..45083e172ebd 100644
--- a/metadata/md5-cache/sys-fs/archfs-0.5.6b
+++ b/metadata/md5-cache/sys-fs/archfs-0.5.6b
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile prepare
-DEPEND=sys-fs/fuse || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-fs/fuse || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Filesystem for rdiff-backup'ed folders
 EAPI=4
 HOMEPAGE=http://code.google.com/p/rdiff-backup-fs/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/fuse app-backup/rdiff-backup
 SLOT=0
 SRC_URI=http://archfs.googlecode.com/files/archfs-0.5.6b.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=33a5dcc30553115f85669bb17f92b328
diff --git a/metadata/md5-cache/sys-fs/bindfs-1.11 b/metadata/md5-cache/sys-fs/bindfs-1.11
index 3b3dfe731ca5..d5bd5e5d5db3 100644
--- a/metadata/md5-cache/sys-fs/bindfs-1.11
+++ b/metadata/md5-cache/sys-fs/bindfs-1.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=sys-fs/fuse virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-fs/fuse virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A FUSE filesystem for mounting a directory to another location and altering permissions
 EAPI=4
 HOMEPAGE=http://code.google.com/p/bindfs/
@@ -10,5 +10,5 @@ RDEPEND=sys-fs/fuse
 RESTRICT=test
 SLOT=0
 SRC_URI=http://bindfs.googlecode.com/files/bindfs-1.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4fb3f4656f267310cd7b500f550d9e1e
diff --git a/metadata/md5-cache/sys-fs/bindfs-1.12 b/metadata/md5-cache/sys-fs/bindfs-1.12
index 4079a763128e..00d236e483f8 100644
--- a/metadata/md5-cache/sys-fs/bindfs-1.12
+++ b/metadata/md5-cache/sys-fs/bindfs-1.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=sys-fs/fuse virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-fs/fuse virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=FUSE filesystem for mounting a directory to another location and altering permissions
 EAPI=5
 HOMEPAGE=http://code.google.com/p/bindfs/
@@ -10,5 +10,5 @@ RDEPEND=sys-fs/fuse
 RESTRICT=test
 SLOT=0
 SRC_URI=http://bindfs.googlecode.com/files/bindfs-1.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9d005389b927264599563ad5729527fa
diff --git a/metadata/md5-cache/sys-fs/chironfs-1.1.1 b/metadata/md5-cache/sys-fs/chironfs-1.1.1
index 2a86abf015d8..3b0408f023bd 100644
--- a/metadata/md5-cache/sys-fs/chironfs-1.1.1
+++ b/metadata/md5-cache/sys-fs/chironfs-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=sys-fs/fuse || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-fs/fuse || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Chiron FS - A FUSE based replication filesystem
 EAPI=2
 HOMEPAGE=http://www.furquim.org/chironfs/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/fuse
 SLOT=0
 SRC_URI=http://chironfs.googlecode.com/files/chironfs-1.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c66a095e52275f9076432f8919b08e31
diff --git a/metadata/md5-cache/sys-fs/copyfs-1.0.1 b/metadata/md5-cache/sys-fs/copyfs-1.0.1
index 9753529dcfad..a23023a9df95 100644
--- a/metadata/md5-cache/sys-fs/copyfs-1.0.1
+++ b/metadata/md5-cache/sys-fs/copyfs-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-fs/fuse-2.0 sys-apps/attr || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-fs/fuse-2.0 sys-apps/attr || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=fuse-based filesystem for maintaining configuration files
 EAPI=2
 HOMEPAGE=http://invaders.mars-attacks.org/~boklm/copyfs/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-fs/fuse-2.0 sys-apps/attr
 SLOT=0
 SRC_URI=http://invaders.mars-attacks.org/~boklm/copyfs//copyfs-1.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f0748c282ad4a501f53af10f12bf6473
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-1.1.2 b/metadata/md5-cache/sys-fs/cryptsetup-1.1.2
index d707a7b6946f..77a89bc1b19a 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-1.1.2
+++ b/metadata/md5-cache/sys-fs/cryptsetup-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=sys-fs/lvm2-2.02.64 >=dev-libs/libgcrypt-1.1.42 >=dev-libs/libgpg-error-1.0-r1 >=dev-libs/popt-1.7 virtual/udev || ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 ) selinux? ( sys-libs/libselinux ) !sys-fs/cryptsetup-luks || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-fs/lvm2-2.02.64 >=dev-libs/libgcrypt-1.1.42 >=dev-libs/libgpg-error-1.0-r1 >=dev-libs/popt-1.7 virtual/udev || ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 ) selinux? ( sys-libs/libselinux ) !sys-fs/cryptsetup-luks || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tool to setup encrypted devices with dm-crypt
 EAPI=2
 HOMEPAGE=http://code.google.com/p/cryptsetup/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-fs/lvm2-2.02.64 >=dev-libs/libgcrypt-1.1.42 >=dev-libs/libgpg-error-1.0-r1 >=dev-libs/popt-1.7 virtual/udev || ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 ) selinux? ( sys-libs/libselinux ) !sys-fs/cryptsetup-luks
 SLOT=0
 SRC_URI=http://cryptsetup.googlecode.com/files/cryptsetup-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f342e9b752d40c0f9b35e1194213ea96
diff --git a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r3 b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r3
index df6a66775cd3..0328c19b76c9 100644
--- a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r3
+++ b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=sys-fs/lvm2-2.02.45 klibc? ( dev-libs/klibc ) dietlibc? ( dev-libs/dietlibc ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-fs/lvm2-2.02.45 klibc? ( dev-libs/klibc ) dietlibc? ( dev-libs/dietlibc ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Device-mapper RAID tool and library
 EAPI=5
 HOMEPAGE=http://people.redhat.com/~heinzm/sw/dmraid/
@@ -10,5 +10,5 @@ RDEPEND=>=sys-fs/lvm2-2.02.45 klibc? ( dev-libs/klibc ) dietlibc? ( dev-libs/die
 REQUIRED_USE=klibc? ( !dietlibc )
 SLOT=0
 SRC_URI=http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=caae20f515914f4f940ae4e16f58addf
diff --git a/metadata/md5-cache/sys-fs/ecryptfs-utils-101 b/metadata/md5-cache/sys-fs/ecryptfs-utils-101
index ed38727e5a07..f637e30dd22d 100644
--- a/metadata/md5-cache/sys-fs/ecryptfs-utils-101
+++ b/metadata/md5-cache/sys-fs/ecryptfs-utils-101
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=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 ) virtual/pkgconfig 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=eCryptfs userspace utilities
 EAPI=4
 HOMEPAGE=https://launchpad.net/ecryptfs
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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* ) )
 SLOT=0
 SRC_URI=http://launchpad.net/ecryptfs/trunk/101/+download/ecryptfs-utils_101.orig.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3d7e89708c7613d557c25c81c726fbb7
diff --git a/metadata/md5-cache/sys-fs/ecryptfs-utils-103 b/metadata/md5-cache/sys-fs/ecryptfs-utils-103
index 0beda50c270a..dd38dc5faf45 100644
--- a/metadata/md5-cache/sys-fs/ecryptfs-utils-103
+++ b/metadata/md5-cache/sys-fs/ecryptfs-utils-103
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=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 ) virtual/pkgconfig 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=eCryptfs userspace utilities
 EAPI=4
 HOMEPAGE=https://launchpad.net/ecryptfs
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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* ) )
 SLOT=0
 SRC_URI=http://launchpad.net/ecryptfs/trunk/103/+download/ecryptfs-utils_103.orig.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2743f7914d7712c8c46fca9e6c344026
diff --git a/metadata/md5-cache/sys-fs/eudev-1_beta2-r2 b/metadata/md5-cache/sys-fs/eudev-1_beta2-r2
index 1e9dd9164772..71ba480950a9 100644
--- a/metadata/md5-cache/sys-fs/eudev-1_beta2-r2
+++ b/metadata/md5-cache/sys-fs/eudev-1_beta2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare pretend setup
-DEPEND=gudev? ( dev-libs/glib:2 ) kmod? ( sys-apps/kmod ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) selinux? ( sys-libs/libselinux ) >=sys-apps/util-linux-2.20 !<sys-libs/glibc-2.11 dev-util/gperf >=dev-util/intltool-0.40.0 virtual/pkgconfig virtual/os-headers !<sys-kernel/linux-headers-2.6.31 doc? ( dev-util/gtk-doc ) app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gudev? ( dev-libs/glib:2 ) kmod? ( sys-apps/kmod ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) selinux? ( sys-libs/libselinux ) >=sys-apps/util-linux-2.20 !<sys-libs/glibc-2.11 dev-util/gperf >=dev-util/intltool-0.40.0 virtual/pkgconfig virtual/os-headers !<sys-kernel/linux-headers-2.6.31 doc? ( dev-util/gtk-doc ) app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=5
 HOMEPAGE=https://github.com/gentoo/eudev
@@ -11,5 +11,5 @@ RDEPEND=gudev? ( dev-libs/glib:2 ) kmod? ( sys-apps/kmod ) introspection? ( >=de
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/eudev/eudev-1_beta2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f263d8a84891a54765aee4aee8f282a8
diff --git a/metadata/md5-cache/sys-fs/eudev-1_beta4-r1 b/metadata/md5-cache/sys-fs/eudev-1_beta4-r1
index ab211d7e7853..f8a45fb92ea4 100644
--- a/metadata/md5-cache/sys-fs/eudev-1_beta4-r1
+++ b/metadata/md5-cache/sys-fs/eudev-1_beta4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare pretend setup
-DEPEND=gudev? ( dev-libs/glib:2 ) kmod? ( sys-apps/kmod ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) selinux? ( sys-libs/libselinux ) >=sys-apps/util-linux-2.20 !<sys-libs/glibc-2.11 keymap? ( dev-util/gperf ) >=dev-util/intltool-0.40.0 virtual/pkgconfig virtual/os-headers !<sys-kernel/linux-headers-2.6.31 doc? ( dev-util/gtk-doc ) app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gudev? ( dev-libs/glib:2 ) kmod? ( sys-apps/kmod ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) selinux? ( sys-libs/libselinux ) >=sys-apps/util-linux-2.20 !<sys-libs/glibc-2.11 keymap? ( dev-util/gperf ) >=dev-util/intltool-0.40.0 virtual/pkgconfig virtual/os-headers !<sys-kernel/linux-headers-2.6.31 doc? ( dev-util/gtk-doc ) app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=5
 HOMEPAGE=https://github.com/gentoo/eudev
@@ -11,5 +11,5 @@ RDEPEND=gudev? ( dev-libs/glib:2 ) kmod? ( sys-apps/kmod ) introspection? ( >=de
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/eudev/eudev-1_beta4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cb2e112c2cc23fb2e5b7d541c9007d48
diff --git a/metadata/md5-cache/sys-fs/eudev-9999 b/metadata/md5-cache/sys-fs/eudev-9999
index e9796e94f006..9a54b16ce0f7 100644
--- a/metadata/md5-cache/sys-fs/eudev-9999
+++ b/metadata/md5-cache/sys-fs/eudev-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare pretend setup unpack
-DEPEND=gudev? ( dev-libs/glib:2 ) kmod? ( sys-apps/kmod ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) selinux? ( sys-libs/libselinux ) >=sys-apps/util-linux-2.20 !<sys-libs/glibc-2.11 keymap? ( dev-util/gperf ) >=dev-util/intltool-0.40.0 virtual/pkgconfig virtual/os-headers !<sys-kernel/linux-headers-2.6.31 doc? ( dev-util/gtk-doc ) app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=gudev? ( dev-libs/glib:2 ) kmod? ( sys-apps/kmod ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) selinux? ( sys-libs/libselinux ) >=sys-apps/util-linux-2.20 !<sys-libs/glibc-2.11 keymap? ( dev-util/gperf ) >=dev-util/intltool-0.40.0 virtual/pkgconfig virtual/os-headers !<sys-kernel/linux-headers-2.6.31 doc? ( dev-util/gtk-doc ) app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=5
 HOMEPAGE=https://github.com/gentoo/eudev
@@ -9,5 +9,5 @@ PDEPEND=>=virtual/udev-180 openrc? ( >=sys-fs/udev-init-scripts-18 )
 RDEPEND=gudev? ( dev-libs/glib:2 ) kmod? ( sys-apps/kmod ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) selinux? ( sys-libs/libselinux ) >=sys-apps/util-linux-2.20 !<sys-libs/glibc-2.11 hwdb? ( >=sys-apps/hwids-20121202.2[udev] ) !sys-fs/udev !sys-apps/coldplug !sys-apps/systemd !<sys-fs/lvm2-2.02.97 !sys-fs/device-mapper !<sys-fs/udev-init-scripts-18
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=946f306c84d51e801795f045375abfea
diff --git a/metadata/md5-cache/sys-fs/evms-2.5.5-r13 b/metadata/md5-cache/sys-fs/evms-2.5.5-r13
index 3e796edecb8c..1db79517ee13 100644
--- a/metadata/md5-cache/sys-fs/evms-2.5.5-r13
+++ b/metadata/md5-cache/sys-fs/evms-2.5.5-r13
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/util-linux sys-libs/readline >=sys-fs/lvm2-2.02.45 ncurses? ( >
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/evms/evms-2.5.5.tar.gz mirror://gentoo/evms-patches-2.5.5-4.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=66835eccecc6dc5017a9d7a11e1045fc
diff --git a/metadata/md5-cache/sys-fs/gfs2-utils-3.1.2 b/metadata/md5-cache/sys-fs/gfs2-utils-3.1.2
index a0ab9dfaa897..9b6248ed35a4 100644
--- a/metadata/md5-cache/sys-fs/gfs2-utils-3.1.2
+++ b/metadata/md5-cache/sys-fs/gfs2-utils-3.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=sys-cluster/corosync sys-cluster/openais sys-cluster/liblogthread sys-cluster/libccs sys-cluster/libfence sys-cluster/libdlm sys-libs/ncurses virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-cluster/corosync sys-cluster/openais sys-cluster/liblogthread sys-cluster/libccs sys-cluster/libfence sys-cluster/libdlm sys-libs/ncurses virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GFS2 Utilities
 EAPI=4
 HOMEPAGE=https://fedorahosted.org/cluster/wiki/HomePage
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-cluster/corosync sys-cluster/openais sys-cluster/liblogthread sys-cluster/libccs sys-cluster/libfence sys-cluster/libdlm sys-libs/ncurses
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/g/f/gfs2-utils/gfs2-utils-3.1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=933831a88340f4b0cb4266b3b198733d
diff --git a/metadata/md5-cache/sys-fs/gfs2-utils-3.1.3 b/metadata/md5-cache/sys-fs/gfs2-utils-3.1.3
index ce50092b6257..e45fb81251be 100644
--- a/metadata/md5-cache/sys-fs/gfs2-utils-3.1.3
+++ b/metadata/md5-cache/sys-fs/gfs2-utils-3.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=sys-cluster/corosync sys-cluster/openais sys-cluster/liblogthread sys-cluster/libccs sys-cluster/libfence sys-cluster/libdlm sys-libs/ncurses virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-cluster/corosync sys-cluster/openais sys-cluster/liblogthread sys-cluster/libccs sys-cluster/libfence sys-cluster/libdlm sys-libs/ncurses virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GFS2 Utilities
 EAPI=4
 HOMEPAGE=https://fedorahosted.org/cluster/wiki/HomePage
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-cluster/corosync sys-cluster/openais sys-cluster/liblogthread sys-cluster/libccs sys-cluster/libfence sys-cluster/libdlm sys-libs/ncurses
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/g/f/gfs2-utils/gfs2-utils-3.1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7588f092c8ed44b681c748f1378fbe0e
diff --git a/metadata/md5-cache/sys-fs/hfsplusutils-1.0.4-r1 b/metadata/md5-cache/sys-fs/hfsplusutils-1.0.4-r1
index 805a4fa99056..369c9bb14903 100644
--- a/metadata/md5-cache/sys-fs/hfsplusutils-1.0.4-r1
+++ b/metadata/md5-cache/sys-fs/hfsplusutils-1.0.4-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
-DEPEND=app-arch/bzip2 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/bzip2 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HFS+ Filesystem Access Utilities (a PPC filesystem)
 HOMEPAGE=http://penguinppc.org/historical/hfsplus/
 KEYWORDS=ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://penguinppc.org/historical/hfsplus/hfsplus_1.0.4.src.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=836e819c88c0c69fecf47aeefea9dda6
diff --git a/metadata/md5-cache/sys-fs/lufs-0.9.7-r3 b/metadata/md5-cache/sys-fs/lufs-0.9.7-r3
index 50ea5dc29950..56426f4e19d1 100644
--- a/metadata/md5-cache/sys-fs/lufs-0.9.7-r3
+++ b/metadata/md5-cache/sys-fs/lufs-0.9.7-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=sys-fs/lufis || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-fs/lufis || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=User-mode filesystem implementation
 HOMEPAGE=http://sourceforge.net/projects/lufs/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/lufis
 SLOT=0
 SRC_URI=mirror://sourceforge/lufs/lufs-0.9.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4dcf87e606436695f3de5822a9a1e331
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.95-r4 b/metadata/md5-cache/sys-fs/lvm2-2.02.95-r4
index 02249ce65c27..5147e3178678 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.95-r4
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.95-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( virtual/udev[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( virtual/udev[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=User-land utilities for LVM2 (device-mapper) software.
 EAPI=3
 HOMEPAGE=http://sources.redhat.com/lvm2/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev ) !<sys-apps/openrc-0.10.1 >=sys-apps/baselayout-2.1-r1 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 thin? ( sys-block/thin-provisioning-tools ) !<sys-fs/cryptsetup-1.1.2
 SLOT=0
 SRC_URI=ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.95.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.95.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=90edbb9659795a8a71867e682731bcbc
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.97 b/metadata/md5-cache/sys-fs/lvm2-2.02.97
index 7d65c712195f..9db272643f2f 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.97
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.97
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( virtual/udev[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( virtual/udev[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=User-land utilities for LVM2 (device-mapper) software.
 EAPI=3
 HOMEPAGE=http://sources.redhat.com/lvm2/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev ) !<sys-apps/openrc-0.10.1 >=sys-apps/baselayout-2.1-r1 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 thin? ( sys-block/thin-provisioning-tools ) !<sys-fs/cryptsetup-1.1.2
 SLOT=0
 SRC_URI=ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.97.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.97.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8fb43dc8da73fc9eca9d21331b83727e
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.97-r1 b/metadata/md5-cache/sys-fs/lvm2-2.02.97-r1
index b9f2552df887..c8923a0331d3 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.97-r1
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.97-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( virtual/udev[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( virtual/udev[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=User-land utilities for LVM2 (device-mapper) software.
 EAPI=5
 HOMEPAGE=http://sources.redhat.com/lvm2/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev ) !<sys-apps/openrc-0.10.1 >=sys-apps/baselayout-2.1-r1 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 thin? ( sys-block/thin-provisioning-tools ) !<sys-fs/cryptsetup-1.1.2
 SLOT=0
 SRC_URI=ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.97.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.97.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fe72b9235affe388c4cec304f5b8b211
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.98 b/metadata/md5-cache/sys-fs/lvm2-2.02.98
index 2dce82376023..1ca0a4cd69c5 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.98
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.98
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( virtual/udev[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( virtual/udev[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=User-land utilities for LVM2 (device-mapper) software.
 EAPI=5
 HOMEPAGE=http://sources.redhat.com/lvm2/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev ) !<sys-apps/openrc-0.10.1 >=sys-apps/baselayout-2.1-r1 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 thin? ( sys-block/thin-provisioning-tools ) !<sys-fs/cryptsetup-1.1.2
 SLOT=0
 SRC_URI=ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.98.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.98.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=376e6e831db8ee270104079c2d97618c
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.15 b/metadata/md5-cache/sys-fs/mtools-4.0.15
index 9fcd62d9f898..a3ecd0237d90 100644
--- a/metadata/md5-cache/sys-fs/mtools-4.0.15
+++ b/metadata/md5-cache/sys-fs/mtools-4.0.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=utilities to access MS-DOS disks from Unix without mounting them
 EAPI=2
 HOMEPAGE=http://mtools.linux.lu/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
 SLOT=0
 SRC_URI=mirror://gnu/mtools/mtools-4.0.15.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=faad608ea571e8ecd05b77b0ef62c50c
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.16 b/metadata/md5-cache/sys-fs/mtools-4.0.16
index 836d7db7cdf5..e8bbafe7133a 100644
--- a/metadata/md5-cache/sys-fs/mtools-4.0.16
+++ b/metadata/md5-cache/sys-fs/mtools-4.0.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=utilities to access MS-DOS disks from Unix without mounting them
 EAPI=2
 HOMEPAGE=http://mtools.linux.lu/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
 SLOT=0
 SRC_URI=mirror://gnu/mtools/mtools-4.0.16.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=cf3ca3fb7b801900af208d0563f9f1eb
diff --git a/metadata/md5-cache/sys-fs/ncdu-1.9 b/metadata/md5-cache/sys-fs/ncdu-1.9
index 95c4b9c6f57f..c8c88d32e7ca 100644
--- a/metadata/md5-cache/sys-fs/ncdu-1.9
+++ b/metadata/md5-cache/sys-fs/ncdu-1.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses[unicode] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses[unicode] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NCurses Disk Usage
 EAPI=5
 HOMEPAGE=http://dev.yorhel.nl/ncdu/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/ncurses[unicode]
 SLOT=0
 SRC_URI=http://dev.yorhel.nl/download/ncdu-1.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ca3a22fccc5c87a066043ae1528160a8
diff --git a/metadata/md5-cache/sys-fs/ocfs2-tools-1.6.4-r1 b/metadata/md5-cache/sys-fs/ocfs2-tools-1.6.4-r1
index 85c20f1bab18..18153097ec8f 100644
--- a/metadata/md5-cache/sys-fs/ocfs2-tools-1.6.4-r1
+++ b/metadata/md5-cache/sys-fs/ocfs2-tools-1.6.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool gtk? ( =dev-lang/python-2* )
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool gtk? ( =dev-lang/python-2* )
 DESCRIPTION=Support programs for the Oracle Cluster Filesystem 2
 EAPI=4
 HOMEPAGE=http://oss.oracle.com/projects/ocfs2-tools/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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* )
 SLOT=0
 SRC_URI=http://oss.oracle.com/projects/ocfs2-tools/dist/files/source/v1.6/ocfs2-tools-1.6.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8710ea097d6dec213c42f39712d54e3c
diff --git a/metadata/md5-cache/sys-fs/ocfs2-tools-1.8.2 b/metadata/md5-cache/sys-fs/ocfs2-tools-1.8.2
index 54e563522eb5..36b5ec4c56d4 100644
--- a/metadata/md5-cache/sys-fs/ocfs2-tools-1.8.2
+++ b/metadata/md5-cache/sys-fs/ocfs2-tools-1.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/libaio 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool gtk? ( =dev-lang/python-2* )
+DEPEND=dev-libs/libaio 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool gtk? ( =dev-lang/python-2* )
 DESCRIPTION=Support programs for the Oracle Cluster Filesystem 2
 EAPI=4
 HOMEPAGE=http://oss.oracle.com/projects/ocfs2-tools/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio 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* )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~alexxy/distfiles/ocfs2-tools-1.8.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db7a917d460993d47fc6c67d2f0652cc
diff --git a/metadata/md5-cache/sys-fs/owfs-2.7_p21-r1 b/metadata/md5-cache/sys-fs/owfs-2.7_p21-r1
index 8dd8437cf1d2..0d4bc3e06588 100644
--- a/metadata/md5-cache/sys-fs/owfs-2.7_p21-r1
+++ b/metadata/md5-cache/sys-fs/owfs-2.7_p21-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=fuse? ( sys-fs/fuse ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) tcl? ( dev-lang/tcl ) usb? ( virtual/libusb:0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) perl? ( dev-lang/swig ) php? ( dev-lang/swig ) python? ( dev-lang/swig ) python? ( =dev-lang/python-2* ) dev-lang/perl[-build] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=fuse? ( sys-fs/fuse ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) tcl? ( dev-lang/tcl ) usb? ( virtual/libusb:0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) perl? ( dev-lang/swig ) php? ( dev-lang/swig ) python? ( dev-lang/swig ) python? ( =dev-lang/python-2* ) dev-lang/perl[-build] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Access 1-Wire devices like a filesystem
 EAPI=2
 HOMEPAGE=http://www.owfs.org/ http://owfs.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=fuse? ( sys-fs/fuse ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) tcl? ( dev-lang/tcl ) usb? ( virtual/libusb:0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) python? ( =dev-lang/python-2* ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://sourceforge/owfs/owfs-2.7p21.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	depend.php	df169a364e191b840b695604097e3c21	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	phpconfutils	e108303831029e5b8a9d24b991b1d62a	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	depend.php	df169a364e191b840b695604097e3c21	distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	phpconfutils	e108303831029e5b8a9d24b991b1d62a	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a118af29215029b22d2facfac2beb157
diff --git a/metadata/md5-cache/sys-fs/quotatool-1.4.11 b/metadata/md5-cache/sys-fs/quotatool-1.4.11
index fb61ae3e2514..7aea90a3c2b6 100644
--- a/metadata/md5-cache/sys-fs/quotatool-1.4.11
+++ b/metadata/md5-cache/sys-fs/quotatool-1.4.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=command-line utility for filesystem quotas
 EAPI=2
 HOMEPAGE=http://quotatool.ekenberg.se/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/quota
 SLOT=0
 SRC_URI=http://quotatool.ekenberg.se/quotatool-1.4.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3ee3cdd3a20513a04e2a5058d1a98d63
diff --git a/metadata/md5-cache/sys-fs/quotatool-1.4.12 b/metadata/md5-cache/sys-fs/quotatool-1.4.12
index 9b2cfad2104c..7a2ab6480167 100644
--- a/metadata/md5-cache/sys-fs/quotatool-1.4.12
+++ b/metadata/md5-cache/sys-fs/quotatool-1.4.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=command-line utility for filesystem quotas
 EAPI=4
 HOMEPAGE=http://quotatool.ekenberg.se/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/quota
 SLOT=0
 SRC_URI=http://quotatool.ekenberg.se/quotatool-1.4.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=993d42505cd6250636de77d3f595c28b
diff --git a/metadata/md5-cache/sys-fs/rar2fs-1.15.1 b/metadata/md5-cache/sys-fs/rar2fs-1.15.1
index 1aa87dee8700..7937724999d9 100644
--- a/metadata/md5-cache/sys-fs/rar2fs-1.15.1
+++ b/metadata/md5-cache/sys-fs/rar2fs-1.15.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=app-arch/unrar-4.2 sys-fs/fuse || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-arch/unrar-4.2 sys-fs/fuse || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A FUSE based filesystem that can mount one or multiple RAR archive(s)
 EAPI=4
 HOMEPAGE=http://code.google.com/p/rar2fs/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-arch/unrar-4.2 sys-fs/fuse
 SLOT=0
 SRC_URI=http://rar2fs.googlecode.com/files/rar2fs-1.15.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=f87acd92be4a22d5f57cc6549097b713
diff --git a/metadata/md5-cache/sys-fs/rar2fs-1.16.0 b/metadata/md5-cache/sys-fs/rar2fs-1.16.0
index dc17e6166447..9d8155104af1 100644
--- a/metadata/md5-cache/sys-fs/rar2fs-1.16.0
+++ b/metadata/md5-cache/sys-fs/rar2fs-1.16.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=app-arch/unrar-4.2:= sys-fs/fuse || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=app-arch/unrar-4.2:= sys-fs/fuse || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A FUSE based filesystem that can mount one or multiple RAR archive(s)
 EAPI=5
 HOMEPAGE=http://code.google.com/p/rar2fs/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-arch/unrar-4.2:= sys-fs/fuse
 SLOT=0
 SRC_URI=http://rar2fs.googlecode.com/files/rar2fs-1.16.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8d87a91b58276cc7a56620fa923469c7
diff --git a/metadata/md5-cache/sys-fs/s3backer-1.3.2 b/metadata/md5-cache/sys-fs/s3backer-1.3.2
index d9c8bc9c3c63..9a6ac12ea7f8 100644
--- a/metadata/md5-cache/sys-fs/s3backer-1.3.2
+++ b/metadata/md5-cache/sys-fs/s3backer-1.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile prepare
-DEPEND=net-misc/curl sys-fs/fuse sys-libs/zlib dev-libs/expat dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-misc/curl sys-fs/fuse sys-libs/zlib dev-libs/expat dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=FUSE-based single file backing store via Amazon S3
 EAPI=4
 HOMEPAGE=http://code.google.com/p/s3backer
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/curl sys-fs/fuse sys-libs/zlib dev-libs/expat dev-libs/openssl
 SLOT=0
 SRC_URI=http://s3backer.googlecode.com/files/s3backer-1.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=239def88de7012b0ddbe80dd59b4773c
diff --git a/metadata/md5-cache/sys-fs/s3backer-1.3.3 b/metadata/md5-cache/sys-fs/s3backer-1.3.3
index e13e4688ad84..20445ae85389 100644
--- a/metadata/md5-cache/sys-fs/s3backer-1.3.3
+++ b/metadata/md5-cache/sys-fs/s3backer-1.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile prepare
-DEPEND=net-misc/curl sys-fs/fuse sys-libs/zlib dev-libs/expat dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-misc/curl sys-fs/fuse sys-libs/zlib dev-libs/expat dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=FUSE-based single file backing store via Amazon S3
 EAPI=4
 HOMEPAGE=http://code.google.com/p/s3backer
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/curl sys-fs/fuse sys-libs/zlib dev-libs/expat dev-libs/openssl
 SLOT=0
 SRC_URI=http://s3backer.googlecode.com/files/s3backer-1.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=ca17dee2d0282fd0566cec7c34cbb097
diff --git a/metadata/md5-cache/sys-fs/s3backer-1.3.4 b/metadata/md5-cache/sys-fs/s3backer-1.3.4
index 6d8f621c149b..35b839fdee98 100644
--- a/metadata/md5-cache/sys-fs/s3backer-1.3.4
+++ b/metadata/md5-cache/sys-fs/s3backer-1.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile prepare
-DEPEND=net-misc/curl sys-fs/fuse sys-libs/zlib dev-libs/expat dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=net-misc/curl sys-fs/fuse sys-libs/zlib dev-libs/expat dev-libs/openssl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=FUSE-based single file backing store via Amazon S3
 EAPI=5
 HOMEPAGE=http://code.google.com/p/s3backer
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/curl sys-fs/fuse sys-libs/zlib dev-libs/expat dev-libs/openssl
 SLOT=0
 SRC_URI=http://s3backer.googlecode.com/files/s3backer-1.3.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=9c89396d31f1eb68e360afc0defdea31
diff --git a/metadata/md5-cache/sys-fs/siefs-0.5-r2 b/metadata/md5-cache/sys-fs/siefs-0.5-r2
index eafc44fe5687..4f0360eda127 100644
--- a/metadata/md5-cache/sys-fs/siefs-0.5-r2
+++ b/metadata/md5-cache/sys-fs/siefs-0.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=sys-fs/fuse || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-fs/fuse || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Siemens FS
 HOMEPAGE=http://chaos.allsiemens.com/siefs
 KEYWORDS=amd64 ~ppc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/fuse app-mobilephone/vmoconv
 SLOT=0
 SRC_URI=http://chaos.allsiemens.com/download/siefs-0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1852d8b592361f3acdfed58b1541f700
diff --git a/metadata/md5-cache/sys-fs/simple-mtpfs-0.1 b/metadata/md5-cache/sys-fs/simple-mtpfs-0.1
index f34a3f274d2d..add34faac12e 100644
--- a/metadata/md5-cache/sys-fs/simple-mtpfs-0.1
+++ b/metadata/md5-cache/sys-fs/simple-mtpfs-0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=media-libs/libmtp >=sys-fs/fuse-2.8
 SLOT=0
 SRC_URI=mirror://github/phatina/simple-mtpfs/simple-mtpfs-0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1c87cab73bf553c1a06cf130d5e1dbaa
diff --git a/metadata/md5-cache/sys-fs/simple-mtpfs-9999 b/metadata/md5-cache/sys-fs/simple-mtpfs-9999
index d43a0412d4dc..217e6fa42c5b 100644
--- a/metadata/md5-cache/sys-fs/simple-mtpfs-9999
+++ b/metadata/md5-cache/sys-fs/simple-mtpfs-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/phatina/simple-mtpfs
 LICENSE=GPL-2+
 RDEPEND=media-libs/libmtp >=sys-fs/fuse-2.8
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3cc1a28621cfab4af4b7e095fd2e7dde
diff --git a/metadata/md5-cache/sys-fs/snapraid-2.1 b/metadata/md5-cache/sys-fs/snapraid-2.1
index 8fc3671f50a1..6e659a184137 100644
--- a/metadata/md5-cache/sys-fs/snapraid-2.1
+++ b/metadata/md5-cache/sys-fs/snapraid-2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=ssl? ( dev-libs/openssl:0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/snapraid/snapraid-2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=67f0df1f3cade9f836c247c0a13007f0
diff --git a/metadata/md5-cache/sys-fs/snapraid-3.0 b/metadata/md5-cache/sys-fs/snapraid-3.0
index 50b0d5ca9dbd..1eea4d8f8ee5 100644
--- a/metadata/md5-cache/sys-fs/snapraid-3.0
+++ b/metadata/md5-cache/sys-fs/snapraid-3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=ssl? ( dev-libs/openssl:0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/snapraid/snapraid-3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6318086782ca5bd971ce2fe8bb952624
diff --git a/metadata/md5-cache/sys-fs/sysfsutils-2.1.0 b/metadata/md5-cache/sys-fs/sysfsutils-2.1.0
index a6852468a70d..b65619cf3896 100644
--- a/metadata/md5-cache/sys-fs/sysfsutils-2.1.0
+++ b/metadata/md5-cache/sys-fs/sysfsutils-2.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=System Utilities Based on Sysfs
 EAPI=5
 HOMEPAGE=http://linux-diag.sourceforge.net/Sysfsutils.html
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linu
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-diag/sysfsutils-2.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4954e42d7dec6dd82d48a99dd6998656
diff --git a/metadata/md5-cache/sys-fs/treesize-0.54.1 b/metadata/md5-cache/sys-fs/treesize-0.54.1
index d10c4887d44a..b3aaa966d208 100644
--- a/metadata/md5-cache/sys-fs/treesize-0.54.1
+++ b/metadata/md5-cache/sys-fs/treesize-0.54.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=x11-libs/gtk+:2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A disk consumption analyzing tool
 EAPI=2
 HOMEPAGE=http://treesize.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/treesize/treesize-0.54.1-src.tbz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=52e3f13308eda272801aa8130060e812
diff --git a/metadata/md5-cache/sys-fs/udev-197-r8 b/metadata/md5-cache/sys-fs/udev-197-r8
index 0b1b393c7cf9..a8ad990a9d0b 100644
--- a/metadata/md5-cache/sys-fs/udev-197-r8
+++ b/metadata/md5-cache/sys-fs/udev-197-r8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-12 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !<sys-apps/systemd-197 virtual/os-headers virtual/pkgconfig !<sys-kernel/linux-headers-2.6.32 doc? ( >=dev-util/gtk-doc-1.18 ) keymap? ( dev-util/gperf ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-12 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !<sys-apps/systemd-197 virtual/os-headers virtual/pkgconfig !<sys-kernel/linux-headers-2.6.32 doc? ( >=dev-util/gtk-doc-1.18 ) keymap? ( dev-util/gperf ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/gli
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-197.tar.xz http://dev.gentoo.org/~williamh/dist/udev-197-patches-5.tar.bz2 http://dev.gentoo.org/~ssuominen/udev-197-patches-5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a1f7c58ea074bf66de54c749e25cbb4e
diff --git a/metadata/md5-cache/sys-fs/udev-200 b/metadata/md5-cache/sys-fs/udev-200
index 282613f1480b..bbfdde2ff1e7 100644
--- a/metadata/md5-cache/sys-fs/udev-200
+++ b/metadata/md5-cache/sys-fs/udev-200
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-12 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/systemd app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/os-headers virtual/pkgconfig !<sys-kernel/linux-headers-2.6.32 doc? ( >=dev-util/gtk-doc-1.18 ) keymap? ( dev-util/gperf ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-12 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/systemd app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/os-headers virtual/pkgconfig !<sys-kernel/linux-headers-2.6.32 doc? ( >=dev-util/gtk-doc-1.18 ) keymap? ( dev-util/gperf ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/gli
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-200.tar.xz http://dev.gentoo.org/~ssuominen/udev-200-patches-1.tar.xz http://dev.gentoo.org/~williamh/dist/udev-200-patches-1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ec1ed4b7862f272505bee226dd750d16
diff --git a/metadata/md5-cache/sys-fs/udev-201 b/metadata/md5-cache/sys-fs/udev-201
index 027bfa926dc8..82338aea2766 100644
--- a/metadata/md5-cache/sys-fs/udev-201
+++ b/metadata/md5-cache/sys-fs/udev-201
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-13 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/systemd app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/make-3.82-r4 virtual/os-headers virtual/pkgconfig !<sys-kernel/linux-headers-2.6.32 doc? ( >=dev-util/gtk-doc-1.18 ) keymap? ( dev-util/gperf ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-13 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/systemd app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/make-3.82-r4 virtual/os-headers virtual/pkgconfig !<sys-kernel/linux-headers-2.6.32 doc? ( >=dev-util/gtk-doc-1.18 ) keymap? ( dev-util/gperf ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/gli
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-201.tar.xz http://dev.gentoo.org/~ssuominen/udev-201-patches-1.tar.xz http://dev.gentoo.org/~williamh/dist/udev-201-patches-1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3fa5564e7c43f45a1ead3b1934e3e52f
diff --git a/metadata/md5-cache/sys-fs/udev-202 b/metadata/md5-cache/sys-fs/udev-202
index 9aba520e7deb..8307a07a4fd3 100644
--- a/metadata/md5-cache/sys-fs/udev-202
+++ b/metadata/md5-cache/sys-fs/udev-202
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-13 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/systemd app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/make-3.82-r4 virtual/os-headers virtual/pkgconfig !<sys-kernel/linux-headers-2.6.32 doc? ( >=dev-util/gtk-doc-1.18 ) keymap? ( dev-util/gperf ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-13 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/systemd app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/make-3.82-r4 virtual/os-headers virtual/pkgconfig !<sys-kernel/linux-headers-2.6.32 doc? ( >=dev-util/gtk-doc-1.18 ) keymap? ( dev-util/gperf ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/gli
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-202.tar.xz http://dev.gentoo.org/~ssuominen/udev-202-patches-1.tar.xz http://dev.gentoo.org/~williamh/dist/udev-202-patches-1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4cc7bf6dd7cfad5b2a39a16cb53e6c3a
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index 68e6c6f79daa..cc2bde696946 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-13 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/systemd app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/make-3.82-r4 virtual/os-headers virtual/pkgconfig !<sys-kernel/linux-headers-2.6.39 doc? ( >=dev-util/gtk-doc-1.18 ) keymap? ( dev-util/gperf ) dev-util/gperf >=dev-util/intltool-0.50 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-13 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/systemd app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/make-3.82-r4 virtual/os-headers virtual/pkgconfig !<sys-kernel/linux-headers-2.6.39 doc? ( >=dev-util/gtk-doc-1.18 ) keymap? ( dev-util/gperf ) dev-util/gperf >=dev-util/intltool-0.50 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
@@ -9,5 +9,5 @@ PDEPEND=>=virtual/udev-197-r1 hwdb? ( >=sys-apps/hwids-20130326.1[udev] ) openrc
 RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-13 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/systemd openrc? ( !<sys-apps/openrc-0.9.9 ) !sys-apps/coldplug !<sys-fs/lvm2-2.02.97-r1 !sys-fs/device-mapper !<sys-fs/udev-init-scripts-22 !<sys-kernel/dracut-017-r1 !<sys-kernel/genkernel-3.4.25 !<sec-policy/selinux-base-2.20120725-r10
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6b1ba8d140f90fdd8bb37bac1cc3118c
diff --git a/metadata/md5-cache/sys-fs/udisks-glue-1.3.2 b/metadata/md5-cache/sys-fs/udisks-glue-1.3.2
index 85b8eb17c580..bd202b8868a0 100644
--- a/metadata/md5-cache/sys-fs/udisks-glue-1.3.2
+++ b/metadata/md5-cache/sys-fs/udisks-glue-1.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare unpack
-DEPEND=>=dev-libs/dbus-glib-0.92 dev-libs/glib:2 dev-libs/confuse virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/dbus-glib-0.92 dev-libs/glib:2 dev-libs/confuse virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A tool to associate udisks events to user-defined actions
 EAPI=4
 HOMEPAGE=http://github.com/fernandotcl/udisks-glue
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/dbus-glib-0.92 dev-libs/glib:2 dev-libs/confuse sys-fs/udisks:0
 SLOT=0
 SRC_URI=https://github.com/fernandotcl/udisks-glue/tarball/release-1.3.2 -> udisks-glue-1.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=c4acdab611bae1fe58252c330c3600fe
diff --git a/metadata/md5-cache/sys-fs/udisks-glue-1.3.3 b/metadata/md5-cache/sys-fs/udisks-glue-1.3.3
index e63eccaa8cdb..f6a45c6ec1aa 100644
--- a/metadata/md5-cache/sys-fs/udisks-glue-1.3.3
+++ b/metadata/md5-cache/sys-fs/udisks-glue-1.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare unpack
-DEPEND=>=dev-libs/dbus-glib-0.92 >=dev-libs/glib-2 dev-libs/confuse virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/dbus-glib-0.92 >=dev-libs/glib-2 dev-libs/confuse virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A tool to associate udisks events to user-defined actions
 EAPI=4
 HOMEPAGE=http://github.com/fernandotcl/udisks-glue
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/dbus-glib-0.92 >=dev-libs/glib-2 dev-libs/confuse sys-fs/udisks:0
 SLOT=0
 SRC_URI=http://github.com/fernandotcl/udisks-glue/tarball/release-1.3.3 -> udisks-glue-1.3.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=d4fd9c50e6905da1cf8d3265eae0b206
diff --git a/metadata/md5-cache/sys-fs/udisks-glue-1.3.4 b/metadata/md5-cache/sys-fs/udisks-glue-1.3.4
index fca066b2744f..9ff7bea8bc38 100644
--- a/metadata/md5-cache/sys-fs/udisks-glue-1.3.4
+++ b/metadata/md5-cache/sys-fs/udisks-glue-1.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare unpack
-DEPEND=>=dev-libs/dbus-glib-0.92 >=dev-libs/glib-2 dev-libs/confuse virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/dbus-glib-0.92 >=dev-libs/glib-2 dev-libs/confuse virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A tool to associate udisks events to user-defined actions
 EAPI=4
 HOMEPAGE=http://github.com/fernandotcl/udisks-glue
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/dbus-glib-0.92 >=dev-libs/glib-2 dev-libs/confuse sys-fs/udisks:0
 SLOT=0
 SRC_URI=http://github.com/fernandotcl/udisks-glue/tarball/release-1.3.4 -> udisks-glue-1.3.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=f7de041bb80424796a49e5ade213a6fe
diff --git a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc10-r4 b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc10-r4
index f5b6a073d8e2..08c5b581eb99 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc10-r4
+++ b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc10-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://github/zfsonlinux/zfs/zfs-0.6.0-rc10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9fd0017a3c499a6457dae9a5caa2bc4b
diff --git a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc11-r3 b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc11-r3
index 4b06a6c8ef42..0a5dbf9d7840 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc11-r3
+++ b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc11-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://github/zfsonlinux/zfs/zfs-0.6.0-rc11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=febd1fd029d6dc1fb97d6434cc170138
diff --git a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc12-r3 b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc12-r3
index 60eaffabcbe2..97b087baa4ab 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc12-r3
+++ b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc12-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://github/zfsonlinux/zfs/zfs-0.6.0-rc12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a006c8e1ca26eb6912d7510f3003bd23
diff --git a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc13-r2 b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc13-r2
index 966d16ebbf62..0f394c78b158 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc13-r2
+++ b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc13-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/archive/zfs-0.6.0-rc13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ad4405bcbe1f9784ee732fd301506101
diff --git a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc14-r1 b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc14-r1
index 5eb44651e8ec..3c9fcdfa24e8 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc14-r1
+++ b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc14-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/archive/zfs-0.6.0-rc14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fd5fcd99b9a8c9c935def93b7cf8e2e6
diff --git a/metadata/md5-cache/sys-fs/zfs-0.6.1 b/metadata/md5-cache/sys-fs/zfs-0.6.1
index 5917fae4fc55..a0238ca81dbe 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.6.1
+++ b/metadata/md5-cache/sys-fs/zfs-0.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/archive/zfs-0.6.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ad233485496c9c0d42299696db2a8118
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index 47f25dc6a8a3..d60d3c1cacaf 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/pkgconfig dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/pkgconfig dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -8,5 +8,5 @@ LICENSE=BSD-2 CDDL MIT
 RDEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-9999* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-boot/grub-2.00-r2:2 ) kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=52c355192a52121e4fdbcceb017f9e91
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc10-r2 b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc10-r2
index a269e39d8160..b1637fbec3fb 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc10-r2
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc10-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND==sys-kernel/spl-0.6.0_rc10* dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==sys-kernel/spl-0.6.0_rc10* dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -10,5 +10,5 @@ RDEPEND==sys-kernel/spl-0.6.0_rc10* dev-lang/perl virtual/awk !sys-fs/zfs-fuse k
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://github/zfsonlinux/zfs/zfs-0.6.0-rc10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4a60fa2c6cbe7a13ced9ea85393d30af
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc11-r3 b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc11-r3
index 3477c3774a42..c8bee70b2a09 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc11-r3
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc11-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND==sys-kernel/spl-0.6.0_rc11* dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==sys-kernel/spl-0.6.0_rc11* dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -10,5 +10,5 @@ RDEPEND==sys-kernel/spl-0.6.0_rc11* dev-lang/perl virtual/awk !sys-fs/zfs-fuse k
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://github/zfsonlinux/zfs/zfs-0.6.0-rc11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=86fdcc444c516537d55a52dd0c672409
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc12-r3 b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc12-r3
index a5afe9a85930..b2ca3772ea5a 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc12-r3
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc12-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND==sys-kernel/spl-0.6.0_rc12* dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==sys-kernel/spl-0.6.0_rc12* dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -10,5 +10,5 @@ RDEPEND==sys-kernel/spl-0.6.0_rc12* dev-lang/perl virtual/awk !sys-fs/zfs-fuse k
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://github/zfsonlinux/zfs/zfs-0.6.0-rc12.tar.gz http://dev.gentoo.org/~ryao/dist/zfs-kmod-0.6.0-rc12-p0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e170251268cd59701d53d388c45f1849
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc13-r4 b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc13-r4
index 62627a5075f4..a03b17a5ab2f 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc13-r4
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc13-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND==sys-kernel/spl-0.6.0_rc13* virtual/awk dev-lang/perl kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==sys-kernel/spl-0.6.0_rc13* virtual/awk dev-lang/perl kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -10,5 +10,5 @@ RDEPEND==sys-kernel/spl-0.6.0_rc13* virtual/awk dev-lang/perl !sys-fs/zfs-fuse k
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/archive/zfs-0.6.0-rc13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b1bc38f0a8222609d641e050089913ee
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc14-r5 b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc14-r5
index 8478cc56e8ea..6d568eabb29f 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc14-r5
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc14-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND==sys-kernel/spl-0.6.0_rc14* dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==sys-kernel/spl-0.6.0_rc14* dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -10,5 +10,5 @@ RDEPEND==sys-kernel/spl-0.6.0_rc14* dev-lang/perl virtual/awk !sys-fs/zfs-fuse k
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/archive/zfs-0.6.0-rc14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6db879a0472ec344c88a059bc79d5da3
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.1 b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.1
index 29db5a707ec4..b688d0f7d45c 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.1
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND==sys-kernel/spl-0.6.1* dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==sys-kernel/spl-0.6.1* dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -10,5 +10,5 @@ RDEPEND==sys-kernel/spl-0.6.1* dev-lang/perl virtual/awk !sys-fs/zfs-fuse kernel
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/archive/zfs-0.6.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=72cd0bab15a9ad9ff6557559b747f84a
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-9999 b/metadata/md5-cache/sys-fs/zfs-kmod-9999
index 88a6874ed68a..ca9104166aad 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-9999
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND==sys-kernel/spl-9999* dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND==sys-kernel/spl-9999* dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -8,5 +8,5 @@ LICENSE=CDDL debug? ( GPL-2+ )
 RDEPEND==sys-kernel/spl-9999* dev-lang/perl virtual/awk !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c7d48cf688d7d8967d751ff427d36308
diff --git a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc10 b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc10
index dd849b397104..931bb9a43666 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc10
+++ b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutil
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://github/zfsonlinux/spl/spl-0.6.0-rc10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=58a0de6fa93b4184de95d572706cabf3
diff --git a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc11-r2 b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc11-r2
index 1fed8906e9d8..50b7140d526c 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc11-r2
+++ b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc11-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutil
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://zfsonlinux/spl/spl-0.6.0-rc11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1afe2bf8cdf1efbb881ce8fb2c252095
diff --git a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc12-r1 b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc12-r1
index 44f0264a1d5f..cb490fc933a9 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc12-r1
+++ b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc12-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutil
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://github/zfsonlinux/spl/spl-0.6.0-rc12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=870a3a1bd6e74330cf612ced7b67cef6
diff --git a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc13-r2 b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc13-r2
index 7924fac99ee6..12901149b658 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc13-r2
+++ b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc13-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutil
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/spl/archive/spl-0.6.0-rc13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ef28fa29f92604ce7b2f2c76465807bf
diff --git a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc14-r3 b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc14-r3
index f2ef71d0d67a..2fa6055d6412 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc14-r3
+++ b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc14-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutil
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/spl/archive/spl-0.6.0-rc14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2c028939b928c716482725bf44de9935
diff --git a/metadata/md5-cache/sys-kernel/spl-0.6.1 b/metadata/md5-cache/sys-kernel/spl-0.6.1
index 566e2afad813..fddc07983006 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.6.1
+++ b/metadata/md5-cache/sys-kernel/spl-0.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutil
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/spl/archive/spl-0.6.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a49adc541aa49b4a814670b70822f7ba
diff --git a/metadata/md5-cache/sys-kernel/spl-9999 b/metadata/md5-cache/sys-kernel/spl-9999
index d5a7193832df..756c3b62d31c 100644
--- a/metadata/md5-cache/sys-kernel/spl-9999
+++ b/metadata/md5-cache/sys-kernel/spl-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs
 EAPI=4
 HOMEPAGE=http://zfsonlinux.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=99b7fcef2df854c7294d1565ce619bcc
diff --git a/metadata/md5-cache/sys-libs/db-4.2.52_p5-r1 b/metadata/md5-cache/sys-libs/db-4.2.52_p5-r1
index 105dc8af1904..46785eda767b 100644
--- a/metadata/md5-cache/sys-libs/db-4.2.52_p5-r1
+++ b/metadata/md5-cache/sys-libs/db-4.2.52_p5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=tcl? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=tcl? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oracle Berkeley DB
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
 IUSE=tcl java doc cxx rpc doc test examples elibc_FreeBSD java
@@ -8,5 +8,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.2
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.2.52.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.4 http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.5
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=339cebc8ed43ddb5a4e46a26518e725d
diff --git a/metadata/md5-cache/sys-libs/db-4.3.29_p1-r1 b/metadata/md5-cache/sys-libs/db-4.3.29_p1-r1
index 76b794c8ef30..b38b9a38bb3c 100644
--- a/metadata/md5-cache/sys-libs/db-4.3.29_p1-r1
+++ b/metadata/md5-cache/sys-libs/db-4.3.29_p1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=tcl? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.4 ) >=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.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=tcl? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.4 ) >=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.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oracle Berkeley DB
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
 IUSE=tcl java doc cxx rpc doc test examples elibc_FreeBSD java
@@ -8,5 +8,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.3
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.3.29.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.3.29/patch.4.3.29.1
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fd3f79d1947452f740934adc90ba41cb
diff --git a/metadata/md5-cache/sys-libs/db-4.4.20_p4-r1 b/metadata/md5-cache/sys-libs/db-4.4.20_p4-r1
index f45dfb248433..38a3ff4bf029 100644
--- a/metadata/md5-cache/sys-libs/db-4.4.20_p4-r1
+++ b/metadata/md5-cache/sys-libs/db-4.4.20_p4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=tcl? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.4 ) >=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.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=tcl? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.4 ) >=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.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oracle Berkeley DB
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
 IUSE=tcl java doc cxx rpc doc test examples elibc_FreeBSD java
@@ -8,5 +8,5 @@ LICENSE=Sleepycat BSD
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.4
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.4.20.tar.gz mirror://gentoo/db-4.4.20-20060110-rpc_server-java.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patch.4.4.20.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patch.4.4.20.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patch.4.4.20.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patch.4.4.20.4
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d6f96f7813023ab1da19c02ee57c3348
diff --git a/metadata/md5-cache/sys-libs/db-4.5.20_p2-r1 b/metadata/md5-cache/sys-libs/db-4.5.20_p2-r1
index 67e1848f2e6a..bfe9cb99cf03 100644
--- a/metadata/md5-cache/sys-libs/db-4.5.20_p2-r1
+++ b/metadata/md5-cache/sys-libs/db-4.5.20_p2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=tcl? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.4 ) >=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.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=tcl? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.4 ) >=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.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oracle Berkeley DB
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
 IUSE=tcl java doc cxx rpc doc test examples elibc_FreeBSD java
@@ -8,5 +8,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.5
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=77850b20bce937ff52c64a188dcc8613
diff --git a/metadata/md5-cache/sys-libs/db-4.6.21_p4 b/metadata/md5-cache/sys-libs/db-4.6.21_p4
index f9bd6a94078e..f4b6b00faad2 100644
--- a/metadata/md5-cache/sys-libs/db-4.6.21_p4
+++ b/metadata/md5-cache/sys-libs/db-4.6.21_p4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=tcl? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.4 ) >=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.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=tcl? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.4 ) >=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.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oracle Berkeley DB
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
 IUSE=tcl java doc cxx rpc doc test examples elibc_FreeBSD java
@@ -8,5 +8,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.6
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.6.21.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.4
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aad65963fb8741b28338ed5f9c95a165
diff --git a/metadata/md5-cache/sys-libs/db-4.7.25_p3 b/metadata/md5-cache/sys-libs/db-4.7.25_p3
index 754411365cca..386dfe7705db 100644
--- a/metadata/md5-cache/sys-libs/db-4.7.25_p3
+++ b/metadata/md5-cache/sys-libs/db-4.7.25_p3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=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.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oracle Berkeley DB
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
 IUSE=doc java cxx tcl test rpc doc test examples elibc_FreeBSD java
@@ -8,5 +8,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.7
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.7.25.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.3
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fd9a2e56f4d056751e3e37621256719f
diff --git a/metadata/md5-cache/sys-libs/db-4.7.25_p4 b/metadata/md5-cache/sys-libs/db-4.7.25_p4
index 235c537720e1..867f0869a56c 100644
--- a/metadata/md5-cache/sys-libs/db-4.7.25_p4
+++ b/metadata/md5-cache/sys-libs/db-4.7.25_p4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=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.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oracle Berkeley DB
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
 IUSE=doc java cxx tcl test rpc doc test examples elibc_FreeBSD java
@@ -8,5 +8,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.7
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.7.25.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.4
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bb217e70ff8ee57f18ff6fb1cb85b79a
diff --git a/metadata/md5-cache/sys-libs/db-4.8.24 b/metadata/md5-cache/sys-libs/db-4.8.24
index fa588df3da61..412d37ef29f9 100644
--- a/metadata/md5-cache/sys-libs/db-4.8.24
+++ b/metadata/md5-cache/sys-libs/db-4.8.24
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=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.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oracle Berkeley DB
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
 IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java
@@ -8,5 +8,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.8
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.8.24.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fc35dd85a76bece748fec483541031ab
diff --git a/metadata/md5-cache/sys-libs/db-4.8.26 b/metadata/md5-cache/sys-libs/db-4.8.26
index a1a558e53741..78f55687c9e0 100644
--- a/metadata/md5-cache/sys-libs/db-4.8.26
+++ b/metadata/md5-cache/sys-libs/db-4.8.26
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=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.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oracle Berkeley DB
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
 IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java
@@ -8,5 +8,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.8
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.8.26.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5e85cf4809502d08270279b515e61c80
diff --git a/metadata/md5-cache/sys-libs/db-4.8.30 b/metadata/md5-cache/sys-libs/db-4.8.30
index 74a5123d015b..1a2652be8c26 100644
--- a/metadata/md5-cache/sys-libs/db-4.8.30
+++ b/metadata/md5-cache/sys-libs/db-4.8.30
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=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.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oracle Berkeley DB
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
 IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java
@@ -8,5 +8,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.8
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ba8c5f119d798c8b13dfd33d466bcf35
diff --git a/metadata/md5-cache/sys-libs/db-5.0.21-r1 b/metadata/md5-cache/sys-libs/db-5.0.21-r1
index 98a4217648a3..27761bda2a62 100644
--- a/metadata/md5-cache/sys-libs/db-5.0.21-r1
+++ b/metadata/md5-cache/sys-libs/db-5.0.21-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oracle Berkeley DB
 EAPI=2
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
@@ -9,5 +9,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=5.0
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.0.21.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bf92ddf80ebb70d9100cbb5a55cd477e
diff --git a/metadata/md5-cache/sys-libs/db-5.0.26 b/metadata/md5-cache/sys-libs/db-5.0.26
index f9ddb64079f9..34315b2e882c 100644
--- a/metadata/md5-cache/sys-libs/db-5.0.26
+++ b/metadata/md5-cache/sys-libs/db-5.0.26
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oracle Berkeley DB
 EAPI=2
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
@@ -9,5 +9,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=5.0
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.0.26.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=51ee8fd3d3659e75405d1010542183b1
diff --git a/metadata/md5-cache/sys-libs/db-5.0.32 b/metadata/md5-cache/sys-libs/db-5.0.32
index 5368224a81bf..6bdb1b81d5b7 100644
--- a/metadata/md5-cache/sys-libs/db-5.0.32
+++ b/metadata/md5-cache/sys-libs/db-5.0.32
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oracle Berkeley DB
 EAPI=2
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
@@ -9,5 +9,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=5.0
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.0.32.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=373e00e462fbd5f2130623db850575fe
diff --git a/metadata/md5-cache/sys-libs/db-5.1.19-r2 b/metadata/md5-cache/sys-libs/db-5.1.19-r2
index e93be80419f6..71ba399c8f0b 100644
--- a/metadata/md5-cache/sys-libs/db-5.1.19-r2
+++ b/metadata/md5-cache/sys-libs/db-5.1.19-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oracle Berkeley DB
 EAPI=2
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
@@ -9,5 +9,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=5.1
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.1.19.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4ede516608d0299a9bca5b66a6d94c21
diff --git a/metadata/md5-cache/sys-libs/db-5.1.25 b/metadata/md5-cache/sys-libs/db-5.1.25
index 7db8c258d402..182ef572844c 100644
--- a/metadata/md5-cache/sys-libs/db-5.1.25
+++ b/metadata/md5-cache/sys-libs/db-5.1.25
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oracle Berkeley DB
 EAPI=2
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
@@ -9,5 +9,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=5.1
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.1.25.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=806a10dac289d84f89d3bfcc0a137662
diff --git a/metadata/md5-cache/sys-libs/db-5.1.29 b/metadata/md5-cache/sys-libs/db-5.1.29
index 16fdc3f06581..d839ea267695 100644
--- a/metadata/md5-cache/sys-libs/db-5.1.29
+++ b/metadata/md5-cache/sys-libs/db-5.1.29
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oracle Berkeley DB
 EAPI=2
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
@@ -9,5 +9,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=5.1
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.1.29.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6c594f0ddb883ea90f29039b3640e914
diff --git a/metadata/md5-cache/sys-libs/db-5.2.28 b/metadata/md5-cache/sys-libs/db-5.2.28
index 0b2372db3aa5..fb01fc9e33f8 100644
--- a/metadata/md5-cache/sys-libs/db-5.2.28
+++ b/metadata/md5-cache/sys-libs/db-5.2.28
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oracle Berkeley DB
 EAPI=2
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
@@ -9,5 +9,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=5.2
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.2.28.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a19f4e128db4fa3b467ca6cf4617c162
diff --git a/metadata/md5-cache/sys-libs/db-5.2.36 b/metadata/md5-cache/sys-libs/db-5.2.36
index 0bb235fed6b5..7e8dd0424406 100644
--- a/metadata/md5-cache/sys-libs/db-5.2.36
+++ b/metadata/md5-cache/sys-libs/db-5.2.36
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oracle Berkeley DB
 EAPI=2
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
@@ -9,5 +9,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=5.2
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.2.36.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=58c2f4d50dbf8125889586f303c340ea
diff --git a/metadata/md5-cache/sys-libs/db-5.2.42 b/metadata/md5-cache/sys-libs/db-5.2.42
index 57042ff2441d..4691ecafaf7b 100644
--- a/metadata/md5-cache/sys-libs/db-5.2.42
+++ b/metadata/md5-cache/sys-libs/db-5.2.42
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oracle Berkeley DB
 EAPI=2
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
@@ -9,5 +9,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=5.2
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.2.42.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=66cac21f01342ae5e2c2ce33426429c7
diff --git a/metadata/md5-cache/sys-libs/db-5.3.21 b/metadata/md5-cache/sys-libs/db-5.3.21
index 3fab5beba546..fcf69c66abb1 100644
--- a/metadata/md5-cache/sys-libs/db-5.3.21
+++ b/metadata/md5-cache/sys-libs/db-5.3.21
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Oracle Berkeley DB
 EAPI=2
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
@@ -9,5 +9,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=5.3
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.3.21.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4e7112e70dd7be6abc7dbff26b98cbc1
diff --git a/metadata/md5-cache/sys-libs/freeipmi-1.1.7 b/metadata/md5-cache/sys-libs/freeipmi-1.1.7
index ab7828ed8b27..a3866adbbc81 100644
--- a/metadata/md5-cache/sys-libs/freeipmi-1.1.7
+++ b/metadata/md5-cache/sys-libs/freeipmi-1.1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libgcrypt virtual/os-headers || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libgcrypt virtual/os-headers || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Provides Remote-Console and System Management Software as per IPMI v1.5/2.0
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/freeipmi/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt sys-apps/openrc
 SLOT=0
 SRC_URI=mirror://gnu/freeipmi/freeipmi-1.1.7.tar.gz http://ftp.gluster.com/pub/freeipmi/1.1.7/freeipmi-1.1.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=11e05cc8d673918e2293201882017e1e
diff --git a/metadata/md5-cache/sys-libs/freeipmi-1.2.2 b/metadata/md5-cache/sys-libs/freeipmi-1.2.2
index a7218a5f8a4e..186b83a0ec06 100644
--- a/metadata/md5-cache/sys-libs/freeipmi-1.2.2
+++ b/metadata/md5-cache/sys-libs/freeipmi-1.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libgcrypt virtual/os-headers || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libgcrypt virtual/os-headers || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Provides Remote-Console and System Management Software as per IPMI v1.5/2.0
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/freeipmi/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt sys-apps/openrc
 SLOT=0
 SRC_URI=mirror://gnu/freeipmi/freeipmi-1.2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=213c7d465a6c86e4119117010d5a044d
diff --git a/metadata/md5-cache/sys-libs/freeipmi-1.2.5 b/metadata/md5-cache/sys-libs/freeipmi-1.2.5
index ce3501ccf74a..dab3c726c568 100644
--- a/metadata/md5-cache/sys-libs/freeipmi-1.2.5
+++ b/metadata/md5-cache/sys-libs/freeipmi-1.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libgcrypt virtual/os-headers || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libgcrypt virtual/os-headers || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Provides Remote-Console and System Management Software as per IPMI v1.5/2.0
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/freeipmi/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt nagios? ( || ( net-analyzer/icinga net-analyzer/nagios ) dev-lang/perl ) sys-apps/openrc
 SLOT=0
 SRC_URI=mirror://gnu/freeipmi/freeipmi-1.2.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bfdb8c2d5cd70c192689ead83cf05ae9
diff --git a/metadata/md5-cache/sys-libs/gpm-1.20.6-r1 b/metadata/md5-cache/sys-libs/gpm-1.20.6-r1
index 8c25e157f9e2..d5075961dd4c 100644
--- a/metadata/md5-cache/sys-libs/gpm-1.20.6-r1
+++ b/metadata/md5-cache/sys-libs/gpm-1.20.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=app-arch/xz-utils virtual/yacc || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/xz-utils virtual/yacc || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Console-based mouse driver
 EAPI=4
 HOMEPAGE=http://www.nico.schottelius.org/software/gpm/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-gpm )
 SLOT=0
 SRC_URI=http://www.nico.schottelius.org/software/gpm/archives/gpm-1.20.6.tar.lzma
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=270fcc6bdfa8b7afb6a9877d174c73f1
diff --git a/metadata/md5-cache/sys-libs/gpm-1.20.7 b/metadata/md5-cache/sys-libs/gpm-1.20.7
index 1b04982f2916..4c230e35b5d4 100644
--- a/metadata/md5-cache/sys-libs/gpm-1.20.7
+++ b/metadata/md5-cache/sys-libs/gpm-1.20.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses app-arch/xz-utils virtual/yacc || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses app-arch/xz-utils virtual/yacc || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Console-based mouse driver
 EAPI=4
 HOMEPAGE=http://www.nico.schottelius.org/software/gpm/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses selinux? ( sec-policy/selinux-gpm )
 SLOT=0
 SRC_URI=http://www.nico.schottelius.org/software/gpm/archives/gpm-1.20.7.tar.lzma
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0cdae41c71ff4e1855fdf1430adb5127
diff --git a/metadata/md5-cache/sys-libs/gpm-1.20.7-r1 b/metadata/md5-cache/sys-libs/gpm-1.20.7-r1
index 0883ed895235..719f90b4a11a 100644
--- a/metadata/md5-cache/sys-libs/gpm-1.20.7-r1
+++ b/metadata/md5-cache/sys-libs/gpm-1.20.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses app-arch/xz-utils virtual/yacc virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses app-arch/xz-utils virtual/yacc virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Console-based mouse driver
 EAPI=4
 HOMEPAGE=http://www.nico.schottelius.org/software/gpm/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses selinux? ( sec-policy/selinux-gpm )
 SLOT=0
 SRC_URI=http://www.nico.schottelius.org/software/gpm/archives/gpm-1.20.7.tar.lzma
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a5d3a75345a0b3fced25acd6e695dcea
diff --git a/metadata/md5-cache/sys-libs/libavc1394-0.5.4 b/metadata/md5-cache/sys-libs/libavc1394-0.5.4
index 46a07e3e20d3..91b1eedf957a 100644
--- a/metadata/md5-cache/sys-libs/libavc1394-0.5.4
+++ b/metadata/md5-cache/sys-libs/libavc1394-0.5.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-libs/libraw1394-0.8
 SLOT=0
 SRC_URI=mirror://sourceforge/libavc1394/libavc1394-0.5.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a67b9524e61c65d416c5776aee7bf122
diff --git a/metadata/md5-cache/sys-libs/libcap-ng-0.6.6 b/metadata/md5-cache/sys-libs/libcap-ng-0.6.6
index f2ce0eaaf058..712469a30387 100644
--- a/metadata/md5-cache/sys-libs/libcap-ng-0.6.6
+++ b/metadata/md5-cache/sys-libs/libcap-ng-0.6.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=sys-apps/attr python? ( dev-lang/python ) sys-kernel/linux-headers python? ( >=dev-lang/swig-2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/attr python? ( dev-lang/python ) sys-kernel/linux-headers python? ( >=dev-lang/swig-2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=POSIX 1003.1e capabilities
 EAPI=4
 HOMEPAGE=http://people.redhat.com/sgrubb/libcap-ng/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-apps/attr python? ( dev-lang/python )
 SLOT=0
 SRC_URI=http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.6.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aa5a8a32f2851d539a6a746a813839f7
diff --git a/metadata/md5-cache/sys-libs/libcap-ng-0.7.1 b/metadata/md5-cache/sys-libs/libcap-ng-0.7.1
index ef824f0ca451..3b6699d0cd2c 100644
--- a/metadata/md5-cache/sys-libs/libcap-ng-0.7.1
+++ b/metadata/md5-cache/sys-libs/libcap-ng-0.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python? ( dev-lang/python ) sys-kernel/linux-headers python? ( >=dev-lang/swig-2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=python? ( dev-lang/python ) sys-kernel/linux-headers python? ( >=dev-lang/swig-2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=POSIX 1003.1e capabilities
 EAPI=4
 HOMEPAGE=http://people.redhat.com/sgrubb/libcap-ng/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=python? ( dev-lang/python )
 SLOT=0
 SRC_URI=http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.7.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bf28847f33332bb43ed4a74242502411
diff --git a/metadata/md5-cache/sys-libs/libcap-ng-0.7.3 b/metadata/md5-cache/sys-libs/libcap-ng-0.7.3
index cd84a14df18f..deb1756036fe 100644
--- a/metadata/md5-cache/sys-libs/libcap-ng-0.7.3
+++ b/metadata/md5-cache/sys-libs/libcap-ng-0.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python? ( dev-lang/python ) sys-kernel/linux-headers python? ( >=dev-lang/swig-2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=python? ( dev-lang/python ) sys-kernel/linux-headers python? ( >=dev-lang/swig-2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=POSIX 1003.1e capabilities
 EAPI=5
 HOMEPAGE=http://people.redhat.com/sgrubb/libcap-ng/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=python? ( dev-lang/python )
 SLOT=0
 SRC_URI=http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.7.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a163b16162f52b9d5a02f139a88301df
diff --git a/metadata/md5-cache/sys-libs/libmath++-0.0.4 b/metadata/md5-cache/sys-libs/libmath++-0.0.4
index 3698a4157514..12e4a4374117 100644
--- a/metadata/md5-cache/sys-libs/libmath++-0.0.4
+++ b/metadata/md5-cache/sys-libs/libmath++-0.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=template based math library, written in C++, for symbolic and numeric calculus applications
 HOMEPAGE=http://rm-rf.in/libmath%2B%2B/
 IUSE=doc
@@ -7,5 +7,5 @@ KEYWORDS=ppc s390 x86 amd64
 LICENSE=GPL-2
 SLOT=1
 SRC_URI=http://upstream.rm-rf.in/libmath%2B%2B/libmath++-0.0.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=abad69cfba08ad073c4b623d01bd30cf
diff --git a/metadata/md5-cache/sys-libs/libnih-1.0.3 b/metadata/md5-cache/sys-libs/libnih-1.0.3
index 5ffa4dd29cd5..54b172d57a21 100644
--- a/metadata/md5-cache/sys-libs/libnih-1.0.3
+++ b/metadata/md5-cache/sys-libs/libnih-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 ) sys-devel/gettext virtual/pkgconfig test? ( dev-util/valgrind ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 ) sys-devel/gettext virtual/pkgconfig test? ( dev-util/valgrind ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Light-weight 'standard library' of C functions
 EAPI=2
 HOMEPAGE=https://launchpad.net/libnih
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 )
 SLOT=0
 SRC_URI=http://launchpad.net/libnih/1.0/1.0.3/+download/libnih-1.0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=117a8cc0fcd3b94edc2afdfc17180055
diff --git a/metadata/md5-cache/sys-libs/libosinfo-0.2.6 b/metadata/md5-cache/sys-libs/libosinfo-0.2.6
index 79f2efb5aa3a..ea14d67cbd88 100644
--- a/metadata/md5-cache/sys-libs/libosinfo-0.2.6
+++ b/metadata/md5-cache/sys-libs/libosinfo-0.2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2:2 >=dev-libs/libxslt-1.0.0:= dev-libs/libxml2:= || ( >=net-libs/libsoup-2.42:2.4 net-libs/libsoup-gnome:2.4 ) sys-apps/hwids introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) dev-libs/gobject-introspection-common dev-util/gtk-doc-am virtual/pkgconfig test? ( dev-libs/check ) vala? ( || ( dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2:2 >=dev-libs/libxslt-1.0.0:= dev-libs/libxml2:= || ( >=net-libs/libsoup-2.42:2.4 net-libs/libsoup-gnome:2.4 ) sys-apps/hwids introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) dev-libs/gobject-introspection-common dev-util/gtk-doc-am virtual/pkgconfig test? ( dev-libs/check ) vala? ( || ( dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=GObject library for managing information about real and virtual OSes
 EAPI=5
 HOMEPAGE=http://fedorahosted.org/libosinfo/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2:2 >=dev-libs/libxslt-1.0.0:= dev-libs/libxml2:= || ( >
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=http://fedorahosted.org/releases/l/i/libosinfo/libosinfo-0.2.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
 _md5_=2719c65bb72875923a579b48d5f4a543
diff --git a/metadata/md5-cache/sys-libs/libservicelog-1.0.1 b/metadata/md5-cache/sys-libs/libservicelog-1.0.1
index a7d8b9935b98..bfa5fe55edea 100644
--- a/metadata/md5-cache/sys-libs/libservicelog-1.0.1
+++ b/metadata/md5-cache/sys-libs/libservicelog-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=dev-db/sqlite || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-db/sqlite || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Provides a library for logging service-related events
 HOMEPAGE=http://linux-diag.sourceforge.net/servicelog/
 KEYWORDS=ppc ppc64
@@ -7,5 +7,5 @@ LICENSE=IBM
 RDEPEND=dev-db/sqlite virtual/logger
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-diag/libservicelog-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=60f490a64c66c0bb652262fde9c3564a
diff --git a/metadata/md5-cache/sys-libs/libservicelog-1.1.11 b/metadata/md5-cache/sys-libs/libservicelog-1.1.11
index 4b0b015c3a40..d18f8e57544a 100644
--- a/metadata/md5-cache/sys-libs/libservicelog-1.1.11
+++ b/metadata/md5-cache/sys-libs/libservicelog-1.1.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=dev-db/sqlite || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-db/sqlite || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Provides a library for logging service-related events
 HOMEPAGE=http://linux-diag.sourceforge.net/servicelog/
 KEYWORDS=~ppc ~ppc64
@@ -7,5 +7,5 @@ LICENSE=IBM
 RDEPEND=dev-db/sqlite virtual/logger
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-diag/libservicelog-1.1.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=04739de9648516ded5bca2921f405454
diff --git a/metadata/md5-cache/sys-libs/libsmbios-2.2.28 b/metadata/md5-cache/sys-libs/libsmbios-2.2.28
index 5a85d4b5246f..78af6bfd153f 100644
--- a/metadata/md5-cache/sys-libs/libsmbios-2.2.28
+++ b/metadata/md5-cache/sys-libs/libsmbios-2.2.28
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) virtual/pkgconfig doc? ( app-doc/doxygen ) graphviz? ( media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.9.6 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) virtual/pkgconfig doc? ( app-doc/doxygen ) graphviz? ( media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.9.6 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Provide access to (SM)BIOS information
 EAPI=5
 HOMEPAGE=http://linux.dell.com/libsmbios/main/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2 OSL-2.0
 RDEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] )
 SLOT=0
 SRC_URI=http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-2.2.28/libsmbios-2.2.28.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f814f2f018b7d1a4ad543554d703106c
diff --git a/metadata/md5-cache/sys-libs/libstatgrab-0.17 b/metadata/md5-cache/sys-libs/libstatgrab-0.17
index 5bc6bc184406..4687f29a83e7 100644
--- a/metadata/md5-cache/sys-libs/libstatgrab-0.17
+++ b/metadata/md5-cache/sys-libs/libstatgrab-0.17
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 LGPL-2.1 )
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-0.17.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0dd0c2fa39d6cc09392c09f6b6ea3783
diff --git a/metadata/md5-cache/sys-libs/libunwind-0.99-r1 b/metadata/md5-cache/sys-libs/libunwind-0.99-r1
index 807a6f62fd3b..40e4e1146a95 100644
--- a/metadata/md5-cache/sys-libs/libunwind-0.99-r1
+++ b/metadata/md5-cache/sys-libs/libunwind-0.99-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Portable and efficient API to determine the call-chain of a program
 EAPI=4
 HOMEPAGE=http://savannah.nongnu.org/projects/libunwind
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=7
 SRC_URI=http://download.savannah.nongnu.org/releases/libunwind/libunwind-0.99.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0ad8f775c62f4c51e7184eefcb3b0a91
diff --git a/metadata/md5-cache/sys-libs/libunwind-1.0.1 b/metadata/md5-cache/sys-libs/libunwind-1.0.1
index ac6987a64a23..27d71b5be19d 100644
--- a/metadata/md5-cache/sys-libs/libunwind-1.0.1
+++ b/metadata/md5-cache/sys-libs/libunwind-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Portable and efficient API to determine the call-chain of a program
 EAPI=4
 HOMEPAGE=http://savannah.nongnu.org/projects/libunwind
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=7
 SRC_URI=http://download.savannah.nongnu.org/releases/libunwind/libunwind-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3fb5fc108a9401f84187c50dd292d46b
diff --git a/metadata/md5-cache/sys-libs/libunwind-1.0.1-r1 b/metadata/md5-cache/sys-libs/libunwind-1.0.1-r1
index 75b098718020..fbd6dd39c30a 100644
--- a/metadata/md5-cache/sys-libs/libunwind-1.0.1-r1
+++ b/metadata/md5-cache/sys-libs/libunwind-1.0.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Portable and efficient API to determine the call-chain of a program
 EAPI=4
 HOMEPAGE=http://savannah.nongnu.org/projects/libunwind
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=7
 SRC_URI=http://download.savannah.nongnu.org/releases/libunwind/libunwind-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ca214af0f3634c5a3db02d969e7deafe
diff --git a/metadata/md5-cache/sys-libs/mars-1.0.1 b/metadata/md5-cache/sys-libs/mars-1.0.1
index 99cfee5370dd..4a6110d9b82d 100644
--- a/metadata/md5-cache/sys-libs/mars-1.0.1
+++ b/metadata/md5-cache/sys-libs/mars-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-libs/libspe2 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/libspe2 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Multicore Application Runtime System
 HOMEPAGE=ftp://ftp.infradead.org/pub/Sony-PS3/mars/
 KEYWORDS=~ppc64
@@ -7,5 +7,5 @@ LICENSE=MIT_Plus MIT
 RDEPEND=sys-libs/libspe2
 SLOT=0
 SRC_URI=ftp://ftp.infradead.org/pub/Sony-PS3/mars/1.0.1/mars-src-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=d3f24d89ff4beca26a46b2b334158574
diff --git a/metadata/md5-cache/sys-libs/nss-db-2.2.3_pre1-r2 b/metadata/md5-cache/sys-libs/nss-db-2.2.3_pre1-r2
index 22fc57f22124..f8780c90998f 100644
--- a/metadata/md5-cache/sys-libs/nss-db-2.2.3_pre1-r2
+++ b/metadata/md5-cache/sys-libs/nss-db-2.2.3_pre1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=sys-libs/db-4 sys-devel/make >=sys-libs/glibc-2.3 !>=sys-libs/glibc-2.15 sys-devel/gettext || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/db-4 sys-devel/make >=sys-libs/glibc-2.3 !>=sys-libs/glibc-2.15 sys-devel/gettext || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Allows important system files to be stored in a fast database file rather than plain text
 HOMEPAGE=http://sources.redhat.com/glibc/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/db-4 sys-devel/make >=sys-libs/glibc-2.3 !>=sys-libs/glibc-2.15
 SLOT=0
 SRC_URI=ftp://sources.redhat.com/pub/glibc/old-releases/nss_db-2.2.3pre1.tar.gz mirror://gentoo/nss_db-2.2.3pre1-external.patch.bz2 mirror://gentoo/nss_db-2.2.3pre1-dbupgrade.patch.bz2 mirror://gentoo/nss_db-2.2.3pre1-dbopen.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ef97ca43346bc6f05179aee4b8865bec
diff --git a/metadata/md5-cache/sys-libs/nss-db-2.2.3_pre1-r3 b/metadata/md5-cache/sys-libs/nss-db-2.2.3_pre1-r3
index 8759c00f2971..a1296259d1f7 100644
--- a/metadata/md5-cache/sys-libs/nss-db-2.2.3_pre1-r3
+++ b/metadata/md5-cache/sys-libs/nss-db-2.2.3_pre1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=sys-libs/db-4 sys-devel/make >=sys-libs/glibc-2.3 !>=sys-libs/glibc-2.15 sys-devel/gettext || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/db-4 sys-devel/make >=sys-libs/glibc-2.3 !>=sys-libs/glibc-2.15 sys-devel/gettext || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Allows important system files to be stored in a fast database file rather than plain text
 HOMEPAGE=http://sources.redhat.com/glibc/
 IUSE=nls
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/db-4 sys-devel/make >=sys-libs/glibc-2.3 !>=sys-libs/glibc-2.15
 SLOT=0
 SRC_URI=ftp://sources.redhat.com/pub/glibc/old-releases/nss_db-2.2.3pre1.tar.gz mirror://gentoo/nss_db-2.2.3pre1-external.patch.bz2 mirror://gentoo/nss_db-2.2.3pre1-dbupgrade.patch.bz2 mirror://gentoo/nss_db-2.2.3pre1-dbopen.patch.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8f698ecd6031132ae1a1f34ec0f00c03
diff --git a/metadata/md5-cache/sys-libs/openipmi-2.0.16 b/metadata/md5-cache/sys-libs/openipmi-2.0.16
index def82121db25..cf0ff9b48ddd 100644
--- a/metadata/md5-cache/sys-libs/openipmi-2.0.16
+++ b/metadata/md5-cache/sys-libs/openipmi-2.0.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=dev-libs/glib sys-libs/gdbm crypt? ( dev-libs/openssl ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl ) python? ( dev-lang/python ) tcl? ( dev-lang/tcl ) >=dev-lang/swig-1.3.21 virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib sys-libs/gdbm crypt? ( dev-libs/openssl ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl ) python? ( dev-lang/python ) tcl? ( dev-lang/tcl ) >=dev-lang/swig-1.3.21 virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library interface to IPMI
 HOMEPAGE=http://sourceforge.net/projects/openipmi/
 IUSE=crypt snmp perl tcl python
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/glib sys-libs/gdbm crypt? ( dev-libs/openssl ) snmp? ( net-anal
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openipmi/OpenIPMI-2.0.16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=54450ab60f311400c6ccd49757c577ac
diff --git a/metadata/md5-cache/sys-libs/openipmi-2.0.16-r1 b/metadata/md5-cache/sys-libs/openipmi-2.0.16-r1
index 9d6d24151b71..9504c24c7701 100644
--- a/metadata/md5-cache/sys-libs/openipmi-2.0.16-r1
+++ b/metadata/md5-cache/sys-libs/openipmi-2.0.16-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=dev-libs/glib sys-libs/gdbm crypt? ( dev-libs/openssl ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl ) python? ( dev-lang/python ) tcl? ( dev-lang/tcl ) >=dev-lang/swig-1.3.21 virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib sys-libs/gdbm crypt? ( dev-libs/openssl ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl ) python? ( dev-lang/python ) tcl? ( dev-lang/tcl ) >=dev-lang/swig-1.3.21 virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library interface to IPMI
 HOMEPAGE=http://sourceforge.net/projects/openipmi/
 IUSE=crypt snmp perl tcl python
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/glib sys-libs/gdbm crypt? ( dev-libs/openssl ) snmp? ( net-anal
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openipmi/OpenIPMI-2.0.16.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eb22ac337b1e01fe8b9d89967435a05f
diff --git a/metadata/md5-cache/sys-libs/openipmi-2.0.18 b/metadata/md5-cache/sys-libs/openipmi-2.0.18
index f0a12c5dc916..acd25029b884 100644
--- a/metadata/md5-cache/sys-libs/openipmi-2.0.18
+++ b/metadata/md5-cache/sys-libs/openipmi-2.0.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=dev-libs/glib sys-libs/gdbm crypt? ( dev-libs/openssl ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl ) python? ( dev-lang/python ) tcl? ( dev-lang/tcl ) >=dev-lang/swig-1.3.21 virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib sys-libs/gdbm crypt? ( dev-libs/openssl ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl ) python? ( dev-lang/python ) tcl? ( dev-lang/tcl ) >=dev-lang/swig-1.3.21 virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library interface to IPMI
 HOMEPAGE=http://sourceforge.net/projects/openipmi/
 IUSE=crypt snmp perl tcl python
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/glib sys-libs/gdbm crypt? ( dev-libs/openssl ) snmp? ( net-anal
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openipmi/OpenIPMI-2.0.18.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0bd483cd91567e459d92369911151c5f
diff --git a/metadata/md5-cache/sys-libs/pam-1.1.6-r2 b/metadata/md5-cache/sys-libs/pam-1.1.6-r2
index a5ddbafa7d0e..c573965fcae0 100644
--- a/metadata/md5-cache/sys-libs/pam-1.1.6-r2
+++ b/metadata/md5-cache/sys-libs/pam-1.1.6-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend test
-DEPEND=nls? ( virtual/libintl ) cracklib? ( >=sys-libs/cracklib-2.8.3 ) audit? ( sys-process/audit ) selinux? ( >=sys-libs/libselinux-1.28 ) berkdb? ( sys-libs/db ) elibc_glibc? ( >=sys-libs/glibc-2.7 nis? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) ) >=sys-devel/libtool-2 sys-devel/flex nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=nls? ( virtual/libintl ) cracklib? ( >=sys-libs/cracklib-2.8.3 ) audit? ( sys-process/audit ) selinux? ( >=sys-libs/libselinux-1.28 ) berkdb? ( sys-libs/db ) elibc_glibc? ( >=sys-libs/glibc-2.7 nis? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) ) >=sys-devel/libtool-2 sys-devel/flex nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Linux-PAM (Pluggable Authentication Modules)
 EAPI=5
 HOMEPAGE=https://fedorahosted.org/linux-pam/
@@ -10,5 +10,5 @@ PDEPEND=sys-auth/pambase vim-syntax? ( app-vim/pam-syntax )
 RDEPEND=nls? ( virtual/libintl ) cracklib? ( >=sys-libs/cracklib-2.8.3 ) audit? ( sys-process/audit ) selinux? ( >=sys-libs/libselinux-1.28 ) berkdb? ( sys-libs/db ) elibc_glibc? ( >=sys-libs/glibc-2.7 nis? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) ) !<sys-apps/openrc-0.11.8 !sys-auth/openpam !sys-auth/pam_userdb
 SLOT=0
 SRC_URI=http://www.linux-pam.org/library/Linux-PAM-1.1.6.tar.bz2 http://www.linux-pam.org/documentation/Linux-PAM-1.1.6-docs.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=76b15fdcbe5def4c33379762c43ed200
diff --git a/metadata/md5-cache/sys-libs/pam-1.1.6-r4 b/metadata/md5-cache/sys-libs/pam-1.1.6-r4
index d2f387625c7a..b1fc86145ed9 100644
--- a/metadata/md5-cache/sys-libs/pam-1.1.6-r4
+++ b/metadata/md5-cache/sys-libs/pam-1.1.6-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend test
-DEPEND=nls? ( virtual/libintl ) cracklib? ( >=sys-libs/cracklib-2.8.3 ) audit? ( sys-process/audit ) selinux? ( >=sys-libs/libselinux-1.28 ) berkdb? ( sys-libs/db ) elibc_glibc? ( >=sys-libs/glibc-2.7 nis? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) ) >=sys-devel/libtool-2 sys-devel/flex nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=nls? ( virtual/libintl ) cracklib? ( >=sys-libs/cracklib-2.8.3 ) audit? ( sys-process/audit ) selinux? ( >=sys-libs/libselinux-1.28 ) berkdb? ( sys-libs/db ) elibc_glibc? ( >=sys-libs/glibc-2.7 nis? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) ) >=sys-devel/libtool-2 sys-devel/flex nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Linux-PAM (Pluggable Authentication Modules)
 EAPI=5
 HOMEPAGE=https://fedorahosted.org/linux-pam/
@@ -10,5 +10,5 @@ PDEPEND=sys-auth/pambase vim-syntax? ( app-vim/pam-syntax )
 RDEPEND=nls? ( virtual/libintl ) cracklib? ( >=sys-libs/cracklib-2.8.3 ) audit? ( sys-process/audit ) selinux? ( >=sys-libs/libselinux-1.28 ) berkdb? ( sys-libs/db ) elibc_glibc? ( >=sys-libs/glibc-2.7 nis? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) ) !<sys-apps/openrc-0.11.8 !sys-auth/openpam !sys-auth/pam_userdb
 SLOT=0
 SRC_URI=http://www.linux-pam.org/library/Linux-PAM-1.1.6.tar.bz2 http://www.linux-pam.org/documentation/Linux-PAM-1.1.6-docs.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fec89d952fc720f6259c418bb71e3d7c
diff --git a/metadata/md5-cache/sys-libs/talloc-1.3.0 b/metadata/md5-cache/sys-libs/talloc-1.3.0
index 2607d1304f19..2750b3b2ea80 100644
--- a/metadata/md5-cache/sys-libs/talloc-1.3.0
+++ b/metadata/md5-cache/sys-libs/talloc-1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=!<net-fs/samba-libs-3.4 app-text/docbook-xml-dtd:4.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!<net-fs/samba-libs-3.4 app-text/docbook-xml-dtd:4.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Samba talloc library
 EAPI=2
 HOMEPAGE=http://talloc.samba.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=!<net-fs/samba-libs-3.4 app-text/docbook-xml-dtd:4.2
 SLOT=0
 SRC_URI=http://samba.org/ftp/talloc/talloc-1.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a583504f69d3762200ca5cdb272376af
diff --git a/metadata/md5-cache/sys-libs/talloc-1.3.1 b/metadata/md5-cache/sys-libs/talloc-1.3.1
index 95cc898fb90b..f536123f5978 100644
--- a/metadata/md5-cache/sys-libs/talloc-1.3.1
+++ b/metadata/md5-cache/sys-libs/talloc-1.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=!<net-fs/samba-libs-3.4 app-text/docbook-xml-dtd:4.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!<net-fs/samba-libs-3.4 app-text/docbook-xml-dtd:4.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Samba talloc library
 EAPI=2
 HOMEPAGE=http://talloc.samba.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=!<net-fs/samba-libs-3.4 app-text/docbook-xml-dtd:4.2
 SLOT=0
 SRC_URI=http://samba.org/ftp/talloc/talloc-1.3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fc7e4e4abdf4082bd42daed785185913
diff --git a/metadata/md5-cache/sys-libs/talloc-2.0.0-r1 b/metadata/md5-cache/sys-libs/talloc-2.0.0-r1
index c9c1f68ed758..e0f7896cd38a 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.0.0-r1
+++ b/metadata/md5-cache/sys-libs/talloc-2.0.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=!<net-fs/samba-3.3 doc? ( app-text/docbook-xml-dtd:4.2 ) !<net-fs/samba-libs-3.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!<net-fs/samba-3.3 doc? ( app-text/docbook-xml-dtd:4.2 ) !<net-fs/samba-libs-3.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Samba talloc library
 EAPI=2
 HOMEPAGE=http://talloc.samba.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!<net-fs/samba-3.3 doc? ( app-text/docbook-xml-dtd:4.2 ) !<net-fs/samba-libs-3.4
 SLOT=0
 SRC_URI=http://samba.org/ftp/talloc/talloc-2.0.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5561ccc0714fbc5c16bf31ac05e801bc
diff --git a/metadata/md5-cache/sys-libs/talloc-2.0.1 b/metadata/md5-cache/sys-libs/talloc-2.0.1
index b9d8a9ecd0c2..cc282d3e13a4 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.0.1
+++ b/metadata/md5-cache/sys-libs/talloc-2.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=!<net-fs/samba-3.3 doc? ( app-text/docbook-xml-dtd:4.2 ) !<net-fs/samba-libs-3.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!<net-fs/samba-3.3 doc? ( app-text/docbook-xml-dtd:4.2 ) !<net-fs/samba-libs-3.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Samba talloc library
 EAPI=2
 HOMEPAGE=http://talloc.samba.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!<net-fs/samba-3.3 doc? ( app-text/docbook-xml-dtd:4.2 ) !<net-fs/samba-libs-3.4
 SLOT=0
 SRC_URI=http://samba.org/ftp/talloc/talloc-2.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=97eca77ef65b7979668ad385277ee9a3
diff --git a/metadata/md5-cache/sys-libs/talloc-2.0.1-r1 b/metadata/md5-cache/sys-libs/talloc-2.0.1-r1
index 27bf584f2510..c1cee85673cf 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.0.1-r1
+++ b/metadata/md5-cache/sys-libs/talloc-2.0.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Samba talloc library
 EAPI=2
 HOMEPAGE=http://talloc.samba.org/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://samba.org/ftp/talloc/talloc-2.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fdcff35a82f6ffe49a544caed8c47577
diff --git a/metadata/md5-cache/sys-libs/talloc-2.0.1-r2 b/metadata/md5-cache/sys-libs/talloc-2.0.1-r2
index 681edce21ce5..ddcced568a54 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.0.1-r2
+++ b/metadata/md5-cache/sys-libs/talloc-2.0.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Samba talloc library
 EAPI=2
 HOMEPAGE=http://talloc.samba.org/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://samba.org/ftp/talloc/talloc-2.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5708ddfd27e9328e7391f1353bfd4db7
diff --git a/metadata/md5-cache/sys-libs/talloc-2.0.8 b/metadata/md5-cache/sys-libs/talloc-2.0.8
index b5df7cf37388..0c54dadf3a56 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.0.8
+++ b/metadata/md5-cache/sys-libs/talloc-2.0.8
@@ -4,10 +4,10 @@ DESCRIPTION=Samba talloc library
 EAPI=3
 HOMEPAGE=http://talloc.samba.org/
 IUSE=compat python
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=!!<sys-libs/talloc-2.0.5 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://samba.org/ftp/talloc/talloc-2.0.8.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	waf-utils	681b3e9181d1a20ad8d0c186333ddcf7
-_md5_=0c9a4f98f1fef011366d3a628a02ec3e
+_md5_=710e57ffd49eb8c511a621e84265e16a
diff --git a/metadata/md5-cache/sys-libs/tdb-1.2.1 b/metadata/md5-cache/sys-libs/tdb-1.2.1
index 984770d61ea8..28c3ac03304a 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.2.1
+++ b/metadata/md5-cache/sys-libs/tdb-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!<net-fs/samba-libs-3.4 !<net-fs/samba-3.3 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+DEPEND=!<net-fs/samba-libs-3.4 !<net-fs/samba-3.3 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 DESCRIPTION=Samba tdb
 EAPI=2
 HOMEPAGE=http://tdb.samba.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!!<sys-libs/tdb-1.2.1 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://samba.org/ftp/tdb/tdb-1.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=5e14043e45c246eecc844dd49b4a47f5
diff --git a/metadata/md5-cache/sys-libs/tdb-1.2.1-r1 b/metadata/md5-cache/sys-libs/tdb-1.2.1-r1
index 8d3fed435992..edc9d55aa4f2 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.2.1-r1
+++ b/metadata/md5-cache/sys-libs/tdb-1.2.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!<net-fs/samba-3.3 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+DEPEND=!<net-fs/samba-3.3 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 DESCRIPTION=Samba tdb
 EAPI=2
 HOMEPAGE=http://tdb.samba.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://samba.org/ftp/tdb/tdb-1.2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=72abe8b1414bc4501d85985e39441deb
diff --git a/metadata/md5-cache/sys-libs/tdb-1.2.7-r1 b/metadata/md5-cache/sys-libs/tdb-1.2.7-r1
index 2c739db97dae..527054235a50 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.2.7-r1
+++ b/metadata/md5-cache/sys-libs/tdb-1.2.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!<net-fs/samba-3.3 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-libs/popt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=!<net-fs/samba-3.3 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-libs/popt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Samba tdb
 EAPI=2
 HOMEPAGE=http://tdb.samba.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://samba.org/ftp/tdb/tdb-1.2.7.tar.gz mirror://gentoo/tdb-1.2.7-patches.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e00f86b9533c20184e59c22cee6a847a
diff --git a/metadata/md5-cache/sys-libs/zlib-1.2.5.1-r2 b/metadata/md5-cache/sys-libs/zlib-1.2.5.1-r2
index 4ec64009e203..540ec97be93e 100644
--- a/metadata/md5-cache/sys-libs/zlib-1.2.5.1-r2
+++ b/metadata/md5-cache/sys-libs/zlib-1.2.5.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Standard (de)compression library
 HOMEPAGE=http://www.zlib.net/
 IUSE=minizip static-libs
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=!<dev-libs/libxml2-2.7.7
 SLOT=0
 SRC_URI=http://www.gzip.org/zlib/zlib-1.2.5.1.tar.gz http://www.zlib.net/current/beta/zlib-1.2.5.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9946125c401a954d60f8ed15c8182000
diff --git a/metadata/md5-cache/sys-libs/zlib-1.2.6 b/metadata/md5-cache/sys-libs/zlib-1.2.6
index dc885f9900a4..b802b65d9715 100644
--- a/metadata/md5-cache/sys-libs/zlib-1.2.6
+++ b/metadata/md5-cache/sys-libs/zlib-1.2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=minizip? ( || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool )
+DEPEND=minizip? ( || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool )
 DESCRIPTION=Standard (de)compression library
 HOMEPAGE=http://www.zlib.net/
 IUSE=minizip static-libs
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=!<dev-libs/libxml2-2.7.7
 SLOT=0
 SRC_URI=http://zlib.net/zlib-1.2.6.tar.gz http://www.gzip.org/zlib/zlib-1.2.6.tar.gz http://www.zlib.net/current/beta/zlib-1.2.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5990a551925777803691bce85d9744a2
diff --git a/metadata/md5-cache/sys-libs/zlib-1.2.7 b/metadata/md5-cache/sys-libs/zlib-1.2.7
index c731ae2f192e..15b79cbb637c 100644
--- a/metadata/md5-cache/sys-libs/zlib-1.2.7
+++ b/metadata/md5-cache/sys-libs/zlib-1.2.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=minizip? ( || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool )
+DEPEND=minizip? ( || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool )
 DESCRIPTION=Standard (de)compression library
 HOMEPAGE=http://www.zlib.net/
 IUSE=minizip static-libs
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=!<dev-libs/libxml2-2.7.7
 SLOT=0
 SRC_URI=http://zlib.net/zlib-1.2.7.tar.gz http://www.gzip.org/zlib/zlib-1.2.7.tar.gz http://www.zlib.net/current/beta/zlib-1.2.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=109a7ffb77ef99d103084bd6536e6e59
diff --git a/metadata/md5-cache/sys-power/cpupower-3.8_rc4 b/metadata/md5-cache/sys-power/cpupower-3.8
similarity index 51%
rename from metadata/md5-cache/sys-power/cpupower-3.8_rc4
rename to metadata/md5-cache/sys-power/cpupower-3.8
index e63a10a6c93d..01b0d3f1a898 100644
--- a/metadata/md5-cache/sys-power/cpupower-3.8_rc4
+++ b/metadata/md5-cache/sys-power/cpupower-3.8
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=sys-apps/pciutils !sys-apps/linux-misc-apps virtual/os-headers nls? ( sys-devel/gettext )
+DEPEND=sys-apps/pciutils !sys-apps/linux-misc-apps !sys-power/cpufrequtils virtual/os-headers nls? ( sys-devel/gettext )
 DESCRIPTION=Shows and sets processor power related values
 EAPI=5
 HOMEPAGE=http://www.kernel.org/
 IUSE=cpufreq_bench debug nls
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-apps/pciutils !sys-apps/linux-misc-apps
+RDEPEND=sys-apps/pciutils !sys-apps/linux-misc-apps !sys-power/cpufrequtils
 SLOT=0
-SRC_URI=mirror://kernel/linux/kernel/v3.0/testing/linux-3.8-rc4.tar.bz2
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.8.tar.xz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=4728331f30aa6da5bf8ae2a669660d9f
+_md5_=941cb250140810f5564bea5a83ce4aa9
diff --git a/metadata/md5-cache/sys-power/nut-2.6.0-r1 b/metadata/md5-cache/sys-power/nut-2.6.0-r1
index 2190d1f6c113..771229804c13 100644
--- a/metadata/md5-cache/sys-power/nut-2.6.0-r1
+++ b/metadata/md5-cache/sys-power/nut-2.6.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=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 ) virtual/udev >=sys-apps/sed-4 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=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 ) virtual/udev >=sys-apps/sed-4 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Network-UPS Tools
 EAPI=2
 HOMEPAGE=http://www.networkupstools.org/
@@ -10,5 +10,5 @@ PDEPEND=bash-completion? ( app-shells/bash-completion )
 RDEPEND=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 ) virtual/udev bash-completion? ( app-admin/eselect )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion	003731da0df19d26955927bd534f3058	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion	003731da0df19d26955927bd534f3058	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=78c7b0ce7135d9c8942c535aeb8f64de
diff --git a/metadata/md5-cache/sys-power/nut-2.6.2 b/metadata/md5-cache/sys-power/nut-2.6.2
index eeb5e9beeae1..46052801aa96 100644
--- a/metadata/md5-cache/sys-power/nut-2.6.2
+++ b/metadata/md5-cache/sys-power/nut-2.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=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 ) virtual/udev >=sys-apps/sed-4 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=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 ) virtual/udev >=sys-apps/sed-4 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Network-UPS Tools
 EAPI=2
 HOMEPAGE=http://www.networkupstools.org/
@@ -10,5 +10,5 @@ PDEPEND=bash-completion? ( app-shells/bash-completion )
 RDEPEND=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 ) virtual/udev bash-completion? ( app-admin/eselect )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion	003731da0df19d26955927bd534f3058	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion	003731da0df19d26955927bd534f3058	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=02e2e5320919fb318d3927e4582f20c0
diff --git a/metadata/md5-cache/sys-power/nut-2.6.3 b/metadata/md5-cache/sys-power/nut-2.6.3
index 713b8d3a7592..feed3e3f9555 100644
--- a/metadata/md5-cache/sys-power/nut-2.6.3
+++ b/metadata/md5-cache/sys-power/nut-2.6.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=avahi? ( net-dns/avahi ) 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 ) virtual/udev >=sys-apps/sed-4 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=avahi? ( net-dns/avahi ) 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 ) virtual/udev >=sys-apps/sed-4 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Network-UPS Tools
 EAPI=2
 HOMEPAGE=http://www.networkupstools.org/
@@ -10,5 +10,5 @@ PDEPEND=bash-completion? ( app-shells/bash-completion )
 RDEPEND=avahi? ( net-dns/avahi ) 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 ) virtual/udev bash-completion? ( app-admin/eselect )
 SLOT=0
 SRC_URI=http://random.networkupstools.org/source/2.6/nut-2.6.3.tar.gz http://www.networkupstools.org/source/2.6/nut-2.6.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion	003731da0df19d26955927bd534f3058	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion	003731da0df19d26955927bd534f3058	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=26f9be21c4caec5c1320cfbbf7a56dd1
diff --git a/metadata/md5-cache/sys-power/nut-2.6.5 b/metadata/md5-cache/sys-power/nut-2.6.5
index 085d4994e577..90e0b70fc3c8 100644
--- a/metadata/md5-cache/sys-power/nut-2.6.5
+++ b/metadata/md5-cache/sys-power/nut-2.6.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=avahi? ( net-dns/avahi ) 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 ) virtual/udev >=sys-apps/sed-4 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=avahi? ( net-dns/avahi ) 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 ) virtual/udev >=sys-apps/sed-4 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Network-UPS Tools
 EAPI=2
 HOMEPAGE=http://www.networkupstools.org/
@@ -10,5 +10,5 @@ PDEPEND=bash-completion? ( app-shells/bash-completion )
 RDEPEND=avahi? ( net-dns/avahi ) 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 ) virtual/udev bash-completion? ( app-admin/eselect )
 SLOT=0
 SRC_URI=http://random.networkupstools.org/source/2.6/nut-2.6.5.tar.gz http://www.networkupstools.org/source/2.6/nut-2.6.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	bash-completion	003731da0df19d26955927bd534f3058	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	bash-completion	003731da0df19d26955927bd534f3058	eutils	36e6377b0e31856b6d62af831661c4f3	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9f1842aff8bd0be92a758dc2e532c1de
diff --git a/metadata/md5-cache/sys-power/nvclock-0.8_beta4-r4 b/metadata/md5-cache/sys-power/nvclock-0.8_beta4-r4
index 66a159a98e2f..917fed25ee35 100644
--- a/metadata/md5-cache/sys-power/nvclock-0.8_beta4-r4
+++ b/metadata/md5-cache/sys-power/nvclock-0.8_beta4-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NVIDIA Overclocking Utility
 EAPI=2
 HOMEPAGE=http://www.linuxhardware.org/nvclock/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=http://www.linuxhardware.org/nvclock/nvclock0.8b4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=86826ce9a6c83d3424a555e44a8d8a15
diff --git a/metadata/md5-cache/sys-power/nvclock-0.8_p20110102-r1 b/metadata/md5-cache/sys-power/nvclock-0.8_p20110102-r1
index b6b43fb65f0f..0acb5964088d 100644
--- a/metadata/md5-cache/sys-power/nvclock-0.8_p20110102-r1
+++ b/metadata/md5-cache/sys-power/nvclock-0.8_p20110102-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) nvcontrol? ( x11-libs/libX11 x11-libs/libXext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gtk? ( x11-libs/gtk+:2 ) nvcontrol? ( x11-libs/libX11 x11-libs/libXext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=NVIDIA Overclocking Utility
 EAPI=2
 HOMEPAGE=http://www.linuxhardware.org/nvclock/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) nvcontrol? ( x11-libs/libX11 x11-libs/libXext )
 SLOT=0
 SRC_URI=mirror://gentoo/nvclock-0.8_p20110102.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=37db60fc6c0ab4f25a3b2dc116cfae1e
diff --git a/metadata/md5-cache/sys-power/powertop-9999 b/metadata/md5-cache/sys-power/powertop-9999
index 39fa942c18ba..f7c727f20112 100644
--- a/metadata/md5-cache/sys-power/powertop-9999
+++ b/metadata/md5-cache/sys-power/powertop-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses[unicode?] virtual/pkgconfig sys-devel/gettext dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses[unicode?] virtual/pkgconfig sys-devel/gettext dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=tool that helps you find what software is using the most power
 EAPI=5
 HOMEPAGE=https://01.org/powertop/ http://www.lesswatts.org/projects/powertop/
@@ -7,5 +7,5 @@ IUSE=unicode X
 LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses[unicode?] X? ( x11-apps/xset ) virtual/libintl
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=08f2ae28043066e6031afc3901f765f8
diff --git a/metadata/md5-cache/sys-power/suspend-1.0 b/metadata/md5-cache/sys-power/suspend-1.0
index c5b64ed98003..563f6333fac7 100644
--- a/metadata/md5-cache/sys-power/suspend-1.0
+++ b/metadata/md5-cache/sys-power/suspend-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Userspace Software Suspend and S2Ram
 EAPI=4
 HOMEPAGE=http://suspend.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/suspend/suspend-utils-1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0b2c0ba809c7a73d2bba741bea1a6494
diff --git a/metadata/md5-cache/sys-process/acct-6.5.5-r2 b/metadata/md5-cache/sys-process/acct-6.5.5-r2
index 2ef16a435f39..b35ad888ad92 100644
--- a/metadata/md5-cache/sys-process/acct-6.5.5-r2
+++ b/metadata/md5-cache/sys-process/acct-6.5.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU system accounting utilities
 EAPI=2
 HOMEPAGE=https://savannah.gnu.org/projects/acct/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/acct/acct-6.5.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=419dc029f3bdbf385eb75ac59ffb96ca
diff --git a/metadata/md5-cache/sys-process/at-3.1.13-r1 b/metadata/md5-cache/sys-process/at-3.1.13-r1
index ee71222e092d..643861f6fc81 100644
--- a/metadata/md5-cache/sys-process/at-3.1.13-r1
+++ b/metadata/md5-cache/sys-process/at-3.1.13-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=virtual/mta >=sys-devel/autoconf-2.64 sys-devel/bison >=sys-devel/flex-2.5.4a pam? ( virtual/pam ) selinux? ( sec-policy/selinux-at ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/mta >=sys-devel/autoconf-2.64 sys-devel/bison >=sys-devel/flex-2.5.4a pam? ( virtual/pam ) selinux? ( sec-policy/selinux-at ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Queues jobs for later execution
 EAPI=4
 HOMEPAGE=http://packages.qa.debian.org/a/at.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/mta virtual/logger selinux? ( sec-policy/selinux-at )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/at/at_3.1.13.orig.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0de0ec35414965044c40f493d59e6ed8
diff --git a/metadata/md5-cache/sys-process/at-3.1.13-r2 b/metadata/md5-cache/sys-process/at-3.1.13-r2
index eae0927d0368..bba87cdb6743 100644
--- a/metadata/md5-cache/sys-process/at-3.1.13-r2
+++ b/metadata/md5-cache/sys-process/at-3.1.13-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=virtual/mta >=sys-devel/autoconf-2.64 sys-devel/bison >=sys-devel/flex-2.5.4a pam? ( virtual/pam ) selinux? ( sec-policy/selinux-at ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/mta >=sys-devel/autoconf-2.64 sys-devel/bison >=sys-devel/flex-2.5.4a pam? ( virtual/pam ) selinux? ( sec-policy/selinux-at ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Queues jobs for later execution
 EAPI=4
 HOMEPAGE=http://packages.qa.debian.org/a/at.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/mta virtual/logger selinux? ( sec-policy/selinux-at )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/at/at_3.1.13.orig.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bb1211eb9d829fa46fe276ba53a61a3d
diff --git a/metadata/md5-cache/sys-process/audit-1.7.17 b/metadata/md5-cache/sys-process/audit-1.7.17
index cb5d5c36e7e7..f7ab6b0d9daf 100644
--- a/metadata/md5-cache/sys-process/audit-1.7.17
+++ b/metadata/md5-cache/sys-process/audit-1.7.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=ldap? ( net-nds/openldap ) dev-lang/swig >=sys-kernel/linux-headers-2.6.23 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=ldap? ( net-nds/openldap ) dev-lang/swig >=sys-kernel/linux-headers-2.6.23 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=Userspace utilities for storing and processing auditing records
 EAPI=3
 HOMEPAGE=http://people.redhat.com/sgrubb/audit/
@@ -10,5 +10,5 @@ RDEPEND=ldap? ( net-nds/openldap ) =dev-lang/python-2*
 RESTRICT=test
 SLOT=0
 SRC_URI=http://people.redhat.com/sgrubb/audit/audit-1.7.17.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d1cebb870639468353dca3cb68b22421
diff --git a/metadata/md5-cache/sys-process/audit-1.7.18 b/metadata/md5-cache/sys-process/audit-1.7.18
index b79c5bbbb848..327c5c3bee7d 100644
--- a/metadata/md5-cache/sys-process/audit-1.7.18
+++ b/metadata/md5-cache/sys-process/audit-1.7.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=ldap? ( net-nds/openldap ) dev-lang/swig >=sys-kernel/linux-headers-2.6.23 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=ldap? ( net-nds/openldap ) dev-lang/swig >=sys-kernel/linux-headers-2.6.23 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=Userspace utilities for storing and processing auditing records
 EAPI=3
 HOMEPAGE=http://people.redhat.com/sgrubb/audit/
@@ -10,5 +10,5 @@ RDEPEND=ldap? ( net-nds/openldap ) =dev-lang/python-2*
 RESTRICT=test
 SLOT=0
 SRC_URI=http://people.redhat.com/sgrubb/audit/audit-1.7.18.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c4691670a6b1d69dfddbe160e8a568ea
diff --git a/metadata/md5-cache/sys-process/audit-1.7.4 b/metadata/md5-cache/sys-process/audit-1.7.4
index e2a6174a2c12..691b8b2ce0b1 100644
--- a/metadata/md5-cache/sys-process/audit-1.7.4
+++ b/metadata/md5-cache/sys-process/audit-1.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=ldap? ( net-nds/openldap ) dev-lang/swig >=sys-kernel/linux-headers-2.6.23 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=ldap? ( net-nds/openldap ) dev-lang/swig >=sys-kernel/linux-headers-2.6.23 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=Userspace utilities for storing and processing auditing records
 EAPI=3
 HOMEPAGE=http://people.redhat.com/sgrubb/audit/
@@ -10,5 +10,5 @@ RDEPEND=ldap? ( net-nds/openldap ) =dev-lang/python-2*
 RESTRICT=test
 SLOT=0
 SRC_URI=http://people.redhat.com/sgrubb/audit/audit-1.7.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ffbe66b3287a25c4f33db52655e28e5e
diff --git a/metadata/md5-cache/sys-process/audit-2.0.5 b/metadata/md5-cache/sys-process/audit-2.0.5
index 7ca81ae7b94f..a8405134dd29 100644
--- a/metadata/md5-cache/sys-process/audit-2.0.5
+++ b/metadata/md5-cache/sys-process/audit-2.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=Userspace utilities for storing and processing auditing records
 EAPI=3
 HOMEPAGE=http://people.redhat.com/sgrubb/audit/
@@ -10,5 +10,5 @@ RDEPEND=ldap? ( net-nds/openldap ) prelude? ( dev-libs/libprelude ) sys-libs/lib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://people.redhat.com/sgrubb/audit/audit-2.0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1f6e482ea87b7802222fe4673187aa52
diff --git a/metadata/md5-cache/sys-process/audit-2.1.3 b/metadata/md5-cache/sys-process/audit-2.1.3
index c68c3b41dec6..87fdbbd02796 100644
--- a/metadata/md5-cache/sys-process/audit-2.1.3
+++ b/metadata/md5-cache/sys-process/audit-2.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=Userspace utilities for storing and processing auditing records
 EAPI=3
 HOMEPAGE=http://people.redhat.com/sgrubb/audit/
@@ -10,5 +10,5 @@ RDEPEND=ldap? ( net-nds/openldap ) prelude? ( dev-libs/libprelude ) sys-libs/lib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://people.redhat.com/sgrubb/audit/audit-2.1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=95c1cc43d3bf7faf49b76eafc55914a3
diff --git a/metadata/md5-cache/sys-process/audit-2.1.3-r1 b/metadata/md5-cache/sys-process/audit-2.1.3-r1
index 6eec8edb85f1..fcddde4e58c0 100644
--- a/metadata/md5-cache/sys-process/audit-2.1.3-r1
+++ b/metadata/md5-cache/sys-process/audit-2.1.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Userspace utilities for storing and processing auditing records
 EAPI=3
 HOMEPAGE=http://people.redhat.com/sgrubb/audit/
@@ -10,5 +10,5 @@ RDEPEND=ldap? ( net-nds/openldap ) prelude? ( dev-libs/libprelude ) sys-libs/lib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://people.redhat.com/sgrubb/audit/audit-2.1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ba270616611aab62b02791ddff5fb206
diff --git a/metadata/md5-cache/sys-process/audit-2.2.2 b/metadata/md5-cache/sys-process/audit-2.2.2
index 096c7a9a2f24..97206b9537ee 100644
--- a/metadata/md5-cache/sys-process/audit-2.2.2
+++ b/metadata/md5-cache/sys-process/audit-2.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 DESCRIPTION=Userspace utilities for storing and processing auditing records
 EAPI=5
 HOMEPAGE=http://people.redhat.com/sgrubb/audit/
@@ -10,5 +10,5 @@ RDEPEND=ldap? ( net-nds/openldap ) prelude? ( dev-libs/libprelude ) sys-libs/lib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://people.redhat.com/sgrubb/audit/audit-2.2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f1329d527a5f12efa2bcdbf74efe244d
diff --git a/metadata/md5-cache/sys-process/fcron-3.1.1 b/metadata/md5-cache/sys-process/fcron-3.1.1
index 06ce5d56be14..090f62d16354 100644
--- a/metadata/md5-cache/sys-process/fcron-3.1.1
+++ b/metadata/md5-cache/sys-process/fcron-3.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) pam? ( virtual/pam ) readline? ( sys-libs/readline ) app-shells/bash >=app-misc/editor-wrapper-3 pam? ( >=sys-auth/pambase-20100310 ) virtual/mta >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/dcron
 SLOT=0
 SRC_URI=http://fcron.free.fr/archives/fcron-3.1.1.src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4408632abb9bd51da64f9fa14ea64020
diff --git a/metadata/md5-cache/sys-process/fcron-3.1.2 b/metadata/md5-cache/sys-process/fcron-3.1.2
index 53c4cab25aad..83fe34ec7f0b 100644
--- a/metadata/md5-cache/sys-process/fcron-3.1.2
+++ b/metadata/md5-cache/sys-process/fcron-3.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) pam? ( virtual/pam ) readline? ( sys-libs/readline ) app-shells/bash >=app-misc/editor-wrapper-3 pam? ( >=sys-auth/pambase-20100310 ) virtual/mta >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/dcron
 SLOT=0
 SRC_URI=http://fcron.free.fr/archives/fcron-3.1.2.src.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d34bf28781dd4415d51ca10b96937c24
diff --git a/metadata/md5-cache/sys-process/htop-1.0.1 b/metadata/md5-cache/sys-process/htop-1.0.1
index b408cd72d2a0..ae34be21b2fd 100644
--- a/metadata/md5-cache/sys-process/htop-1.0.1
+++ b/metadata/md5-cache/sys-process/htop-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare setup
-DEPEND=sys-libs/ncurses[unicode?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses[unicode?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=interactive process viewer
 EAPI=4
 HOMEPAGE=http://htop.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses[unicode?]
 SLOT=0
 SRC_URI=mirror://sourceforge/htop/htop-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=30bb67b389a053bd8a3fa8a20b57d206
diff --git a/metadata/md5-cache/sys-process/htop-1.0.1-r1 b/metadata/md5-cache/sys-process/htop-1.0.1-r1
index d35e31112731..94556db003a6 100644
--- a/metadata/md5-cache/sys-process/htop-1.0.1-r1
+++ b/metadata/md5-cache/sys-process/htop-1.0.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare setup
-DEPEND=sys-libs/ncurses[unicode?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses[unicode?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=interactive process viewer
 EAPI=4
 HOMEPAGE=http://htop.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses[unicode?]
 SLOT=0
 SRC_URI=mirror://sourceforge/htop/htop-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=1b12bd1270e06a1849e24110ecc8ddba
diff --git a/metadata/md5-cache/sys-process/htop-1.0.2 b/metadata/md5-cache/sys-process/htop-1.0.2
index 4e1e2396ce3c..b0f25b701849 100644
--- a/metadata/md5-cache/sys-process/htop-1.0.2
+++ b/metadata/md5-cache/sys-process/htop-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare setup
-DEPEND=sys-libs/ncurses[unicode?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses[unicode?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=interactive process viewer
 EAPI=4
 HOMEPAGE=http://htop.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses[unicode?]
 SLOT=0
 SRC_URI=mirror://sourceforge/htop/htop-1.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=5c37a51d44f524bf4273d73c871c440c
diff --git a/metadata/md5-cache/sys-process/time-1.7-r1 b/metadata/md5-cache/sys-process/time-1.7-r1
index d4c5aa6497ae..a47711cfda0f 100644
--- a/metadata/md5-cache/sys-process/time-1.7-r1
+++ b/metadata/md5-cache/sys-process/time-1.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=displays info about resources used by a program
 EAPI=4
 HOMEPAGE=http://www.gnu.org/directory/time.html
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/time/time-1.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0e58edc5516d83dc1e949602ea1b45eb
diff --git a/metadata/md5-cache/sys-process/unixtop-3.8_beta1-r1 b/metadata/md5-cache/sys-process/unixtop-3.8_beta1-r1
index 801814480537..8da9ae0edbd0 100644
--- a/metadata/md5-cache/sys-process/unixtop-3.8_beta1-r1
+++ b/metadata/md5-cache/sys-process/unixtop-3.8_beta1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=top for UNIX systems
 HOMEPAGE=http://unixtop.sourceforge.net/
 KEYWORDS=~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=mirror://sourceforge/unixtop/top-3.8beta1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=248891d95d525a54eb0d3d9b36bd1bb4
diff --git a/metadata/md5-cache/sys-process/unixtop-3.8_beta1-r2 b/metadata/md5-cache/sys-process/unixtop-3.8_beta1-r2
index 6c5b4c02d0ae..e10d1beae201 100644
--- a/metadata/md5-cache/sys-process/unixtop-3.8_beta1-r2
+++ b/metadata/md5-cache/sys-process/unixtop-3.8_beta1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=top for UNIX systems
 HOMEPAGE=http://unixtop.sourceforge.net/
 KEYWORDS=~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=mirror://sourceforge/unixtop/top-3.8beta1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3918fd8ecf0bea8214b5bc5486cf6452
diff --git a/metadata/md5-cache/sys-process/unixtop-3.8_beta1-r3 b/metadata/md5-cache/sys-process/unixtop-3.8_beta1-r3
index d57433f81a7b..8898baede2f1 100644
--- a/metadata/md5-cache/sys-process/unixtop-3.8_beta1-r3
+++ b/metadata/md5-cache/sys-process/unixtop-3.8_beta1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=top for UNIX systems
 HOMEPAGE=http://unixtop.sourceforge.net/
 KEYWORDS=~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=mirror://sourceforge/unixtop/top-3.8beta1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bd3d78a08689c188af1f2f38c193b800
diff --git a/metadata/md5-cache/www-apache/mod_auth_nufw-2.2.2 b/metadata/md5-cache/www-apache/mod_auth_nufw-2.2.2
index 98699f51e38a..97e459ed2660 100644
--- a/metadata/md5-cache/www-apache/mod_auth_nufw-2.2.2
+++ b/metadata/md5-cache/www-apache/mod_auth_nufw-2.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) =www-servers/apache-2.2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) =www-servers/apache-2.2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A NuFW authentication module for Apache.
 EAPI=2
 HOMEPAGE=http://software.inl.fr/trac/wiki/EdenWall/mod_auth_nufw
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) =www-servers/apache-2.2*
 SLOT=0
 SRC_URI=http://software.inl.fr/releases/mod_auth_nufw/mod_auth_nufw-2.2.2.tar.bz2
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c6bd7ad7b2c7515c5496969f8ecc7d28
diff --git a/metadata/md5-cache/www-apache/mod_caucho-4.0.13 b/metadata/md5-cache/www-apache/mod_caucho-4.0.13
index dbeb9d9abe07..bbd74ecda642 100644
--- a/metadata/md5-cache/www-apache/mod_caucho-4.0.13
+++ b/metadata/md5-cache/www-apache/mod_caucho-4.0.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=app-arch/unzip =www-servers/apache-2.2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip =www-servers/apache-2.2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=mod_caucho connects Resin and Apache2.
 EAPI=2
 HOMEPAGE=http://www.caucho.com/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==www-servers/apache-2.2*
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.13-src.zip mirror://gentoo/resin-gentoo-patches-4.0.13.tar.bz2
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e63f60a7b07cd87c10427f31492b801f
diff --git a/metadata/md5-cache/www-apache/mod_caucho-4.0.14 b/metadata/md5-cache/www-apache/mod_caucho-4.0.14
index 8dec974737d2..043360044b58 100644
--- a/metadata/md5-cache/www-apache/mod_caucho-4.0.14
+++ b/metadata/md5-cache/www-apache/mod_caucho-4.0.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=app-arch/unzip =www-servers/apache-2.2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip =www-servers/apache-2.2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=mod_caucho connects Resin and Apache2.
 EAPI=2
 HOMEPAGE=http://www.caucho.com/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==www-servers/apache-2.2*
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.14-src.zip mirror://gentoo/resin-gentoo-patches-4.0.14.tar.bz2
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9e3c5a1840c76077dd0255a7d76cb158
diff --git a/metadata/md5-cache/www-apache/mod_caucho-4.0.15 b/metadata/md5-cache/www-apache/mod_caucho-4.0.15
index 510a8203ee2a..2ce49f372c54 100644
--- a/metadata/md5-cache/www-apache/mod_caucho-4.0.15
+++ b/metadata/md5-cache/www-apache/mod_caucho-4.0.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=app-arch/unzip =www-servers/apache-2.2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip =www-servers/apache-2.2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=mod_caucho connects Resin and Apache2.
 EAPI=2
 HOMEPAGE=http://www.caucho.com/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==www-servers/apache-2.2*
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.15-src.zip mirror://gentoo/resin-gentoo-patches-4.0.15.tar.bz2
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f2c714465a4aa867079d6e6d57562f26
diff --git a/metadata/md5-cache/www-apache/mod_caucho-4.0.22 b/metadata/md5-cache/www-apache/mod_caucho-4.0.22
index 8ce7cd5ae00a..88bfc730d988 100644
--- a/metadata/md5-cache/www-apache/mod_caucho-4.0.22
+++ b/metadata/md5-cache/www-apache/mod_caucho-4.0.22
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=app-arch/unzip =www-servers/apache-2.2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip =www-servers/apache-2.2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=mod_caucho connects Resin and Apache2.
 EAPI=2
 HOMEPAGE=http://www.caucho.com/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==www-servers/apache-2.2*
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.22-src.zip mirror://gentoo/resin-gentoo-patches-4.0.22.tar.bz2
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4ce1d1331bc9df1a51d03814f56c8270
diff --git a/metadata/md5-cache/www-apache/mod_caucho-4.0.25 b/metadata/md5-cache/www-apache/mod_caucho-4.0.25
index 23dd82fb7e92..59fe9d240f7b 100644
--- a/metadata/md5-cache/www-apache/mod_caucho-4.0.25
+++ b/metadata/md5-cache/www-apache/mod_caucho-4.0.25
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=app-arch/unzip =www-servers/apache-2.2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip =www-servers/apache-2.2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=mod_caucho connects Resin and Apache2.
 EAPI=2
 HOMEPAGE=http://www.caucho.com/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==www-servers/apache-2.2*
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.25-src.zip mirror://gentoo/resin-gentoo-patches-4.0.25.tar.bz2
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7c26c233f40ba7f1c49a5c64105fe9bf
diff --git a/metadata/md5-cache/www-apache/mod_caucho-4.0.26 b/metadata/md5-cache/www-apache/mod_caucho-4.0.26
index ea4c6783a82c..1c6dc1565bab 100644
--- a/metadata/md5-cache/www-apache/mod_caucho-4.0.26
+++ b/metadata/md5-cache/www-apache/mod_caucho-4.0.26
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=app-arch/unzip =virtual/jre-1.6.0 =www-servers/apache-2.2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/unzip =virtual/jre-1.6.0 =www-servers/apache-2.2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=mod_caucho connects Resin and Apache2.
 EAPI=2
 HOMEPAGE=http://www.caucho.com/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==virtual/jre-1.6.0 =www-servers/apache-2.2*
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.26-src.zip mirror://gentoo/resin-gentoo-patches-4.0.26.tar.bz2
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e578cc4419968e2fbce35279fbeeb85c
diff --git a/metadata/md5-cache/www-apache/mod_gnutls-0.5.10-r1 b/metadata/md5-cache/www-apache/mod_gnutls-0.5.10-r1
index f7a26ea22528..3a1e075e90f4 100644
--- a/metadata/md5-cache/www-apache/mod_gnutls-0.5.10-r1
+++ b/metadata/md5-cache/www-apache/mod_gnutls-0.5.10-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=net-libs/gnutls-2.10.0:= =www-servers/apache-2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-libs/gnutls-2.10.0:= =www-servers/apache-2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=mod_gnutls uses GnuTLS to provide SSL/TLS encryption for Apache2, similarly to mod_ssl
 EAPI=5
 HOMEPAGE=http://www.outoforder.cc/projects/apache/mod_gnutls/
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=net-libs/gnutls-2.10.0:= =www-servers/apache-2*
 SLOT=0
 SRC_URI=http://www.outoforder.cc/downloads/mod_gnutls/mod_gnutls-0.5.10.tar.bz2
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4f80439d28910f3bae02959c006258bc
diff --git a/metadata/md5-cache/www-apache/mod_nss-1.0.8-r1 b/metadata/md5-cache/www-apache/mod_nss-1.0.8-r1
index fd7d9caf0d60..9a16a83dd954 100644
--- a/metadata/md5-cache/www-apache/mod_nss-1.0.8-r1
+++ b/metadata/md5-cache/www-apache/mod_nss-1.0.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.6.4 virtual/pkgconfig sys-apps/sed =www-servers/apache-2.2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.6.4 virtual/pkgconfig sys-apps/sed =www-servers/apache-2.2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=SSL/TLS module for the Apache HTTP server
 EAPI=2
 HOMEPAGE=http://directory.fedoraproject.org/wiki/Mod_nss
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.6.4 net-dns/bind-tools =www-servers/apache-2.2*
 SLOT=0
 SRC_URI=http://directory.fedoraproject.org/sources/mod_nss-1.0.8.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=118af2657a341fc098252ea33ab2f4eb
diff --git a/metadata/md5-cache/www-apache/mod_python-3.3.1-r1 b/metadata/md5-cache/www-apache/mod_python-3.3.1-r1
index b37aa52e3c15..b153a61e704e 100644
--- a/metadata/md5-cache/www-apache/mod_python-3.3.1-r1
+++ b/metadata/md5-cache/www-apache/mod_python-3.3.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND==www-servers/apache-2.2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DEPEND==www-servers/apache-2.2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 DESCRIPTION=An Apache2 module providing an embedded Python interpreter.
 EAPI=3
 HOMEPAGE=http://www.modpython.org/
@@ -9,5 +9,5 @@ RDEPEND==www-servers/apache-2.2* =dev-lang/python-2*
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/modpython/mod_python-3.3.1.tgz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bc913a8ae2cd342dac4a2407e1e82276
diff --git a/metadata/md5-cache/www-apps/389-dsgw-1.1.10 b/metadata/md5-cache/www-apps/389-dsgw-1.1.10
index c1c559530b3d..94cbc80b3061 100644
--- a/metadata/md5-cache/www-apps/389-dsgw-1.1.10
+++ b/metadata/md5-cache/www-apps/389-dsgw-1.1.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/icu dev-libs/389-adminutil net-nds/openldap || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/icu dev-libs/389-adminutil net-nds/openldap || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=389 Directory Server Gateway Web Application
 EAPI=5
 HOMEPAGE=http://port389.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/icu dev-libs/389-adminutil net-nds/openldap dev-perl/perl-mozldap virtual/perl-CGI
 SLOT=0
 SRC_URI=http://directory.fedoraproject.org/sources/389-dsgw-1.1.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9ea330ddd2c374f593e239ba60b63568
diff --git a/metadata/md5-cache/www-apps/gallery-3.0.7 b/metadata/md5-cache/www-apps/gallery-3.0.7
new file mode 100644
index 000000000000..518c22587ef0
--- /dev/null
+++ b/metadata/md5-cache/www-apps/gallery-3.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=app-arch/unzip >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Web based (PHP Script) photo album viewer/creator
+EAPI=5
+HOMEPAGE=http://gallery.menalto.com/
+IUSE=ffmpeg +gd imagemagick mysql mysqli vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) ffmpeg? ( virtual/ffmpeg ) >=dev-lang/php-5.2.3[ctype,filter,iconv,json,simplexml,tokenizer,unicode,gd?,mysql?,mysqli?] virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( gd imagemagick ) || ( mysql mysqli )
+SLOT=3.0.7
+SRC_URI=mirror://sourceforge/gallery/gallery/gallery-3.0.7.zip
+_eclasses_=webapp	25b9b1696f5e698711f47d45c3d45e3e
+_md5_=36f6ecd6988158d57d16c36264e0eabe
diff --git a/metadata/md5-cache/www-client/chromium-28.0.1485.0 b/metadata/md5-cache/www-client/chromium-28.0.1485.0
new file mode 100644
index 000000000000..d611524d6c6a
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-28.0.1485.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= system-sqlite? ( dev-db/sqlite:3 ) cups? ( dev-libs/libgcrypt:= >=net-print/cups-1.3.11:= ) >=dev-lang/v8-3.17.6:= =dev-lang/v8-3.18* >=dev-libs/elfutils-0.149 dev-libs/expat:= >=dev-libs/icu-49.1.1-r1:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.12.3:= dev-libs/protobuf:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= ) gps? ( >=sci-geosciences/gpsd-3.7:=[shm] ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/harfbuzz:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= media-libs/libvpx:= >=media-libs/libwebp-0.2.0_rc1:= !arm? ( !x86? ( >=media-libs/mesa-9.1:=[gles2] ) ) media-libs/opus:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-1.0:=[opus] ) sys-apps/dbus:= sys-apps/pciutils:= sys-libs/zlib:=[minizip] virtual/udev virtual/libusb:1= x11-libs/gtk+:2= x11-libs/libXinerama:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux:= ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) !arm? ( >=dev-lang/nacl-toolchain-newlib-0_p9093 dev-lang/yasm ) dev-lang/perl dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 sys-apps/hwids >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=5
+HOMEPAGE=http://chromium.org/
+IUSE=bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux +system-ffmpeg system-sqlite tcmalloc custom-cflags +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_ms +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
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= system-sqlite? ( dev-db/sqlite:3 ) cups? ( dev-libs/libgcrypt:= >=net-print/cups-1.3.11:= ) >=dev-lang/v8-3.17.6:= =dev-lang/v8-3.18* >=dev-libs/elfutils-0.149 dev-libs/expat:= >=dev-libs/icu-49.1.1-r1:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.12.3:= dev-libs/protobuf:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= ) gps? ( >=sci-geosciences/gpsd-3.7:=[shm] ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/harfbuzz:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= media-libs/libvpx:= >=media-libs/libwebp-0.2.0_rc1:= !arm? ( !x86? ( >=media-libs/mesa-9.1:=[gles2] ) ) media-libs/opus:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-1.0:=[opus] ) sys-apps/dbus:= sys-apps/pciutils:= sys-libs/zlib:=[minizip] virtual/udev virtual/libusb:1= x11-libs/gtk+:2= x11-libs/libXinerama:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux:= ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1485.0-lite.tar.xz test? ( https://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1485.0-testdata.tar.xz )
+_eclasses_=chromium	10deb47dfb7657ba0fc7814da0bad35e	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	d727728a240d5f59bf9370a64259fd61	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=d6ebce482473c58cc0a5173b82c8a02a
diff --git a/metadata/md5-cache/www-client/chromium-9999-r1 b/metadata/md5-cache/www-client/chromium-9999-r1
index 92e9e76de571..52e00710dc34 100644
--- a/metadata/md5-cache/www-client/chromium-9999-r1
+++ b/metadata/md5-cache/www-client/chromium-9999-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= system-sqlite? ( dev-db/sqlite:3 ) cups? ( dev-libs/libgcrypt:= >=net-print/cups-1.3.11:= ) >=dev-lang/v8-3.17.6:= >=dev-libs/elfutils-0.149 dev-libs/expat:= >=dev-libs/icu-49.1.1-r1:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.12.3:= dev-libs/protobuf:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= ) gps? ( >=sci-geosciences/gpsd-3.7:=[shm] ) >=media-libs/alsa-lib-1.0.19 media-libs/flac:= media-libs/harfbuzz:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= media-libs/libvpx:= >=media-libs/libwebp-0.2.0_rc1:= !arm? ( !x86? ( >=media-libs/mesa-9.1:=[gles2] ) ) media-libs/opus:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-1.0:=[opus] ) sys-apps/dbus:= sys-apps/pciutils:= sys-libs/zlib:=[minizip] virtual/udev virtual/libusb:1= x11-libs/gtk+:2= x11-libs/libXinerama:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux:= ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) !arm? ( >=dev-lang/nacl-toolchain-newlib-0_p9093 dev-lang/yasm ) dev-lang/perl dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 sys-apps/hwids >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= system-sqlite? ( dev-db/sqlite:3 ) cups? ( dev-libs/libgcrypt:= >=net-print/cups-1.3.11:= ) >=dev-lang/v8-3.17.6:= =dev-lang/v8-3.18* >=dev-libs/elfutils-0.149 dev-libs/expat:= >=dev-libs/icu-49.1.1-r1:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.12.3:= dev-libs/protobuf:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= ) gps? ( >=sci-geosciences/gpsd-3.7:=[shm] ) >=media-libs/alsa-lib-1.0.19 media-libs/flac:= media-libs/harfbuzz:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= media-libs/libvpx:= >=media-libs/libwebp-0.2.0_rc1:= !arm? ( !x86? ( >=media-libs/mesa-9.1:=[gles2] ) ) media-libs/opus:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-1.0:=[opus] ) sys-apps/dbus:= sys-apps/pciutils:= sys-libs/zlib:=[minizip] virtual/udev virtual/libusb:1= x11-libs/gtk+:2= x11-libs/libXinerama:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux:= ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) !arm? ( >=dev-lang/nacl-toolchain-newlib-0_p9093 dev-lang/yasm ) dev-lang/perl dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 sys-apps/hwids >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=5
 HOMEPAGE=http://chromium.org/
 IUSE=bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux +system-ffmpeg system-sqlite tcmalloc custom-cflags +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_ms +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
 LICENSE=BSD
-RDEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= system-sqlite? ( dev-db/sqlite:3 ) cups? ( dev-libs/libgcrypt:= >=net-print/cups-1.3.11:= ) >=dev-lang/v8-3.17.6:= >=dev-libs/elfutils-0.149 dev-libs/expat:= >=dev-libs/icu-49.1.1-r1:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.12.3:= dev-libs/protobuf:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= ) gps? ( >=sci-geosciences/gpsd-3.7:=[shm] ) >=media-libs/alsa-lib-1.0.19 media-libs/flac:= media-libs/harfbuzz:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= media-libs/libvpx:= >=media-libs/libwebp-0.2.0_rc1:= !arm? ( !x86? ( >=media-libs/mesa-9.1:=[gles2] ) ) media-libs/opus:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-1.0:=[opus] ) sys-apps/dbus:= sys-apps/pciutils:= sys-libs/zlib:=[minizip] virtual/udev virtual/libusb:1= x11-libs/gtk+:2= x11-libs/libXinerama:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux:= ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts
+RDEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= system-sqlite? ( dev-db/sqlite:3 ) cups? ( dev-libs/libgcrypt:= >=net-print/cups-1.3.11:= ) >=dev-lang/v8-3.17.6:= =dev-lang/v8-3.18* >=dev-libs/elfutils-0.149 dev-libs/expat:= >=dev-libs/icu-49.1.1-r1:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.12.3:= dev-libs/protobuf:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= ) gps? ( >=sci-geosciences/gpsd-3.7:=[shm] ) >=media-libs/alsa-lib-1.0.19 media-libs/flac:= media-libs/harfbuzz:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= media-libs/libvpx:= >=media-libs/libwebp-0.2.0_rc1:= !arm? ( !x86? ( >=media-libs/mesa-9.1:=[gles2] ) ) media-libs/opus:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-1.0:=[opus] ) sys-apps/dbus:= sys-apps/pciutils:= sys-libs/zlib:=[minizip] virtual/udev virtual/libusb:1= x11-libs/gtk+:2= x11-libs/libXinerama:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux:= ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts
 SLOT=live
 _eclasses_=chromium	10deb47dfb7657ba0fc7814da0bad35e	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	d727728a240d5f59bf9370a64259fd61	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=599eb5b1096c228896c924d7132308fd
+_md5_=65ca56791e1fd45f99e06c0a43634e2f
diff --git a/metadata/md5-cache/www-client/elinks-0.11.7 b/metadata/md5-cache/www-client/elinks-0.11.7
index 42e21ad85d73..3ef4e3e9ded5 100644
--- a/metadata/md5-cache/www-client/elinks-0.11.7
+++ b/metadata/md5-cache/www-client/elinks-0.11.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Advanced and well-established text-mode web browser
 EAPI=2
 HOMEPAGE=http://elinks.or.cz/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/expat-1.95.4 bzip2? ( >=app-arch/bzip2-1.0.2 ) ssl? ( >=dev-l
 RESTRICT=test
 SLOT=0
 SRC_URI=http://elinks.or.cz/download/elinks-0.11.7.tar.bz2 http://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b4b1e0845249fc81e00eb07957406e47
diff --git a/metadata/md5-cache/www-client/elinks-0.12_pre5-r2 b/metadata/md5-cache/www-client/elinks-0.12_pre5-r2
index 93ac279e7980..cd38ebe1add2 100644
--- a/metadata/md5-cache/www-client/elinks-0.12_pre5-r2
+++ b/metadata/md5-cache/www-client/elinks-0.12_pre5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Advanced and well-established text-mode web browser
 EAPI=4
 HOMEPAGE=http://elinks.or.cz/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boehm-gc >=dev-libs/expat-1.95.4 bzip2? ( >=app-arch/bzip2-1.0.
 RESTRICT=test
 SLOT=0
 SRC_URI=http://elinks.or.cz/download/elinks-0.12pre5.tar.bz2 http://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2 http://dev.gentoo.org/~axs/distfiles/elinks-0.12_pre5-js185-patches.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cefa79087c16d8f7da6c5b8644db92c0
diff --git a/metadata/md5-cache/www-client/epiphany-2.30.6-r1 b/metadata/md5-cache/www-client/epiphany-2.30.6-r1
index 6f7ecfa76fe9..bb0c1944b022 100644
--- a/metadata/md5-cache/www-client/epiphany-2.30.6-r1
+++ b/metadata/md5-cache/www-client/epiphany-2.30.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 virtual/pkgconfig >=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNOME webbrowser based on Webkit
 EAPI=3
 HOMEPAGE=http://projects.gnome.org/epiphany/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/epiphany/2.30/epiphany-2.30.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=16ecd848b84115486f14185662e52964
diff --git a/metadata/md5-cache/www-client/epiphany-3.6.1 b/metadata/md5-cache/www-client/epiphany-3.6.1
index f7d8a1b8a0a3..1c775d199df3 100644
--- a/metadata/md5-cache/www-client/epiphany-3.6.1
+++ b/metadata/md5-cache/www-client/epiphany-3.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=app-crypt/gcr-3.5.5 >=app-text/iso-codes-0.35 >=dev-libs/glib-2.31.2:2 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 >=gnome-base/gnome-keyring-2.26.0 >=gnome-base/gsettings-desktop-schemas-0.0.1 >=net-dns/avahi-0.6.22[dbus] >=net-libs/webkit-gtk-1.9.6:3[jit?,introspection?] >=net-libs/libsoup-gnome-2.39.6:2.4 >=x11-libs/gtk+-3.5.2:3[introspection?] >=x11-libs/libnotify-0.5.1:= gnome-base/gnome-desktop:3= dev-db/sqlite:3 x11-libs/libX11 x11-themes/gnome-icon-theme x11-themes/gnome-icon-theme-symbolic introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) nss? ( dev-libs/nss ) introspection? ( jit? ( >=gnome-base/gnome-common-3.5.5 ) ) >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.50 sys-apps/paxctl sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=app-crypt/gcr-3.5.5 >=app-text/iso-codes-0.35 >=dev-libs/glib-2.31.2:2 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 >=gnome-base/gnome-keyring-2.26.0 >=gnome-base/gsettings-desktop-schemas-0.0.1 >=net-dns/avahi-0.6.22[dbus] >=net-libs/webkit-gtk-1.9.6:3[jit?,introspection?] >=net-libs/libsoup-gnome-2.39.6:2.4 >=x11-libs/gtk+-3.5.2:3[introspection?] >=x11-libs/libnotify-0.5.1:= gnome-base/gnome-desktop:3= dev-db/sqlite:3 x11-libs/libX11 x11-themes/gnome-icon-theme x11-themes/gnome-icon-theme-symbolic introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) nss? ( dev-libs/nss ) introspection? ( jit? ( >=gnome-base/gnome-common-3.5.5 ) ) >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.50 sys-apps/paxctl sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GNOME webbrowser based on Webkit
 EAPI=5
 HOMEPAGE=http://projects.gnome.org/epiphany/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-crypt/gcr-3.5.5 >=app-text/iso-codes-0.35 >=dev-libs/glib-2.31.2:2 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 >=gnome-base/gnome-keyring-2.26.0 >=gnome-base/gsettings-desktop-schemas-0.0.1 >=net-dns/avahi-0.6.22[dbus] >=net-libs/webkit-gtk-1.9.6:3[jit?,introspection?] >=net-libs/libsoup-gnome-2.39.6:2.4 >=x11-libs/gtk+-3.5.2:3[introspection?] >=x11-libs/libnotify-0.5.1:= gnome-base/gnome-desktop:3= dev-db/sqlite:3 x11-libs/libX11 x11-themes/gnome-icon-theme x11-themes/gnome-icon-theme-symbolic introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) nss? ( dev-libs/nss )
 SLOT=0
 SRC_URI=mirror://gnome/sources/epiphany/3.6/epiphany-3.6.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=1979c8c4ef18b7830503554c95f4d580
diff --git a/metadata/md5-cache/www-client/epiphany-extensions-3.6.0 b/metadata/md5-cache/www-client/epiphany-extensions-3.6.0
index bd9cd33c0616..150a3b84ff8f 100644
--- a/metadata/md5-cache/www-client/epiphany-extensions-3.6.0
+++ b/metadata/md5-cache/www-client/epiphany-extensions-3.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=www-client/epiphany-3.6 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 ) >=app-text/gnome-doc-utils-0.3.2 >=dev-util/intltool-0.40 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=www-client/epiphany-3.6 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 ) >=app-text/gnome-doc-utils-0.3.2 >=dev-util/intltool-0.40 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Extensions for the Epiphany web browser
 EAPI=5
 HOMEPAGE=http://www.gnome.org/projects/epiphany/extensions.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=www-client/epiphany-3.6 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 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/epiphany-extensions/3.6/epiphany-extensions-3.6.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6a3cd4a506e437f416099f5b2efef89b
diff --git a/metadata/md5-cache/www-client/firefox-10.0.11 b/metadata/md5-cache/www-client/firefox-10.0.11
index 4055af6144e6..d0c4b21d7a4d 100644
--- a/metadata/md5-cache/www-client/firefox-10.0.11
+++ b/metadata/md5-cache/www-client/firefox-10.0.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.6 >=dev-libs/nspr-4.9.2 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.9[apng] virtual/libffi system-sqlite? ( || ( >=dev-db/sqlite-3.7.16:3[secure-delete,debug=] <dev-db/sqlite-3.7.16:3[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) selinux? ( sec-policy/selinux-mozilla ) virtual/pkgconfig pgo? ( >=sys-devel/gcc-4.5 ) webm? ( virtual/opengl x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt >=sys-libs/zlib-1.1.4 virtual/pkgconfig || ( dev-lang/python:2.7[threads,sqlite] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=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 alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme 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.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
+DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.6 >=dev-libs/nspr-4.9.2 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.9[apng] virtual/libffi system-sqlite? ( || ( >=dev-db/sqlite-3.7.16:3[secure-delete,debug=] <dev-db/sqlite-3.7.16:3[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) selinux? ( sec-policy/selinux-mozilla ) virtual/pkgconfig pgo? ( >=sys-devel/gcc-4.5 ) webm? ( virtual/opengl x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt >=sys-libs/zlib-1.1.4 virtual/pkgconfig || ( dev-lang/python:2.7[threads,sqlite] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=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 alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
 DESCRIPTION=Firefox Web Browser
 EAPI=3
 HOMEPAGE=http://www.mozilla.com/firefox
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1 GPL-2 LGPL-2.1
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.6 >=dev-libs/nspr-4.9.2 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.9[apng] virtual/libffi system-sqlite? ( || ( >=dev-db/sqlite-3.7.16:3[secure-delete,debug=] <dev-db/sqlite-3.7.16:3[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=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 alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme 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 )
 SLOT=0
 SRC_URI=linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/af.xpi -> firefox-10.0.11esr-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/ak.xpi -> firefox-10.0.11esr-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/ar.xpi -> firefox-10.0.11esr-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/as.xpi -> firefox-10.0.11esr-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/ast.xpi -> firefox-10.0.11esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/be.xpi -> firefox-10.0.11esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/bg.xpi -> firefox-10.0.11esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/bn-BD.xpi -> firefox-10.0.11esr-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/bn-IN.xpi -> firefox-10.0.11esr-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/br.xpi -> firefox-10.0.11esr-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/bs.xpi -> firefox-10.0.11esr-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/ca.xpi -> firefox-10.0.11esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/cs.xpi -> firefox-10.0.11esr-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/csb.xpi -> firefox-10.0.11esr-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/cy.xpi -> firefox-10.0.11esr-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/da.xpi -> firefox-10.0.11esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/de.xpi -> firefox-10.0.11esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/el.xpi -> firefox-10.0.11esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/en-GB.xpi -> firefox-10.0.11esr-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/en-ZA.xpi -> firefox-10.0.11esr-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/eo.xpi -> firefox-10.0.11esr-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/es-AR.xpi -> firefox-10.0.11esr-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/es-CL.xpi -> firefox-10.0.11esr-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/es-ES.xpi -> firefox-10.0.11esr-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/es-MX.xpi -> firefox-10.0.11esr-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/et.xpi -> firefox-10.0.11esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/eu.xpi -> firefox-10.0.11esr-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/fa.xpi -> firefox-10.0.11esr-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/fi.xpi -> firefox-10.0.11esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/fr.xpi -> firefox-10.0.11esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/fy-NL.xpi -> firefox-10.0.11esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/ga-IE.xpi -> firefox-10.0.11esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/gd.xpi -> firefox-10.0.11esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/gl.xpi -> firefox-10.0.11esr-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/gu-IN.xpi -> firefox-10.0.11esr-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/he.xpi -> firefox-10.0.11esr-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/hi-IN.xpi -> firefox-10.0.11esr-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/hr.xpi -> firefox-10.0.11esr-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/hu.xpi -> firefox-10.0.11esr-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/hy-AM.xpi -> firefox-10.0.11esr-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/id.xpi -> firefox-10.0.11esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/is.xpi -> firefox-10.0.11esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/it.xpi -> firefox-10.0.11esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/ja.xpi -> firefox-10.0.11esr-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/kk.xpi -> firefox-10.0.11esr-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/kn.xpi -> firefox-10.0.11esr-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/ko.xpi -> firefox-10.0.11esr-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/ku.xpi -> firefox-10.0.11esr-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/lg.xpi -> firefox-10.0.11esr-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/lt.xpi -> firefox-10.0.11esr-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/lv.xpi -> firefox-10.0.11esr-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/mai.xpi -> firefox-10.0.11esr-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/mk.xpi -> firefox-10.0.11esr-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/ml.xpi -> firefox-10.0.11esr-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/mr.xpi -> firefox-10.0.11esr-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/nb-NO.xpi -> firefox-10.0.11esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/nl.xpi -> firefox-10.0.11esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/nn-NO.xpi -> firefox-10.0.11esr-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/nso.xpi -> firefox-10.0.11esr-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/or.xpi -> firefox-10.0.11esr-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/pa-IN.xpi -> firefox-10.0.11esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/pl.xpi -> firefox-10.0.11esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/pt-BR.xpi -> firefox-10.0.11esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/pt-PT.xpi -> firefox-10.0.11esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/rm.xpi -> firefox-10.0.11esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/ro.xpi -> firefox-10.0.11esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/ru.xpi -> firefox-10.0.11esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/si.xpi -> firefox-10.0.11esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/sk.xpi -> firefox-10.0.11esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/sl.xpi -> firefox-10.0.11esr-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/son.xpi -> firefox-10.0.11esr-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/sq.xpi -> firefox-10.0.11esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/sr.xpi -> firefox-10.0.11esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/sv-SE.xpi -> firefox-10.0.11esr-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/ta.xpi -> firefox-10.0.11esr-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/ta-LK.xpi -> firefox-10.0.11esr-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/te.xpi -> firefox-10.0.11esr-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/th.xpi -> firefox-10.0.11esr-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/tr.xpi -> firefox-10.0.11esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/uk.xpi -> firefox-10.0.11esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/vi.xpi -> firefox-10.0.11esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/zh-CN.xpi -> firefox-10.0.11esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/zh-TW.xpi -> firefox-10.0.11esr-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/linux-i686/xpi/zu.xpi -> firefox-10.0.11esr-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.9.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//10.0.11esr/source/firefox-10.0.11esr.source.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mozconfig-3	e4ad1852082c7cd6fef51893c4d16af2	mozcoreconf-2	1e308a59d2f982d7c2f79b68e67a0a4f	mozextension	08e43f98cbab4b43f95660c74a831df7	mozlinguas	4fccc675305cf2d1e23c1a05f47b9b2a	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	pax-utils	d727728a240d5f59bf9370a64259fd61	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mozconfig-3	e4ad1852082c7cd6fef51893c4d16af2	mozcoreconf-2	1e308a59d2f982d7c2f79b68e67a0a4f	mozextension	08e43f98cbab4b43f95660c74a831df7	mozlinguas	4fccc675305cf2d1e23c1a05f47b9b2a	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	pax-utils	d727728a240d5f59bf9370a64259fd61	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=d044d0d0b4f48afaec1164bca1d556ca
diff --git a/metadata/md5-cache/www-client/firefox-17.0.5 b/metadata/md5-cache/www-client/firefox-17.0.5
index 6df675d5c564..d07c0921966a 100644
--- a/metadata/md5-cache/www-client/firefox-17.0.5
+++ b/metadata/md5-cache/www-client/firefox-17.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.14.1 >=dev-libs/nspr-4.9.4 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.11[apng] virtual/libffi gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] ) system-sqlite? ( || ( >=dev-db/sqlite-3.7.16:3[secure-delete,debug=] =dev-db/sqlite-3.7.15*[fts3,secure-delete,threadsafe,unlock-notify,debug=] =dev-db/sqlite-3.7.14*[fts3,secure-delete,threadsafe,unlock-notify,debug=] =dev-db/sqlite-3.7.13*[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) ) >=media-libs/libvpx-1.0.0 kernel_linux? ( media-libs/alsa-lib ) selinux? ( sec-policy/selinux-mozilla ) virtual/pkgconfig pgo? ( >=sys-devel/gcc-4.5 ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt >=sys-libs/zlib-1.1.4 virtual/pkgconfig || ( dev-lang/python:2.7[threads,sqlite] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=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 alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme 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.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
+DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.14.1 >=dev-libs/nspr-4.9.4 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.11[apng] virtual/libffi gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] ) system-sqlite? ( || ( >=dev-db/sqlite-3.7.16:3[secure-delete,debug=] =dev-db/sqlite-3.7.15*[fts3,secure-delete,threadsafe,unlock-notify,debug=] =dev-db/sqlite-3.7.14*[fts3,secure-delete,threadsafe,unlock-notify,debug=] =dev-db/sqlite-3.7.13*[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) ) >=media-libs/libvpx-1.0.0 kernel_linux? ( media-libs/alsa-lib ) selinux? ( sec-policy/selinux-mozilla ) virtual/pkgconfig pgo? ( >=sys-devel/gcc-4.5 ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt >=sys-libs/zlib-1.1.4 virtual/pkgconfig || ( dev-lang/python:2.7[threads,sqlite] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=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 alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
 DESCRIPTION=Firefox Web Browser
 EAPI=3
 HOMEPAGE=http://www.mozilla.com/firefox
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.14.1 >=dev-libs/nspr-4.9.4 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.11[apng] virtual/libffi gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] ) system-sqlite? ( || ( >=dev-db/sqlite-3.7.16:3[secure-delete,debug=] =dev-db/sqlite-3.7.15*[fts3,secure-delete,threadsafe,unlock-notify,debug=] =dev-db/sqlite-3.7.14*[fts3,secure-delete,threadsafe,unlock-notify,debug=] =dev-db/sqlite-3.7.13*[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) ) >=media-libs/libvpx-1.0.0 kernel_linux? ( media-libs/alsa-lib ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=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 alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme 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 )
 SLOT=0
 SRC_URI=linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/af.xpi -> firefox-17.0.5esr-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/ak.xpi -> firefox-17.0.5esr-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/ar.xpi -> firefox-17.0.5esr-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/as.xpi -> firefox-17.0.5esr-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/ast.xpi -> firefox-17.0.5esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/be.xpi -> firefox-17.0.5esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/bg.xpi -> firefox-17.0.5esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/bn-BD.xpi -> firefox-17.0.5esr-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/bn-IN.xpi -> firefox-17.0.5esr-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/br.xpi -> firefox-17.0.5esr-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/bs.xpi -> firefox-17.0.5esr-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/ca.xpi -> firefox-17.0.5esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/cs.xpi -> firefox-17.0.5esr-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/csb.xpi -> firefox-17.0.5esr-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/cy.xpi -> firefox-17.0.5esr-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/da.xpi -> firefox-17.0.5esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/de.xpi -> firefox-17.0.5esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/el.xpi -> firefox-17.0.5esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/en-GB.xpi -> firefox-17.0.5esr-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/en-ZA.xpi -> firefox-17.0.5esr-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/eo.xpi -> firefox-17.0.5esr-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/es-AR.xpi -> firefox-17.0.5esr-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/es-CL.xpi -> firefox-17.0.5esr-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/es-ES.xpi -> firefox-17.0.5esr-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/es-MX.xpi -> firefox-17.0.5esr-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/et.xpi -> firefox-17.0.5esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/eu.xpi -> firefox-17.0.5esr-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/fa.xpi -> firefox-17.0.5esr-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/fi.xpi -> firefox-17.0.5esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/fr.xpi -> firefox-17.0.5esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/fy-NL.xpi -> firefox-17.0.5esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/ga-IE.xpi -> firefox-17.0.5esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/gd.xpi -> firefox-17.0.5esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/gl.xpi -> firefox-17.0.5esr-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/gu-IN.xpi -> firefox-17.0.5esr-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/he.xpi -> firefox-17.0.5esr-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/hi-IN.xpi -> firefox-17.0.5esr-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/hr.xpi -> firefox-17.0.5esr-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/hu.xpi -> firefox-17.0.5esr-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/hy-AM.xpi -> firefox-17.0.5esr-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/id.xpi -> firefox-17.0.5esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/is.xpi -> firefox-17.0.5esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/it.xpi -> firefox-17.0.5esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/ja.xpi -> firefox-17.0.5esr-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/kk.xpi -> firefox-17.0.5esr-kk.xpi ) linguas_km? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/km.xpi -> firefox-17.0.5esr-km.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/kn.xpi -> firefox-17.0.5esr-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/ko.xpi -> firefox-17.0.5esr-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/ku.xpi -> firefox-17.0.5esr-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/lg.xpi -> firefox-17.0.5esr-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/lt.xpi -> firefox-17.0.5esr-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/lv.xpi -> firefox-17.0.5esr-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/mai.xpi -> firefox-17.0.5esr-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/mk.xpi -> firefox-17.0.5esr-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/ml.xpi -> firefox-17.0.5esr-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/mr.xpi -> firefox-17.0.5esr-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/nb-NO.xpi -> firefox-17.0.5esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/nl.xpi -> firefox-17.0.5esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/nn-NO.xpi -> firefox-17.0.5esr-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/nso.xpi -> firefox-17.0.5esr-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/or.xpi -> firefox-17.0.5esr-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/pa-IN.xpi -> firefox-17.0.5esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/pl.xpi -> firefox-17.0.5esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/pt-BR.xpi -> firefox-17.0.5esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/pt-PT.xpi -> firefox-17.0.5esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/rm.xpi -> firefox-17.0.5esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/ro.xpi -> firefox-17.0.5esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/ru.xpi -> firefox-17.0.5esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/si.xpi -> firefox-17.0.5esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/sk.xpi -> firefox-17.0.5esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/sl.xpi -> firefox-17.0.5esr-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/son.xpi -> firefox-17.0.5esr-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/sq.xpi -> firefox-17.0.5esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/sr.xpi -> firefox-17.0.5esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/sv-SE.xpi -> firefox-17.0.5esr-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/ta.xpi -> firefox-17.0.5esr-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/ta-LK.xpi -> firefox-17.0.5esr-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/te.xpi -> firefox-17.0.5esr-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/th.xpi -> firefox-17.0.5esr-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/tr.xpi -> firefox-17.0.5esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/uk.xpi -> firefox-17.0.5esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/vi.xpi -> firefox-17.0.5esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/zh-CN.xpi -> firefox-17.0.5esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/zh-TW.xpi -> firefox-17.0.5esr-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/linux-i686/xpi/zu.xpi -> firefox-17.0.5esr-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-17.0-patches-0.5.tar.xz http://dev.gentoo.org/~nirbheek/mozilla/patchsets/firefox-17.0-patches-0.5.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//17.0.5esr/source/firefox-17.0.5esr.source.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mozconfig-3	e4ad1852082c7cd6fef51893c4d16af2	mozcoreconf-2	1e308a59d2f982d7c2f79b68e67a0a4f	mozextension	08e43f98cbab4b43f95660c74a831df7	mozlinguas	4fccc675305cf2d1e23c1a05f47b9b2a	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	pax-utils	d727728a240d5f59bf9370a64259fd61	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mozconfig-3	e4ad1852082c7cd6fef51893c4d16af2	mozcoreconf-2	1e308a59d2f982d7c2f79b68e67a0a4f	mozextension	08e43f98cbab4b43f95660c74a831df7	mozlinguas	4fccc675305cf2d1e23c1a05f47b9b2a	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	pax-utils	d727728a240d5f59bf9370a64259fd61	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=555a5a27b758bf5a88d617e37f243f95
diff --git a/metadata/md5-cache/www-client/firefox-20.0.1 b/metadata/md5-cache/www-client/firefox-20.0.1
index a9a4da2635ae..20d18a20cacc 100644
--- a/metadata/md5-cache/www-client/firefox-20.0.1
+++ b/metadata/md5-cache/www-client/firefox-20.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.14.3 >=dev-libs/nspr-4.9.5 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.13[apng] virtual/libffi gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-sqlite? ( || ( >=dev-db/sqlite-3.7.16:3[secure-delete,debug=] ~dev-db/sqlite-3.7.15.2[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) ) >=media-libs/libvpx-1.0.0 kernel_linux? ( media-libs/alsa-lib ) selinux? ( sec-policy/selinux-mozilla ) virtual/pkgconfig pgo? ( >=sys-devel/gcc-4.5 ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt >=sys-libs/zlib-1.1.4 virtual/pkgconfig || ( dev-lang/python:2.7[threads,sqlite] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=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 alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme 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.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
+DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.14.3 >=dev-libs/nspr-4.9.5 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.13[apng] virtual/libffi gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-sqlite? ( || ( >=dev-db/sqlite-3.7.16:3[secure-delete,debug=] ~dev-db/sqlite-3.7.15.2[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) ) >=media-libs/libvpx-1.0.0 kernel_linux? ( media-libs/alsa-lib ) selinux? ( sec-policy/selinux-mozilla ) virtual/pkgconfig pgo? ( >=sys-devel/gcc-4.5 ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt >=sys-libs/zlib-1.1.4 virtual/pkgconfig || ( dev-lang/python:2.7[threads,sqlite] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=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 alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
 DESCRIPTION=Firefox Web Browser
 EAPI=3
 HOMEPAGE=http://www.mozilla.com/firefox
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.14.3 >=dev-libs/nspr-4.9.5 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.13[apng] virtual/libffi gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-sqlite? ( || ( >=dev-db/sqlite-3.7.16:3[secure-delete,debug=] ~dev-db/sqlite-3.7.15.2[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) ) >=media-libs/libvpx-1.0.0 kernel_linux? ( media-libs/alsa-lib ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=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 alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme 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 )
 SLOT=0
 SRC_URI=linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/af.xpi -> firefox-20.0.1-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/ak.xpi -> firefox-20.0.1-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/ar.xpi -> firefox-20.0.1-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/as.xpi -> firefox-20.0.1-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/ast.xpi -> firefox-20.0.1-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/be.xpi -> firefox-20.0.1-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/bg.xpi -> firefox-20.0.1-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/bn-BD.xpi -> firefox-20.0.1-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/bn-IN.xpi -> firefox-20.0.1-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/br.xpi -> firefox-20.0.1-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/bs.xpi -> firefox-20.0.1-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/ca.xpi -> firefox-20.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/cs.xpi -> firefox-20.0.1-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/csb.xpi -> firefox-20.0.1-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/cy.xpi -> firefox-20.0.1-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/da.xpi -> firefox-20.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/de.xpi -> firefox-20.0.1-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/el.xpi -> firefox-20.0.1-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/en-GB.xpi -> firefox-20.0.1-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/en-ZA.xpi -> firefox-20.0.1-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/eo.xpi -> firefox-20.0.1-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/es-AR.xpi -> firefox-20.0.1-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/es-CL.xpi -> firefox-20.0.1-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/es-ES.xpi -> firefox-20.0.1-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/es-MX.xpi -> firefox-20.0.1-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/et.xpi -> firefox-20.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/eu.xpi -> firefox-20.0.1-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/fa.xpi -> firefox-20.0.1-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/fi.xpi -> firefox-20.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/fr.xpi -> firefox-20.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/fy-NL.xpi -> firefox-20.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/ga-IE.xpi -> firefox-20.0.1-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/gd.xpi -> firefox-20.0.1-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/gl.xpi -> firefox-20.0.1-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/gu-IN.xpi -> firefox-20.0.1-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/he.xpi -> firefox-20.0.1-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/hi-IN.xpi -> firefox-20.0.1-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/hr.xpi -> firefox-20.0.1-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/hu.xpi -> firefox-20.0.1-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/hy-AM.xpi -> firefox-20.0.1-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/id.xpi -> firefox-20.0.1-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/is.xpi -> firefox-20.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/it.xpi -> firefox-20.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/ja.xpi -> firefox-20.0.1-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/kk.xpi -> firefox-20.0.1-kk.xpi ) linguas_km? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/km.xpi -> firefox-20.0.1-km.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/kn.xpi -> firefox-20.0.1-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/ko.xpi -> firefox-20.0.1-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/ku.xpi -> firefox-20.0.1-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/lg.xpi -> firefox-20.0.1-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/lt.xpi -> firefox-20.0.1-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/lv.xpi -> firefox-20.0.1-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/mai.xpi -> firefox-20.0.1-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/mk.xpi -> firefox-20.0.1-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/ml.xpi -> firefox-20.0.1-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/mr.xpi -> firefox-20.0.1-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/nb-NO.xpi -> firefox-20.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/nl.xpi -> firefox-20.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/nn-NO.xpi -> firefox-20.0.1-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/nso.xpi -> firefox-20.0.1-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/or.xpi -> firefox-20.0.1-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/pa-IN.xpi -> firefox-20.0.1-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/pl.xpi -> firefox-20.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/pt-BR.xpi -> firefox-20.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/pt-PT.xpi -> firefox-20.0.1-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/rm.xpi -> firefox-20.0.1-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/ro.xpi -> firefox-20.0.1-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/ru.xpi -> firefox-20.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/si.xpi -> firefox-20.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/sk.xpi -> firefox-20.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/sl.xpi -> firefox-20.0.1-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/son.xpi -> firefox-20.0.1-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/sq.xpi -> firefox-20.0.1-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/sr.xpi -> firefox-20.0.1-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/sv-SE.xpi -> firefox-20.0.1-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/ta.xpi -> firefox-20.0.1-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/ta-LK.xpi -> firefox-20.0.1-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/te.xpi -> firefox-20.0.1-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/th.xpi -> firefox-20.0.1-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/tr.xpi -> firefox-20.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/uk.xpi -> firefox-20.0.1-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/vi.xpi -> firefox-20.0.1-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/zh-CN.xpi -> firefox-20.0.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/zh-TW.xpi -> firefox-20.0.1-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/linux-i686/xpi/zu.xpi -> firefox-20.0.1-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-20.0-patches-0.2.tar.xz http://dev.gentoo.org/~nirbheek/mozilla/patchsets/firefox-20.0-patches-0.2.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//20.0.1/source/firefox-20.0.1.source.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mozconfig-3	e4ad1852082c7cd6fef51893c4d16af2	mozcoreconf-2	1e308a59d2f982d7c2f79b68e67a0a4f	mozextension	08e43f98cbab4b43f95660c74a831df7	mozlinguas	4fccc675305cf2d1e23c1a05f47b9b2a	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	pax-utils	d727728a240d5f59bf9370a64259fd61	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mozconfig-3	e4ad1852082c7cd6fef51893c4d16af2	mozcoreconf-2	1e308a59d2f982d7c2f79b68e67a0a4f	mozextension	08e43f98cbab4b43f95660c74a831df7	mozlinguas	4fccc675305cf2d1e23c1a05f47b9b2a	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	pax-utils	d727728a240d5f59bf9370a64259fd61	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=e6766f95d93c8dbd4030268024eff650
diff --git a/metadata/md5-cache/www-client/google-chrome-28.0.1478.0_alpha194114 b/metadata/md5-cache/www-client/google-chrome-28.0.1485.0_alpha195393
similarity index 89%
rename from metadata/md5-cache/www-client/google-chrome-28.0.1478.0_alpha194114
rename to metadata/md5-cache/www-client/google-chrome-28.0.1485.0_alpha195393
index ae0c55103e93..ac46fcdf0c1f 100644
--- a/metadata/md5-cache/www-client/google-chrome-28.0.1478.0_alpha194114
+++ b/metadata/md5-cache/www-client/google-chrome-28.0.1485.0_alpha195393
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libgcrypt dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-print/cups sys-apps/dbus || ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] ) x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/pango x11-misc/xdg-utils !www-client/google-chrome:0 !www-client/google-chrome:beta !www-client/google-chrome:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_28.0.1478.0-r194114_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_28.0.1478.0-r194114_i386.deb )
+SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_28.0.1485.0-r195393_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_28.0.1485.0-r195393_i386.deb )
 _eclasses_=chromium	10deb47dfb7657ba0fc7814da0bad35e	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	d727728a240d5f59bf9370a64259fd61	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=aacd5f42fd72f46ec80bccffcd344481
+_md5_=0af7991e2952697a1c674f5e2f447c48
diff --git a/metadata/md5-cache/www-client/httrack-3.45.4 b/metadata/md5-cache/www-client/httrack-3.45.4
index 36e3008596ef..63f0fb223c7b 100644
--- a/metadata/md5-cache/www-client/httrack-3.45.4
+++ b/metadata/md5-cache/www-client/httrack-3.45.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/zlib-1.2.5.1-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/zlib-1.2.5.1-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HTTrack Website Copier, Open Source Offline Browser
 EAPI=4
 HOMEPAGE=http://www.httrack.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/zlib-1.2.5.1-r1
 SLOT=0
 SRC_URI=http://download.httrack.com/httrack-3.45.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b15b03ad469428612a5b4a0e6d484ed4
diff --git a/metadata/md5-cache/www-client/httrack-3.46.1 b/metadata/md5-cache/www-client/httrack-3.46.1
index 45cdd9e93b09..b5f9953f0f18 100644
--- a/metadata/md5-cache/www-client/httrack-3.46.1
+++ b/metadata/md5-cache/www-client/httrack-3.46.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/zlib-1.2.5.1-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/zlib-1.2.5.1-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HTTrack Website Copier, Open Source Offline Browser
 EAPI=4
 HOMEPAGE=http://www.httrack.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/zlib-1.2.5.1-r1
 SLOT=0
 SRC_URI=http://download.httrack.com/httrack-3.46.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=518dbb45fdf2a89c5dd94e590c9752a1
diff --git a/metadata/md5-cache/www-client/httrack-3.47.2 b/metadata/md5-cache/www-client/httrack-3.47.2
index 7452713cd0ae..a3c237380940 100644
--- a/metadata/md5-cache/www-client/httrack-3.47.2
+++ b/metadata/md5-cache/www-client/httrack-3.47.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/zlib-1.2.5.1-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/zlib-1.2.5.1-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HTTrack Website Copier, Open Source Offline Browser
 EAPI=4
 HOMEPAGE=http://www.httrack.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/zlib-1.2.5.1-r1
 SLOT=0
 SRC_URI=http://download.httrack.com/httrack-3.47.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=28bcef85199b612858c1f30e9e9236b5
diff --git a/metadata/md5-cache/www-client/jd-2.6.5_p100425 b/metadata/md5-cache/www-client/jd-2.6.5_p100425
index 4286956115fb..74dfcfe60e4a 100644
--- a/metadata/md5-cache/www-client/jd-2.6.5_p100425
+++ b/metadata/md5-cache/www-client/jd-2.6.5_p100425
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=gtk2 based 2ch browser written in C++
 EAPI=2
 HOMEPAGE=http://jd4linux.sourceforge.jp/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/jd4linux/47156/jd-2.6.5-100425.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2939bcb01e9a481f4e684d502675fc64
diff --git a/metadata/md5-cache/www-client/jd-2.7.5_p101228 b/metadata/md5-cache/www-client/jd-2.7.5_p101228
index 30cb1158ce40..d73fc033ea41 100644
--- a/metadata/md5-cache/www-client/jd-2.7.5_p101228
+++ b/metadata/md5-cache/www-client/jd-2.7.5_p101228
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=gtk2 based 2ch browser written in C++
 EAPI=3
 HOMEPAGE=http://jd4linux.sourceforge.jp/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/jd4linux/50363/jd-2.7.5-101228.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2fa479d44335eff9f2bf22da9f3b8e36
diff --git a/metadata/md5-cache/www-client/jd-2.8.0_p110203 b/metadata/md5-cache/www-client/jd-2.8.0_p110203
index abaab346645c..e76da9c10114 100644
--- a/metadata/md5-cache/www-client/jd-2.8.0_p110203
+++ b/metadata/md5-cache/www-client/jd-2.8.0_p110203
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=gtk2 based 2ch browser written in C++
 EAPI=3
 HOMEPAGE=http://jd4linux.sourceforge.jp/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/jd4linux/50791/jd-2.8.0-110203.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b8a60145e3a638608b74f3113c9e6e30
diff --git a/metadata/md5-cache/www-client/jd-2.8.5_p120826 b/metadata/md5-cache/www-client/jd-2.8.5_p120826
index 53032ee3817d..752cd9f7aad3 100644
--- a/metadata/md5-cache/www-client/jd-2.8.5_p120826
+++ b/metadata/md5-cache/www-client/jd-2.8.5_p120826
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=gtk2 based 2ch browser written in C++
 EAPI=5
 HOMEPAGE=http://jd4linux.sourceforge.jp/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/jd4linux/56721/jd-2.8.5-120826.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b60f39ac9f5708100d455fe482f9cf1c
diff --git a/metadata/md5-cache/www-client/links-2.7 b/metadata/md5-cache/www-client/links-2.7
index 36633b8018dd..12010f47afab 100644
--- a/metadata/md5-cache/www-client/links-2.7
+++ b/metadata/md5-cache/www-client/links-2.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=sys-libs/ncurses-5.7-r7 bzip2? ( app-arch/bzip2 ) directfb? ( media-libs/libpng:0 dev-libs/DirectFB ) fbcon? ( media-libs/libpng:0 ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg ) livecd? ( media-libs/libpng:0 sys-libs/gpm virtual/jpeg ) lzma? ( app-arch/xz-utils ) ssl? ( dev-libs/openssl:0 ) svga? ( media-libs/libpng:0 media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libpng:0 x11-libs/libXext ) zlib? ( sys-libs/zlib ) virtual/pkgconfig fbcon? ( virtual/os-headers ) livecd? ( virtual/os-headers ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.7-r7 bzip2? ( app-arch/bzip2 ) directfb? ( media-libs/libpng:0 dev-libs/DirectFB ) fbcon? ( media-libs/libpng:0 ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg ) livecd? ( media-libs/libpng:0 sys-libs/gpm virtual/jpeg ) lzma? ( app-arch/xz-utils ) ssl? ( dev-libs/openssl:0 ) svga? ( media-libs/libpng:0 media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libpng:0 x11-libs/libXext ) zlib? ( sys-libs/zlib ) virtual/pkgconfig fbcon? ( virtual/os-headers ) livecd? ( virtual/os-headers ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fast and lightweight web browser running in both graphics and text mode
 EAPI=4
 HOMEPAGE=http://links.twibright.com/
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/ncurses-5.7-r7 bzip2? ( app-arch/bzip2 ) directfb? ( media-li
 REQUIRED_USE=!livecd? ( fbcon? ( gpm ) ) svga? ( suid )
 SLOT=2
 SRC_URI=http://links.twibright.com/download/links-2.7.tar.bz2 mirror://debian/pool/main/l/links2/links2_2.7-1.debian.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=44f8cc96f5490abfb3cd6a7d37087a51
diff --git a/metadata/md5-cache/www-client/netrik-1.16.1-r1 b/metadata/md5-cache/www-client/netrik-1.16.1-r1
index 359f5199d9e7..59b78c521096 100644
--- a/metadata/md5-cache/www-client/netrik-1.16.1-r1
+++ b/metadata/md5-cache/www-client/netrik-1.16.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=sys-libs/ncurses-5.1[unicode] sys-libs/readline || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.1[unicode] sys-libs/readline || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A text based web browser with no ssl support.
 EAPI=5
 HOMEPAGE=http://netrik.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.1[unicode] sys-libs/readline
 SLOT=0
 SRC_URI=mirror://sourceforge/netrik/netrik-1.16.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=94de3506b0ef6b82943446513db3d563
diff --git a/metadata/md5-cache/www-client/seamonkey-2.17 b/metadata/md5-cache/www-client/seamonkey-2.17
index 8ed10148eeee..472f3ec4cd84 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.17
+++ b/metadata/md5-cache/www-client/seamonkey-2.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.14.3 >=dev-libs/nspr-4.9.4 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.13[apng] >=media-libs/libvpx-1.0.0 >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14:2 virtual/libffi gstreamer? ( >=media-libs/gstreamer-0.10.33:0.10 >=media-libs/gst-plugins-base-0.10.33:0.10 ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-sqlite? ( || ( >=dev-db/sqlite-3.7.16:3[secure-delete,debug=] ~dev-db/sqlite-3.7.15.2[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) ) crypt? ( >=app-crypt/gnupg-1.4 ) kernel_linux? ( media-libs/alsa-lib ) selinux? ( sec-policy/selinux-mozilla ) !elibc_glibc? ( dev-libs/libexecinfo ) virtual/pkgconfig amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) x11-libs/libXrender x11-libs/libXt >=sys-libs/zlib-1.1.4 virtual/pkgconfig || ( dev-lang/python:2.7[threads,sqlite] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=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 alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme 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.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip app-arch/unzip
+DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.14.3 >=dev-libs/nspr-4.9.4 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.13[apng] >=media-libs/libvpx-1.0.0 >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14:2 virtual/libffi gstreamer? ( >=media-libs/gstreamer-0.10.33:0.10 >=media-libs/gst-plugins-base-0.10.33:0.10 ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-sqlite? ( || ( >=dev-db/sqlite-3.7.16:3[secure-delete,debug=] ~dev-db/sqlite-3.7.15.2[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) ) crypt? ( >=app-crypt/gnupg-1.4 ) kernel_linux? ( media-libs/alsa-lib ) selinux? ( sec-policy/selinux-mozilla ) !elibc_glibc? ( dev-libs/libexecinfo ) virtual/pkgconfig amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) x11-libs/libXrender x11-libs/libXt >=sys-libs/zlib-1.1.4 virtual/pkgconfig || ( dev-lang/python:2.7[threads,sqlite] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=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 alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip app-arch/unzip
 DESCRIPTION=Seamonkey Web Browser
 EAPI=3
 HOMEPAGE=http://www.seamonkey-project.org
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.14.3 >=dev-libs/nspr-4.9.4 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.13[apng] >=media-libs/libvpx-1.0.0 >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14:2 virtual/libffi gstreamer? ( >=media-libs/gstreamer-0.10.33:0.10 >=media-libs/gst-plugins-base-0.10.33:0.10 ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-sqlite? ( || ( >=dev-db/sqlite-3.7.16:3[secure-delete,debug=] ~dev-db/sqlite-3.7.15.2[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) ) crypt? ( >=app-crypt/gnupg-1.4 ) kernel_linux? ( media-libs/alsa-lib ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=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 alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme 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 )
 SLOT=0
 SRC_URI=linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.be.langpack.xpi -> seamonkey-2.17-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.ca.langpack.xpi -> seamonkey-2.17-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.cs.langpack.xpi -> seamonkey-2.17-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.de.langpack.xpi -> seamonkey-2.17-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.en-GB.langpack.xpi -> seamonkey-2.17-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.es-AR.langpack.xpi -> seamonkey-2.17-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.es-ES.langpack.xpi -> seamonkey-2.17-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.fi.langpack.xpi -> seamonkey-2.17-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.fr.langpack.xpi -> seamonkey-2.17-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.gl.langpack.xpi -> seamonkey-2.17-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.hu.langpack.xpi -> seamonkey-2.17-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.it.langpack.xpi -> seamonkey-2.17-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.ja.langpack.xpi -> seamonkey-2.17-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.lt.langpack.xpi -> seamonkey-2.17-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.nb-NO.langpack.xpi -> seamonkey-2.17-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.nl.langpack.xpi -> seamonkey-2.17-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.pl.langpack.xpi -> seamonkey-2.17-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.pt-PT.langpack.xpi -> seamonkey-2.17-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.ru.langpack.xpi -> seamonkey-2.17-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.sk.langpack.xpi -> seamonkey-2.17-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.sv-SE.langpack.xpi -> seamonkey-2.17-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.tr.langpack.xpi -> seamonkey-2.17-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.uk.langpack.xpi -> seamonkey-2.17-uk.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.zh-CN.langpack.xpi -> seamonkey-2.17-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.zh-TW.langpack.xpi -> seamonkey-2.17-zh-TW.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.be.langpack.xpi -> seamonkey-2.17-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.ca.langpack.xpi -> seamonkey-2.17-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.cs.langpack.xpi -> seamonkey-2.17-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.de.langpack.xpi -> seamonkey-2.17-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.en-GB.langpack.xpi -> seamonkey-2.17-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.es-AR.langpack.xpi -> seamonkey-2.17-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.es-ES.langpack.xpi -> seamonkey-2.17-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.fi.langpack.xpi -> seamonkey-2.17-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.fr.langpack.xpi -> seamonkey-2.17-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.gl.langpack.xpi -> seamonkey-2.17-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.hu.langpack.xpi -> seamonkey-2.17-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.it.langpack.xpi -> seamonkey-2.17-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.ja.langpack.xpi -> seamonkey-2.17-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.lt.langpack.xpi -> seamonkey-2.17-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.nb-NO.langpack.xpi -> seamonkey-2.17-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.nl.langpack.xpi -> seamonkey-2.17-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.pl.langpack.xpi -> seamonkey-2.17-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.pt-PT.langpack.xpi -> seamonkey-2.17-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.ru.langpack.xpi -> seamonkey-2.17-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.sk.langpack.xpi -> seamonkey-2.17-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.sv-SE.langpack.xpi -> seamonkey-2.17-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.tr.langpack.xpi -> seamonkey-2.17-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.uk.langpack.xpi -> seamonkey-2.17-uk.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.zh-CN.langpack.xpi -> seamonkey-2.17-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/langpack/seamonkey-2.17.zh-TW.langpack.xpi -> seamonkey-2.17-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17/source/seamonkey-2.17.source.tar.bz2 -> seamonkey-2.17.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-20.0-patches-0.2.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.14-patches-01.tar.xz crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.5.1.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mozconfig-3	e4ad1852082c7cd6fef51893c4d16af2	mozcoreconf-2	1e308a59d2f982d7c2f79b68e67a0a4f	mozextension	08e43f98cbab4b43f95660c74a831df7	mozlinguas	4fccc675305cf2d1e23c1a05f47b9b2a	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	pax-utils	d727728a240d5f59bf9370a64259fd61	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mozconfig-3	e4ad1852082c7cd6fef51893c4d16af2	mozcoreconf-2	1e308a59d2f982d7c2f79b68e67a0a4f	mozextension	08e43f98cbab4b43f95660c74a831df7	mozlinguas	4fccc675305cf2d1e23c1a05f47b9b2a	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	pax-utils	d727728a240d5f59bf9370a64259fd61	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1abb0a90aaea730b43883ef76bb97846
diff --git a/metadata/md5-cache/www-client/seamonkey-2.17.1 b/metadata/md5-cache/www-client/seamonkey-2.17.1
index ba0f2bd03aa3..5232ca91ed76 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.17.1
+++ b/metadata/md5-cache/www-client/seamonkey-2.17.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.14.3 >=dev-libs/nspr-4.9.4 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.13[apng] >=media-libs/libvpx-1.0.0 >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14:2 virtual/libffi gstreamer? ( >=media-libs/gstreamer-0.10.33:0.10 >=media-libs/gst-plugins-base-0.10.33:0.10 ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-sqlite? ( || ( >=dev-db/sqlite-3.7.16:3[secure-delete,debug=] ~dev-db/sqlite-3.7.15.2[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) ) crypt? ( >=app-crypt/gnupg-1.4 ) kernel_linux? ( media-libs/alsa-lib ) selinux? ( sec-policy/selinux-mozilla ) !elibc_glibc? ( dev-libs/libexecinfo ) virtual/pkgconfig amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) x11-libs/libXrender x11-libs/libXt >=sys-libs/zlib-1.1.4 virtual/pkgconfig || ( dev-lang/python:2.7[threads,sqlite] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=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 alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme 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.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip app-arch/unzip
+DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.14.3 >=dev-libs/nspr-4.9.4 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.13[apng] >=media-libs/libvpx-1.0.0 >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14:2 virtual/libffi gstreamer? ( >=media-libs/gstreamer-0.10.33:0.10 >=media-libs/gst-plugins-base-0.10.33:0.10 ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-sqlite? ( || ( >=dev-db/sqlite-3.7.16:3[secure-delete,debug=] ~dev-db/sqlite-3.7.15.2[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) ) crypt? ( >=app-crypt/gnupg-1.4 ) kernel_linux? ( media-libs/alsa-lib ) selinux? ( sec-policy/selinux-mozilla ) !elibc_glibc? ( dev-libs/libexecinfo ) virtual/pkgconfig amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) x11-libs/libXrender x11-libs/libXt >=sys-libs/zlib-1.1.4 virtual/pkgconfig || ( dev-lang/python:2.7[threads,sqlite] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=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 alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip app-arch/unzip
 DESCRIPTION=Seamonkey Web Browser
 EAPI=3
 HOMEPAGE=http://www.seamonkey-project.org
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.14.3 >=dev-libs/nspr-4.9.4 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.13[apng] >=media-libs/libvpx-1.0.0 >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14:2 virtual/libffi gstreamer? ( >=media-libs/gstreamer-0.10.33:0.10 >=media-libs/gst-plugins-base-0.10.33:0.10 ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-sqlite? ( || ( >=dev-db/sqlite-3.7.16:3[secure-delete,debug=] ~dev-db/sqlite-3.7.15.2[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) ) crypt? ( >=app-crypt/gnupg-1.4 ) kernel_linux? ( media-libs/alsa-lib ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=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 alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme 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 )
 SLOT=0
 SRC_URI=linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.be.langpack.xpi -> seamonkey-2.17.1-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.ca.langpack.xpi -> seamonkey-2.17.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.cs.langpack.xpi -> seamonkey-2.17.1-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.de.langpack.xpi -> seamonkey-2.17.1-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.en-GB.langpack.xpi -> seamonkey-2.17.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.es-AR.langpack.xpi -> seamonkey-2.17.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.es-ES.langpack.xpi -> seamonkey-2.17.1-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.fi.langpack.xpi -> seamonkey-2.17.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.fr.langpack.xpi -> seamonkey-2.17.1-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.gl.langpack.xpi -> seamonkey-2.17.1-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.hu.langpack.xpi -> seamonkey-2.17.1-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.it.langpack.xpi -> seamonkey-2.17.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.ja.langpack.xpi -> seamonkey-2.17.1-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.lt.langpack.xpi -> seamonkey-2.17.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.nb-NO.langpack.xpi -> seamonkey-2.17.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.nl.langpack.xpi -> seamonkey-2.17.1-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.pl.langpack.xpi -> seamonkey-2.17.1-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.pt-PT.langpack.xpi -> seamonkey-2.17.1-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.ru.langpack.xpi -> seamonkey-2.17.1-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.sk.langpack.xpi -> seamonkey-2.17.1-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.sv-SE.langpack.xpi -> seamonkey-2.17.1-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.tr.langpack.xpi -> seamonkey-2.17.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.uk.langpack.xpi -> seamonkey-2.17.1-uk.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.zh-CN.langpack.xpi -> seamonkey-2.17.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.zh-TW.langpack.xpi -> seamonkey-2.17.1-zh-TW.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.be.langpack.xpi -> seamonkey-2.17.1-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.ca.langpack.xpi -> seamonkey-2.17.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.cs.langpack.xpi -> seamonkey-2.17.1-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.de.langpack.xpi -> seamonkey-2.17.1-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.en-GB.langpack.xpi -> seamonkey-2.17.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.es-AR.langpack.xpi -> seamonkey-2.17.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.es-ES.langpack.xpi -> seamonkey-2.17.1-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.fi.langpack.xpi -> seamonkey-2.17.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.fr.langpack.xpi -> seamonkey-2.17.1-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.gl.langpack.xpi -> seamonkey-2.17.1-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.hu.langpack.xpi -> seamonkey-2.17.1-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.it.langpack.xpi -> seamonkey-2.17.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.ja.langpack.xpi -> seamonkey-2.17.1-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.lt.langpack.xpi -> seamonkey-2.17.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.nb-NO.langpack.xpi -> seamonkey-2.17.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.nl.langpack.xpi -> seamonkey-2.17.1-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.pl.langpack.xpi -> seamonkey-2.17.1-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.pt-PT.langpack.xpi -> seamonkey-2.17.1-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.ru.langpack.xpi -> seamonkey-2.17.1-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.sk.langpack.xpi -> seamonkey-2.17.1-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.sv-SE.langpack.xpi -> seamonkey-2.17.1-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.tr.langpack.xpi -> seamonkey-2.17.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.uk.langpack.xpi -> seamonkey-2.17.1-uk.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.zh-CN.langpack.xpi -> seamonkey-2.17.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/langpack/seamonkey-2.17.1.zh-TW.langpack.xpi -> seamonkey-2.17.1-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/seamonkey/releases/2.17.1/source/seamonkey-2.17.1.source.tar.bz2 -> seamonkey-2.17.1.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-20.0-patches-0.2.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.14-patches-01.tar.xz crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.5.1.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mozconfig-3	e4ad1852082c7cd6fef51893c4d16af2	mozcoreconf-2	1e308a59d2f982d7c2f79b68e67a0a4f	mozextension	08e43f98cbab4b43f95660c74a831df7	mozlinguas	4fccc675305cf2d1e23c1a05f47b9b2a	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	pax-utils	d727728a240d5f59bf9370a64259fd61	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	mozconfig-3	e4ad1852082c7cd6fef51893c4d16af2	mozcoreconf-2	1e308a59d2f982d7c2f79b68e67a0a4f	mozextension	08e43f98cbab4b43f95660c74a831df7	mozlinguas	4fccc675305cf2d1e23c1a05f47b9b2a	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	pax-utils	d727728a240d5f59bf9370a64259fd61	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cff1f4a56a765af32ad39b122e732b9d
diff --git a/metadata/md5-cache/www-client/uget-9999 b/metadata/md5-cache/www-client/uget-9999
index abdeb7d4ea94..b56d099bd739 100644
--- a/metadata/md5-cache/www-client/uget-9999
+++ b/metadata/md5-cache/www-client/uget-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=dev-libs/libpcre >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 curl? ( >=net-misc/curl-7.10 ) gstreamer? ( media-libs/gstreamer:0.10 ) libnotify? ( x11-libs/libnotify ) dev-util/intltool virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=dev-libs/libpcre >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 curl? ( >=net-misc/curl-7.10 ) gstreamer? ( media-libs/gstreamer:0.10 ) libnotify? ( x11-libs/libnotify ) dev-util/intltool virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Download manager using gtk+ and libcurl
 EAPI=4
 HOMEPAGE=http://urlget.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libpcre >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 curl? ( >=net-misc/curl-7.10 ) gstreamer? ( media-libs/gstreamer:0.10 ) libnotify? ( x11-libs/libnotify )
 REQUIRED_USE=|| ( aria2 curl )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=d0727602daa774a8b18deeb9155dae5f
diff --git a/metadata/md5-cache/www-misc/fcgiwrap-1.0.3-r1 b/metadata/md5-cache/www-misc/fcgiwrap-1.0.3-r1
index 78c2f029132b..2911d7faa6b1 100644
--- a/metadata/md5-cache/www-misc/fcgiwrap-1.0.3-r1
+++ b/metadata/md5-cache/www-misc/fcgiwrap-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=postinst prepare
-DEPEND=dev-libs/fcgi || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/fcgi || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple FastCGI wrapper for CGI scripts (CGI support for nginx)
 EAPI=4
 HOMEPAGE=http://nginx.localdomain.pl/wiki/FcgiWrap
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/fcgi
 SLOT=0
 SRC_URI=mirror://gentoo/fcgiwrap-1.0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=f0ad9f7147c2e88806448f085f64c0a0
diff --git a/metadata/md5-cache/www-misc/fcgiwrap-1.1.0 b/metadata/md5-cache/www-misc/fcgiwrap-1.1.0
index f47cad81246d..88d77efe49eb 100644
--- a/metadata/md5-cache/www-misc/fcgiwrap-1.1.0
+++ b/metadata/md5-cache/www-misc/fcgiwrap-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=postinst prepare
-DEPEND=dev-libs/fcgi virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/fcgi virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Simple FastCGI wrapper for CGI scripts (CGI support for nginx)
 EAPI=4
 HOMEPAGE=http://nginx.localdomain.pl/wiki/FcgiWrap
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/fcgi
 SLOT=0
 SRC_URI=https://github.com/gnosek/fcgiwrap/archive/1.1.0.tar.gz -> fcgiwrap-1.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=0119254a56a1031dc31e16389e1c770b
diff --git a/metadata/md5-cache/www-misc/fcgiwrap-9999 b/metadata/md5-cache/www-misc/fcgiwrap-9999
index d764c237fd15..917f943d7043 100644
--- a/metadata/md5-cache/www-misc/fcgiwrap-9999
+++ b/metadata/md5-cache/www-misc/fcgiwrap-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=postinst prepare unpack
-DEPEND=dev-libs/fcgi || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=dev-libs/fcgi || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Simple FastCGI wrapper for CGI scripts (CGI support for nginx)
 EAPI=4
 HOMEPAGE=http://nginx.localdomain.pl/wiki/FcgiWrap
 LICENSE=BSD
 RDEPEND=dev-libs/fcgi
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=0133637dd0f278fdcf25c5fd0c02833a
diff --git a/metadata/md5-cache/www-misc/gurlchecker-0.13.1 b/metadata/md5-cache/www-misc/gurlchecker-0.13.1
index e6efee92d8fc..bee1eb353f51 100644
--- a/metadata/md5-cache/www-misc/gurlchecker-0.13.1
+++ b/metadata/md5-cache/www-misc/gurlchecker-0.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 ) virtual/pkgconfig >=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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 ) virtual/pkgconfig >=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Gnome tool that checks links on web pages/sites
 EAPI=2
 HOMEPAGE=http://gurlchecker.labs.libre-entreprise.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://labs.libre-entreprise.org/frs/download.php/857/gurlchecker-0.13.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=27f2965f5b6fff953cac8f75380057ec
diff --git a/metadata/md5-cache/www-misc/htdig-3.2.0_beta6-r3 b/metadata/md5-cache/www-misc/htdig-3.2.0_beta6-r3
index 9da630832608..a50d84e93951 100644
--- a/metadata/md5-cache/www-misc/htdig-3.2.0_beta6-r3
+++ b/metadata/md5-cache/www-misc/htdig-3.2.0_beta6-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=sys-libs/zlib-1.1.3 app-arch/unzip ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/zlib-1.1.3 app-arch/unzip ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HTTP/HTML indexing and searching system
 HOMEPAGE=http://www.htdig.org
 IUSE=ssl
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/zlib-1.1.3 app-arch/unzip ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=http://www.htdig.org/files/htdig-3.2.0b6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2da60d7e66f493cb0f980d3838c5eb77
diff --git a/metadata/md5-cache/www-misc/mergelog-4.5-r2 b/metadata/md5-cache/www-misc/mergelog-4.5-r2
index 5004aaec3e86..8afba255f4a2 100644
--- a/metadata/md5-cache/www-misc/mergelog-4.5-r2
+++ b/metadata/md5-cache/www-misc/mergelog-4.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A utility to merge apache logs in chronological order
 EAPI=4
 HOMEPAGE=http://mergelog.sourceforge.net
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/mergelog/mergelog-4.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3ae2e900bb73d05358396be616b2de89
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-28.0.1478.0_alpha194114 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-28.0.1485.0_alpha195393
similarity index 71%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-28.0.1478.0_alpha194114
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-28.0.1485.0_alpha195393
index ec5bb8b5d3e8..006a65c9c0f8 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-28.0.1478.0_alpha194114
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-28.0.1485.0_alpha195393
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=www-client/chromium !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_28.0.1478.0-r194114_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_28.0.1478.0-r194114_i386.deb )
+SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_28.0.1485.0-r195393_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_28.0.1485.0-r195393_i386.deb )
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	658a981a81fd7cb0767315a541bab01d
-_md5_=3491c9db64f3196ef339c99dcf299213
+_md5_=707b6e49739a36f01889fcdc8488262e
diff --git a/metadata/md5-cache/www-plugins/gnash-0.8.10_p20120903 b/metadata/md5-cache/www-plugins/gnash-0.8.10_p20120903
index f744c7b2f00e..0b0ed79da87c 100644
--- a/metadata/md5-cache/www-plugins/gnash-0.8.10_p20120903
+++ b/metadata/md5-cache/www-plugins/gnash-0.8.10_p20120903
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/boost-1.41.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] !x11-apps/mesa-progs[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/glu 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?] ) virtual/pkgconfig nls? ( sys-devel/gettext ) gnome? ( app-text/rarian ) nsplugin? ( net-misc/npapi-sdk ) test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtgui-4.8.0:4[accessibility,dbus] >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.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* )
+DEPEND=>=dev-libs/boost-1.41.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] !x11-apps/mesa-progs[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/glu 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?] ) virtual/pkgconfig nls? ( sys-devel/gettext ) gnome? ( app-text/rarian ) nsplugin? ( net-misc/npapi-sdk ) test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtgui-4.8.0:4[accessibility,dbus] >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.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* )
 DESCRIPTION=GNU Flash movie player that supports many SWF v7,8,9 features
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/gnash/
@@ -11,5 +11,5 @@ REQUIRED_USE=dump? ( agg ffmpeg ) fbcon? ( agg ) nsplugin? ( gtk ) openvg? ( egl
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/gnash-0.8.10_p20120903.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=d2997db1cbda37a1988ce0135ca28109
diff --git a/metadata/md5-cache/www-plugins/gnash-0.8.10_p20120903-r1 b/metadata/md5-cache/www-plugins/gnash-0.8.10_p20120903-r1
index 85b4087d0444..9e02a8d331cd 100644
--- a/metadata/md5-cache/www-plugins/gnash-0.8.10_p20120903-r1
+++ b/metadata/md5-cache/www-plugins/gnash-0.8.10_p20120903-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/boost-1.41.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/glu 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?] ) virtual/pkgconfig nls? ( sys-devel/gettext ) gnome? ( app-text/rarian ) nsplugin? ( net-misc/npapi-sdk ) test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtgui-4.8.0:4[accessibility,dbus] >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.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* )
+DEPEND=>=dev-libs/boost-1.41.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/glu 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?] ) virtual/pkgconfig nls? ( sys-devel/gettext ) gnome? ( app-text/rarian ) nsplugin? ( net-misc/npapi-sdk ) test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtgui-4.8.0:4[accessibility,dbus] >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.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* )
 DESCRIPTION=GNU Flash movie player that supports many SWF v7,8,9 features
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/gnash/
@@ -11,5 +11,5 @@ REQUIRED_USE=dump? ( agg ffmpeg ) fbcon? ( agg ) nsplugin? ( gtk ) openvg? ( egl
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/gnash-0.8.10_p20120903.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=b9e71c92dd49554eee37a5210e94f269
diff --git a/metadata/md5-cache/www-servers/apache-2.2.24 b/metadata/md5-cache/www-servers/apache-2.2.24
index 673f686fce47..c4fe421627ad 100644
--- a/metadata/md5-cache/www-servers/apache-2.2.24
+++ b/metadata/md5-cache/www-servers/apache-2.2.24
@@ -10,5 +10,5 @@ PDEPEND=~app-admin/apache-tools-2.2.24
 RDEPEND=>=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*
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.2.24.tar.bz2 http://dev.gentoo.org/~patrick/dist/apache/gentoo-apache-2.2.23-20121012.tar.bz2
-_eclasses_=apache-2	6c76e14201275ac864023d28ad22f943	autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-2	6c76e14201275ac864023d28ad22f943	autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9a854c4d1a99e69e96824a7b0246d401
diff --git a/metadata/md5-cache/www-servers/apache-2.4.4 b/metadata/md5-cache/www-servers/apache-2.4.4
index 4e7f955c01cb..1b0ffe3856e2 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.4
+++ b/metadata/md5-cache/www-servers/apache-2.4.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/openssl-0.9.8m apache2_modules_deflate? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 ) >=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*
+DEPEND=>=dev-libs/openssl-0.9.8m apache2_modules_deflate? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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*
 DESCRIPTION=The Apache Web Server.
 EAPI=2
 HOMEPAGE=http://httpd.apache.org/
@@ -10,5 +10,5 @@ PDEPEND=~app-admin/apache-tools-2.4.4
 RDEPEND=>=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*
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.4.tar.bz2 http://dev.gentoo.org/~patrick/dist/apache/gentoo-apache-2.4.4-20130227.tar.bz2
-_eclasses_=apache-2	6c76e14201275ac864023d28ad22f943	autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-2	6c76e14201275ac864023d28ad22f943	autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1a17f090d5533f88f39f9bd681745e29
diff --git a/metadata/md5-cache/www-servers/apache-2.4.4-r3 b/metadata/md5-cache/www-servers/apache-2.4.4-r3
index 924c7a63f3be..a35a15aef167 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.4-r3
+++ b/metadata/md5-cache/www-servers/apache-2.4.4-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/openssl-0.9.8m apache2_modules_deflate? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 ) >=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*
+DEPEND=>=dev-libs/openssl-0.9.8m apache2_modules_deflate? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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*
 DESCRIPTION=The Apache Web Server.
 EAPI=2
 HOMEPAGE=http://httpd.apache.org/
@@ -10,5 +10,5 @@ PDEPEND=~app-admin/apache-tools-2.4.4
 RDEPEND=>=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*
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.4.tar.bz2 http://dev.gentoo.org/~patrick/dist/apache/gentoo-apache-2.4.4-20130227.tar.bz2
-_eclasses_=apache-2	6c76e14201275ac864023d28ad22f943	autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-2	6c76e14201275ac864023d28ad22f943	autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2e972b3c4c4f5a6f74924daa91e326fb
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.32 b/metadata/md5-cache/www-servers/lighttpd-1.4.32
index f6df1844281c..d70b5d3cf806 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.32
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.32
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=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 ) virtual/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Lightweight high-performance web server
 EAPI=4
 HOMEPAGE=http://www.lighttpd.net/
@@ -10,5 +10,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) l
 REQUIRED_USE=kerberos? ( ssl )
 SLOT=0
 SRC_URI=http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.32.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	depend.php	df169a364e191b840b695604097e3c21	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	depend.php	df169a364e191b840b695604097e3c21	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=de6e061c0e84822610400d0d15c48b0b
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.32-r2 b/metadata/md5-cache/www-servers/lighttpd-1.4.32-r2
index a1f9b0ef43d7..18168d1c3bbb 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.32-r2
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.32-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=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 ) virtual/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=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 ) virtual/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Lightweight high-performance web server
 EAPI=4
 HOMEPAGE=http://www.lighttpd.net/
@@ -10,5 +10,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) l
 REQUIRED_USE=kerberos? ( ssl )
 SLOT=0
 SRC_URI=http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.32.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	depend.php	df169a364e191b840b695604097e3c21	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	depend.php	df169a364e191b840b695604097e3c21	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=904d2a4a1cf696823aec16e1bbf89c59
diff --git a/metadata/md5-cache/www-servers/pshs-0.2 b/metadata/md5-cache/www-servers/pshs-0.2
index 9b352be33b77..e0267a998192 100644
--- a/metadata/md5-cache/www-servers/pshs-0.2
+++ b/metadata/md5-cache/www-servers/pshs-0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-2 magic? ( sys-apps/file ) upnp? ( net-libs/miniupnpc )
 SLOT=0
 SRC_URI=mirror://github/mgorny/pshs/pshs-0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c031fc287ead54c2478ce74cd6b69c24
diff --git a/metadata/md5-cache/www-servers/pshs-0.2.1 b/metadata/md5-cache/www-servers/pshs-0.2.1
index 25099934f826..8fb6c9b83cda 100644
--- a/metadata/md5-cache/www-servers/pshs-0.2.1
+++ b/metadata/md5-cache/www-servers/pshs-0.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-2 magic? ( sys-apps/file ) upnp? ( net-libs/miniupnpc )
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/pshs/downloads/pshs-0.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a2413ee7e92d24df9d2e473c5da536d4
diff --git a/metadata/md5-cache/www-servers/pshs-9999 b/metadata/md5-cache/www-servers/pshs-9999
index ecb56cb45127..af7d790b94ec 100644
--- a/metadata/md5-cache/www-servers/pshs-9999
+++ b/metadata/md5-cache/www-servers/pshs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libevent-2 magic? ( sys-apps/file ) upnp? ( net-libs/miniupnpc ) netlink? ( sys-apps/iproute2 >=sys-kernel/linux-headers-2.6.27 ) dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libevent-2 magic? ( sys-apps/file ) upnp? ( net-libs/miniupnpc ) netlink? ( sys-apps/iproute2 >=sys-kernel/linux-headers-2.6.27 ) dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Pretty small HTTP server - a command-line tool to share files
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/pshs/
@@ -7,5 +7,5 @@ IUSE=+magic +netlink upnp
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-2 magic? ( sys-apps/file ) upnp? ( net-libs/miniupnpc )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9d53107378714788b625eab15518f081
diff --git a/metadata/md5-cache/www-servers/resin-4.0.13-r1 b/metadata/md5-cache/www-servers/resin-4.0.13-r1
index ee0aba380dec..4ca26362c8e0 100644
--- a/metadata/md5-cache/www-servers/resin-4.0.13-r1
+++ b/metadata/md5-cache/www-servers/resin-4.0.13-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=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.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fast Servlet and JSP engine.
 EAPI=2
 HOMEPAGE=http://www.caucho.com
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.13-src.zip mirror://gentoo/resin-gentoo-patches-4.0.13.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=99b03e9bcf4aea87aa1a23f0c2f4abd8
diff --git a/metadata/md5-cache/www-servers/resin-4.0.14 b/metadata/md5-cache/www-servers/resin-4.0.14
index 76af5409fed6..65e2143f6fc9 100644
--- a/metadata/md5-cache/www-servers/resin-4.0.14
+++ b/metadata/md5-cache/www-servers/resin-4.0.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=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.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fast Servlet and JSP engine.
 EAPI=2
 HOMEPAGE=http://www.caucho.com
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.14-src.zip mirror://gentoo/resin-gentoo-patches-4.0.14.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=49c67a03676c80aa6df72e9a5a31d872
diff --git a/metadata/md5-cache/www-servers/resin-4.0.15 b/metadata/md5-cache/www-servers/resin-4.0.15
index c9f71e4e8706..6f44dc18d931 100644
--- a/metadata/md5-cache/www-servers/resin-4.0.15
+++ b/metadata/md5-cache/www-servers/resin-4.0.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=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.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fast Servlet and JSP engine.
 EAPI=2
 HOMEPAGE=http://www.caucho.com
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.15-src.zip mirror://gentoo/resin-gentoo-patches-4.0.15.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c8e409c48214088fa9f9b488f38a0433
diff --git a/metadata/md5-cache/www-servers/resin-4.0.22 b/metadata/md5-cache/www-servers/resin-4.0.22
index 9dc93f93ce1a..8d7be88a009f 100644
--- a/metadata/md5-cache/www-servers/resin-4.0.22
+++ b/metadata/md5-cache/www-servers/resin-4.0.22
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=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.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fast Servlet and JSP engine.
 EAPI=2
 HOMEPAGE=http://www.caucho.com
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.22-src.zip mirror://gentoo/resin-gentoo-patches-4.0.22-r1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=03b5b03a14975f7285d6bf1a0579de4f
diff --git a/metadata/md5-cache/www-servers/resin-4.0.25 b/metadata/md5-cache/www-servers/resin-4.0.25
index e6312edf424d..5023c01d5903 100644
--- a/metadata/md5-cache/www-servers/resin-4.0.25
+++ b/metadata/md5-cache/www-servers/resin-4.0.25
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=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.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fast Servlet and JSP engine.
 EAPI=4
 HOMEPAGE=http://www.caucho.com
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.25-src.zip mirror://gentoo/resin-gentoo-patches-4.0.25-r1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=48ac1aebdf65dd952bad2564ca6fbe2d
diff --git a/metadata/md5-cache/www-servers/resin-4.0.26 b/metadata/md5-cache/www-servers/resin-4.0.26
index 0cd28227370b..838afa99c8ac 100644
--- a/metadata/md5-cache/www-servers/resin-4.0.26
+++ b/metadata/md5-cache/www-servers/resin-4.0.26
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=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.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fast Servlet and JSP engine.
 EAPI=4
 HOMEPAGE=http://www.caucho.com
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.26-src.zip mirror://gentoo/resin-gentoo-patches-4.0.26.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cf4a449356c5ebec0bb6a754a430fd1f
diff --git a/metadata/md5-cache/www-servers/uwsgi-1.2.6 b/metadata/md5-cache/www-servers/uwsgi-1.2.6
index 80ab50572e88..2a810b305012 100644
--- a/metadata/md5-cache/www-servers/uwsgi-1.2.6
+++ b/metadata/md5-cache/www-servers/uwsgi-1.2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) )
+DEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) )
 DESCRIPTION=uWSGI server for Python web applications
 EAPI=4
 HOMEPAGE=http://projects.unbit.it/uwsgi/
@@ -10,5 +10,5 @@ RDEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/
 REQUIRED_USE=|| ( cgi erlang lua perl php python ruby ) || ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://projects.unbit.it/downloads/uwsgi-1.2.6.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=503a0943c60ebf1d73fdb7587481d3e7
diff --git a/metadata/md5-cache/www-servers/uwsgi-1.4.4 b/metadata/md5-cache/www-servers/uwsgi-1.4.4
index ae6e89954d8a..8f1197c031a6 100644
--- a/metadata/md5-cache/www-servers/uwsgi-1.4.4
+++ b/metadata/md5-cache/www-servers/uwsgi-1.4.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) probepg? ( dev-db/postgresql-base:= ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) )
+DEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) probepg? ( dev-db/postgresql-base:= ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) )
 DESCRIPTION=uWSGI server for Python web applications
 EAPI=5
 HOMEPAGE=http://projects.unbit.it/uwsgi/
@@ -10,5 +10,5 @@ RDEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/
 REQUIRED_USE=|| ( cgi erlang lua perl php python ruby ) || ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://projects.unbit.it/downloads/uwsgi-1.4.4.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ea52991204e671fdbd4ea1c5d490ab0c
diff --git a/metadata/md5-cache/www-servers/uwsgi-1.4.5-r1 b/metadata/md5-cache/www-servers/uwsgi-1.4.5-r1
index 4bc087c7190c..2be7d7dcd5ac 100644
--- a/metadata/md5-cache/www-servers/uwsgi-1.4.5-r1
+++ b/metadata/md5-cache/www-servers/uwsgi-1.4.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) probepg? ( dev-db/postgresql-base:= ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) )
+DEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) probepg? ( dev-db/postgresql-base:= ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) )
 DESCRIPTION=uWSGI server for Python web applications
 EAPI=5
 HOMEPAGE=http://projects.unbit.it/uwsgi/
@@ -10,5 +10,5 @@ RDEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/
 REQUIRED_USE=|| ( cgi erlang lua perl php python ruby ) || ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://projects.unbit.it/downloads/uwsgi-1.4.5.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=952fa73196cf2bab52062aa9fa8e0bbd
diff --git a/metadata/md5-cache/www-servers/uwsgi-1.4.6 b/metadata/md5-cache/www-servers/uwsgi-1.4.6
index de43f9930ec3..128f121c7c09 100644
--- a/metadata/md5-cache/www-servers/uwsgi-1.4.6
+++ b/metadata/md5-cache/www-servers/uwsgi-1.4.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) probepg? ( dev-db/postgresql-base:= ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) )
+DEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) probepg? ( dev-db/postgresql-base:= ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) )
 DESCRIPTION=uWSGI server for Python web applications
 EAPI=5
 HOMEPAGE=http://projects.unbit.it/uwsgi/
@@ -10,5 +10,5 @@ RDEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/
 REQUIRED_USE=|| ( cgi erlang lua perl php python ruby ) || ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://projects.unbit.it/downloads/uwsgi-1.4.6.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d123799a3565f1804c8773f0202db956
diff --git a/metadata/md5-cache/www-servers/uwsgi-1.4.6-r1 b/metadata/md5-cache/www-servers/uwsgi-1.4.6-r1
index 13270895843c..41fb6d9ee579 100644
--- a/metadata/md5-cache/www-servers/uwsgi-1.4.6-r1
+++ b/metadata/md5-cache/www-servers/uwsgi-1.4.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) probepg? ( dev-db/postgresql-base:= ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) )
+DEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) probepg? ( dev-db/postgresql-base:= ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) )
 DESCRIPTION=uWSGI server for Python web applications
 EAPI=5
 HOMEPAGE=http://projects.unbit.it/uwsgi/
@@ -10,5 +10,5 @@ RDEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/
 REQUIRED_USE=|| ( cgi erlang lua perl php python ruby ) || ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://projects.unbit.it/downloads/uwsgi-1.4.6.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a4864a5d5f2f0b35719054b2bd64be56
diff --git a/metadata/md5-cache/www-servers/uwsgi-1.4.8 b/metadata/md5-cache/www-servers/uwsgi-1.4.8
index 480487d158e3..0e352487d97b 100644
--- a/metadata/md5-cache/www-servers/uwsgi-1.4.8
+++ b/metadata/md5-cache/www-servers/uwsgi-1.4.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) probepg? ( dev-db/postgresql-base:= ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) )
+DEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) probepg? ( dev-db/postgresql-base:= ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) )
 DESCRIPTION=uWSGI server for Python web applications
 EAPI=5
 HOMEPAGE=http://projects.unbit.it/uwsgi/
@@ -10,5 +10,5 @@ RDEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/
 REQUIRED_USE=|| ( cgi erlang lua perl php python ruby ) || ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://projects.unbit.it/downloads/uwsgi-1.4.8.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c80d2559fec4eb665cbefc5ebfa64600
diff --git a/metadata/md5-cache/www-servers/uwsgi-1.4.9 b/metadata/md5-cache/www-servers/uwsgi-1.4.9
index 442b93174f96..7a5fa11a15ef 100644
--- a/metadata/md5-cache/www-servers/uwsgi-1.4.9
+++ b/metadata/md5-cache/www-servers/uwsgi-1.4.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) probepg? ( dev-db/postgresql-base:= ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) )
+DEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) probepg? ( dev-db/postgresql-base:= ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) )
 DESCRIPTION=uWSGI server for Python web applications
 EAPI=5
 HOMEPAGE=http://projects.unbit.it/uwsgi/
@@ -10,5 +10,5 @@ RDEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/
 REQUIRED_USE=|| ( cgi erlang lua perl php python ruby ) || ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://projects.unbit.it/downloads/uwsgi-1.4.9.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c44d5e0afc8ae5f8e305f5e4d3f8b700
diff --git a/metadata/md5-cache/www-servers/uwsgi-1.9.6 b/metadata/md5-cache/www-servers/uwsgi-1.9.6
index 843a881176ec..0f7816b79d94 100644
--- a/metadata/md5-cache/www-servers/uwsgi-1.9.6
+++ b/metadata/md5-cache/www-servers/uwsgi-1.9.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) probepg? ( dev-db/postgresql-base:= ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) )
+DEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) probepg? ( dev-db/postgresql-base:= ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=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_targets_php5-4? ( dev-lang/php:5.4 ) )
 DESCRIPTION=uWSGI server for Python web applications
 EAPI=5
 HOMEPAGE=http://projects.unbit.it/uwsgi/
@@ -9,5 +9,5 @@ RDEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/
 REQUIRED_USE=|| ( cgi erlang lua perl php python ruby ) || ( php_targets_php5-3 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://projects.unbit.it/downloads/uwsgi-1.9.6.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	e0c52691b90adf25cf1fe11cded8fd5f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	0dc7b870a088cde4081c57cc7b394ad2	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	d727728a240d5f59bf9370a64259fd61	php-ext-source-r2	3cf993f06c7469d50493002995666449	python	dd56675d8e9f7e85d815a28c87383141	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=28ed944a6b0c48b5966b167589c6e0e0
diff --git a/metadata/md5-cache/www-servers/varnish-3.0.2-r1 b/metadata/md5-cache/www-servers/varnish-3.0.2-r1
index ac2ad2c79223..5eada91937f7 100644
--- a/metadata/md5-cache/www-servers/varnish-3.0.2-r1
+++ b/metadata/md5-cache/www-servers/varnish-3.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpcre libedit? ( dev-libs/libedit ) tools? ( sys-libs/ncurses
 RESTRICT=test
 SLOT=0
 SRC_URI=http://repo.varnish-cache.org/source/varnish-3.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a79b45da978cd9044e4df39961916ec8
diff --git a/metadata/md5-cache/www-servers/varnish-3.0.3-r1 b/metadata/md5-cache/www-servers/varnish-3.0.3-r1
index 370547238ee4..ac100ad34885 100644
--- a/metadata/md5-cache/www-servers/varnish-3.0.3-r1
+++ b/metadata/md5-cache/www-servers/varnish-3.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpcre jemalloc? ( dev-libs/jemalloc ) libedit? ( dev-libs/lib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://repo.varnish-cache.org/source/varnish-3.0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=af75d8e2c53c25b9fd2fadf7f9864930
diff --git a/metadata/md5-cache/x11-apps/appres-1.0.3 b/metadata/md5-cache/x11-apps/appres-1.0.3
index 0733939904f4..d017af61eb14 100644
--- a/metadata/md5-cache/x11-apps/appres-1.0.3
+++ b/metadata/md5-cache/x11-apps/appres-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=list X application resource database
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/appres-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7c95ab2763d470683edbc5ba814eb512
diff --git a/metadata/md5-cache/x11-apps/ardesia-0.7 b/metadata/md5-cache/x11-apps/ardesia-0.7
index 3f63ed337f18..b289af40500d 100644
--- a/metadata/md5-cache/x11-apps/ardesia-0.7
+++ b/metadata/md5-cache/x11-apps/ardesia-0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Color, record and share free-hand annotations on screen and on network.
 EAPI=3
 HOMEPAGE=http://code.google.com/p/ardesia/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://ardesia.googlecode.com/files/ardesia-0.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=38a6342d690e3b423b11f2888fe694a5
diff --git a/metadata/md5-cache/x11-apps/bdftopcf-1.0.3 b/metadata/md5-cache/x11-apps/bdftopcf-1.0.3
index 46198f000753..e0c5c94fea7c 100644
--- a/metadata/md5-cache/x11-apps/bdftopcf-1.0.3
+++ b/metadata/md5-cache/x11-apps/bdftopcf-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXfont || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXfont || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org bdftopcf application
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXfont
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/bdftopcf-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d510ca32ab97ec5990d9f5dca8127ba0
diff --git a/metadata/md5-cache/x11-apps/bdftopcf-1.0.4 b/metadata/md5-cache/x11-apps/bdftopcf-1.0.4
index e12ee7833e1e..672975b09249 100644
--- a/metadata/md5-cache/x11-apps/bdftopcf-1.0.4
+++ b/metadata/md5-cache/x11-apps/bdftopcf-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXfont || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXfont || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org bdftopcf application
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXfont
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/bdftopcf-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=1c277a948ad84dbd9041d75005786b7b
diff --git a/metadata/md5-cache/x11-apps/beforelight-1.0.4 b/metadata/md5-cache/x11-apps/beforelight-1.0.4
index 175ae73267e8..e0ccc8b04582 100644
--- a/metadata/md5-cache/x11-apps/beforelight-1.0.4
+++ b/metadata/md5-cache/x11-apps/beforelight-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXt x11-libs/libXaw || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXt x11-libs/libXaw || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Sample implementation of screen saver
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXt x11-libs/libXaw
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/beforelight-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=bade9923cb2cee91226e6b83d25e6ea2
diff --git a/metadata/md5-cache/x11-apps/beforelight-1.0.5 b/metadata/md5-cache/x11-apps/beforelight-1.0.5
index 08b3ac994aa5..1608c7e5cd59 100644
--- a/metadata/md5-cache/x11-apps/beforelight-1.0.5
+++ b/metadata/md5-cache/x11-apps/beforelight-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXt x11-libs/libXaw || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXt x11-libs/libXaw || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Sample implementation of screen saver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXt x11-libs/libXaw
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/beforelight-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=1c547148613918f2c6e343af067ebcb6
diff --git a/metadata/md5-cache/x11-apps/bitmap-1.0.5 b/metadata/md5-cache/x11-apps/bitmap-1.0.5
index 94c4e9508416..92367f40f6ce 100644
--- a/metadata/md5-cache/x11-apps/bitmap-1.0.5
+++ b/metadata/md5-cache/x11-apps/bitmap-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXaw x11-libs/libXt x11-misc/xbitmaps || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXaw x11-libs/libXt x11-misc/xbitmaps || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org bitmap application
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXaw x11-libs/libXt x11-misc/xbitmaps
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/bitmap-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=294dccda9d27f8c4910fb442c528fcdd
diff --git a/metadata/md5-cache/x11-apps/bitmap-1.0.6 b/metadata/md5-cache/x11-apps/bitmap-1.0.6
index ee43695e1c40..ce65d7229a61 100644
--- a/metadata/md5-cache/x11-apps/bitmap-1.0.6
+++ b/metadata/md5-cache/x11-apps/bitmap-1.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXaw x11-libs/libXt x11-misc/xbitmaps || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXaw x11-libs/libXt x11-misc/xbitmaps || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org bitmap application
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXaw x11-libs/libXt x11-misc/xbitmaps
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/bitmap-1.0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d85ae3e403284b7861b32678dbc37776
diff --git a/metadata/md5-cache/x11-apps/editres-1.0.5 b/metadata/md5-cache/x11-apps/editres-1.0.5
index 8dc6b088e6bd..cfb0191e8626 100644
--- a/metadata/md5-cache/x11-apps/editres-1.0.5
+++ b/metadata/md5-cache/x11-apps/editres-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=a dynamic resource editor for X Toolkit applications
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/editres-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a607d0981d62b43c824c18e5cdd11e8f
diff --git a/metadata/md5-cache/x11-apps/editres-1.0.6 b/metadata/md5-cache/x11-apps/editres-1.0.6
index 4678be3f79b9..011da83ab5b1 100644
--- a/metadata/md5-cache/x11-apps/editres-1.0.6
+++ b/metadata/md5-cache/x11-apps/editres-1.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=a dynamic resource editor for X Toolkit applications
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/editres-1.0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=629a5f105087f3589d7cc8d563f0814d
diff --git a/metadata/md5-cache/x11-apps/fonttosfnt-1.0.4 b/metadata/md5-cache/x11-apps/fonttosfnt-1.0.4
index cbea03288dec..770c32793ebc 100644
--- a/metadata/md5-cache/x11-apps/fonttosfnt-1.0.4
+++ b/metadata/md5-cache/x11-apps/fonttosfnt-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=x11-libs/libX11 =media-libs/freetype-2* x11-libs/libfontenc || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=x11-libs/libX11 =media-libs/freetype-2* x11-libs/libfontenc || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=X.Org fonttosfnt application
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 =media-libs/freetype-2* x11-libs/libfontenc !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/fonttosfnt-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=3d9b3b216a76298e50fc04b3e04b4fcd
diff --git a/metadata/md5-cache/x11-apps/fonttosfnt-1.0.4-r1 b/metadata/md5-cache/x11-apps/fonttosfnt-1.0.4-r1
index 06d148205545..18051cd596c5 100644
--- a/metadata/md5-cache/x11-apps/fonttosfnt-1.0.4-r1
+++ b/metadata/md5-cache/x11-apps/fonttosfnt-1.0.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 =media-libs/freetype-2* x11-libs/libfontenc || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 =media-libs/freetype-2* x11-libs/libfontenc || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org fonttosfnt application
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 =media-libs/freetype-2* x11-libs/libfontenc
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/fonttosfnt-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=2c5f635e3ee526877cb80077edf39128
diff --git a/metadata/md5-cache/x11-apps/fslsfonts-1.0.3 b/metadata/md5-cache/x11-apps/fslsfonts-1.0.3
index 0bc94013aea5..16e01b28da1b 100644
--- a/metadata/md5-cache/x11-apps/fslsfonts-1.0.3
+++ b/metadata/md5-cache/x11-apps/fslsfonts-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-proto/xproto x11-libs/libFS || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-proto/xproto x11-libs/libFS || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=list fonts served by X font server
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-proto/xproto x11-libs/libFS
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/fslsfonts-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6db5971158ba90f227abe217f316ec67
diff --git a/metadata/md5-cache/x11-apps/fslsfonts-1.0.4 b/metadata/md5-cache/x11-apps/fslsfonts-1.0.4
index ca7f8e2be46c..453e0da150fe 100644
--- a/metadata/md5-cache/x11-apps/fslsfonts-1.0.4
+++ b/metadata/md5-cache/x11-apps/fslsfonts-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-proto/xproto x11-libs/libFS || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-proto/xproto x11-libs/libFS || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=list fonts served by X font server
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-proto/xproto x11-libs/libFS
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/fslsfonts-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=141eacd4458a01e93c08a3b032d57b50
diff --git a/metadata/md5-cache/x11-apps/fstobdf-1.0.4 b/metadata/md5-cache/x11-apps/fstobdf-1.0.4
index 81de5f11edd9..7f49448be30f 100644
--- a/metadata/md5-cache/x11-apps/fstobdf-1.0.4
+++ b/metadata/md5-cache/x11-apps/fstobdf-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libFS || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libFS || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=generate BDF font from X font server
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libFS
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/fstobdf-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7f9d9cbe79b43ed27d0c4d4b839196bf
diff --git a/metadata/md5-cache/x11-apps/fstobdf-1.0.5 b/metadata/md5-cache/x11-apps/fstobdf-1.0.5
index a885283f35b1..fed7e78ecff0 100644
--- a/metadata/md5-cache/x11-apps/fstobdf-1.0.5
+++ b/metadata/md5-cache/x11-apps/fstobdf-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libFS || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libFS || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=generate BDF font from X font server
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libFS
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/fstobdf-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a3819ddadb26802d91847913f7964621
diff --git a/metadata/md5-cache/x11-apps/iceauth-1.0.4 b/metadata/md5-cache/x11-apps/iceauth-1.0.4
index bea2d5f2f485..1f4d599e9e1d 100644
--- a/metadata/md5-cache/x11-apps/iceauth-1.0.4
+++ b/metadata/md5-cache/x11-apps/iceauth-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libICE x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libICE x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=ICE authority file utility
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libICE
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/iceauth-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5a55cdda86f471a257af57cd51918436
diff --git a/metadata/md5-cache/x11-apps/iceauth-1.0.5 b/metadata/md5-cache/x11-apps/iceauth-1.0.5
index abbccf5f89ab..0cd68b0589b9 100644
--- a/metadata/md5-cache/x11-apps/iceauth-1.0.5
+++ b/metadata/md5-cache/x11-apps/iceauth-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libICE x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libICE x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=ICE authority file utility
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libICE
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/iceauth-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=b03729b54086f74200266e5ec5296efa
diff --git a/metadata/md5-cache/x11-apps/ico-1.0.3 b/metadata/md5-cache/x11-apps/ico-1.0.3
index 3051388e8910..d25a0351f8b8 100644
--- a/metadata/md5-cache/x11-apps/ico-1.0.3
+++ b/metadata/md5-cache/x11-apps/ico-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=animate an icosahedron or other polyhedron
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/ico-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5e49e1891087f5836389f3800c5ee4f3
diff --git a/metadata/md5-cache/x11-apps/ico-1.0.4 b/metadata/md5-cache/x11-apps/ico-1.0.4
index 614e3cd6a41e..02364905e372 100644
--- a/metadata/md5-cache/x11-apps/ico-1.0.4
+++ b/metadata/md5-cache/x11-apps/ico-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=animate an icosahedron or other polyhedron
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/ico-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=386c6ca7e41036697f69a0aa63cb0468
diff --git a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.2 b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.2
index e124223b36ef..495e2d838cf1 100644
--- a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.2
+++ b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/cairo >=x11-libs/libdrm-2.4.31[video_cards_intel] >=x11-libs/libpciaccess-0.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/cairo >=x11-libs/libdrm-2.4.31[video_cards_intel] >=x11-libs/libpciaccess-0.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=intel gpu userland tools
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ RDEPEND=x11-libs/cairo >=x11-libs/libdrm-2.4.31[video_cards_intel] >=x11-libs/li
 RESTRICT=test
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/intel-gpu-tools-1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=72d427266d0d770b557568b7b1ad96fd
diff --git a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.3 b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.3
index 84e67d451893..12cf81433b10 100644
--- a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.3
+++ b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/glib:2 x11-libs/cairo >=x11-libs/libdrm-2.4.31[video_cards_intel,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=dev-libs/glib:2 x11-libs/cairo >=x11-libs/libdrm-2.4.31[video_cards_intel,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=intel gpu userland tools
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 x11-libs/cairo >=x11-libs/libdrm-2.4.31[video_cards_inte
 RESTRICT=test
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/intel-gpu-tools-1.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=9fa52551f4df3125294832ea7c58757d
diff --git a/metadata/md5-cache/x11-apps/listres-1.0.2 b/metadata/md5-cache/x11-apps/listres-1.0.2
index 5a664905e36b..2a96db05dd91 100644
--- a/metadata/md5-cache/x11-apps/listres-1.0.2
+++ b/metadata/md5-cache/x11-apps/listres-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=list resources in widgets
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/listres-1.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=42c1f0f9c58478bcb5a931d0956c7d7e
diff --git a/metadata/md5-cache/x11-apps/listres-1.0.3 b/metadata/md5-cache/x11-apps/listres-1.0.3
index 11217fe43232..b775ae7656e0 100644
--- a/metadata/md5-cache/x11-apps/listres-1.0.3
+++ b/metadata/md5-cache/x11-apps/listres-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=list resources in widgets
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/listres-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=19b78afc443497e27c8950b79a8fc487
diff --git a/metadata/md5-cache/x11-apps/luit-1.1.0 b/metadata/md5-cache/x11-apps/luit-1.1.0
index eca10a4a4064..997d7f7db977 100644
--- a/metadata/md5-cache/x11-apps/luit-1.1.0
+++ b/metadata/md5-cache/x11-apps/luit-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libfontenc || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libfontenc || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Locale and ISO 2022 support for Unicode terminals
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libfontenc
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/luit-1.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=429831378e2fa4d8bcef72c0e6f4f6f1
diff --git a/metadata/md5-cache/x11-apps/luit-1.1.1 b/metadata/md5-cache/x11-apps/luit-1.1.1
index 2ce16f28267a..f824bc4fdf26 100644
--- a/metadata/md5-cache/x11-apps/luit-1.1.1
+++ b/metadata/md5-cache/x11-apps/luit-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libfontenc || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libfontenc || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=Locale and ISO 2022 support for Unicode terminals
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libfontenc
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/luit-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=88d28c9f5191294e508f20f973468df5
diff --git a/metadata/md5-cache/x11-apps/mesa-progs-8.1.0 b/metadata/md5-cache/x11-apps/mesa-progs-8.1.0
index 122eb83b2227..8cb474cddc55 100644
--- a/metadata/md5-cache/x11-apps/mesa-progs-8.1.0
+++ b/metadata/md5-cache/x11-apps/mesa-progs-8.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=media-libs/mesa[egl?,gles1?,gles2?] virtual/opengl x11-libs/libX11 media-libs/glew virtual/glu x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/mesa[egl?,gles1?,gles2?] virtual/opengl x11-libs/libX11 media-libs/glew virtual/glu x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Mesa's OpenGL utility and demo programs (glxgears and glxinfo)
 EAPI=5
 HOMEPAGE=http://mesa3d.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/mesa[egl?,gles1?,gles2?] virtual/opengl x11-libs/libX11 egl? ( !<=www-plugins/gnash-0.8.10_p20120903[egl] )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/demos/8.1.0/mesa-demos-8.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c3a2745f22695b29906ee0cc97c543c5
diff --git a/metadata/md5-cache/x11-apps/mkfontdir-1.0.6 b/metadata/md5-cache/x11-apps/mkfontdir-1.0.6
index f7f08a62bcf6..a31d904336e6 100644
--- a/metadata/md5-cache/x11-apps/mkfontdir-1.0.6
+++ b/metadata/md5-cache/x11-apps/mkfontdir-1.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-apps/mkfontscale || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-apps/mkfontscale || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=create an index of X font files in a directory
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-apps/mkfontscale
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=db4dd882c62f76714476f0f5236c7e5e
diff --git a/metadata/md5-cache/x11-apps/mkfontdir-1.0.7 b/metadata/md5-cache/x11-apps/mkfontdir-1.0.7
index 7d44278493e6..e13d7be7dc90 100644
--- a/metadata/md5-cache/x11-apps/mkfontdir-1.0.7
+++ b/metadata/md5-cache/x11-apps/mkfontdir-1.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-apps/mkfontscale || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-apps/mkfontscale || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=create an index of X font files in a directory
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-apps/mkfontscale
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=867f9cf135c9411646ab1568a0e79868
diff --git a/metadata/md5-cache/x11-apps/mkfontscale-1.0.8 b/metadata/md5-cache/x11-apps/mkfontscale-1.0.8
index 37e21df481fe..d4943c3b46b0 100644
--- a/metadata/md5-cache/x11-apps/mkfontscale-1.0.8
+++ b/metadata/md5-cache/x11-apps/mkfontscale-1.0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libfontenc media-libs/freetype:2 x11-proto/xproto app-arch/gzip app-arch/bzip2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libfontenc media-libs/freetype:2 x11-proto/xproto app-arch/gzip app-arch/bzip2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=create an index of scalable font files for X
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libfontenc media-libs/freetype:2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.0.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=c9a4a7238ff829e030dc79caf6d62a30
diff --git a/metadata/md5-cache/x11-apps/mkfontscale-1.0.9 b/metadata/md5-cache/x11-apps/mkfontscale-1.0.9
index 6bbd5ad00b9f..d4594e8666fa 100644
--- a/metadata/md5-cache/x11-apps/mkfontscale-1.0.9
+++ b/metadata/md5-cache/x11-apps/mkfontscale-1.0.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libfontenc media-libs/freetype:2 x11-proto/xproto app-arch/gzip app-arch/bzip2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libfontenc media-libs/freetype:2 x11-proto/xproto app-arch/gzip app-arch/bzip2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=create an index of scalable font files for X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libfontenc media-libs/freetype:2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.0.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=2f45309561d5b978a665ae42b78c6d8d
diff --git a/metadata/md5-cache/x11-apps/mkfontscale-1.0.9-r1 b/metadata/md5-cache/x11-apps/mkfontscale-1.0.9-r1
index 81e37d6363e7..288cd18ff53e 100644
--- a/metadata/md5-cache/x11-apps/mkfontscale-1.0.9-r1
+++ b/metadata/md5-cache/x11-apps/mkfontscale-1.0.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libfontenc media-libs/freetype:2 x11-proto/xproto app-arch/gzip app-arch/bzip2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libfontenc media-libs/freetype:2 x11-proto/xproto app-arch/gzip app-arch/bzip2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=create an index of scalable font files for X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libfontenc media-libs/freetype:2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.0.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=dd1b73da8b38bb22cdf3e98cd9be22f1
diff --git a/metadata/md5-cache/x11-apps/mkfontscale-1.1.0 b/metadata/md5-cache/x11-apps/mkfontscale-1.1.0
index 36925304951f..f8ef8b0764ae 100644
--- a/metadata/md5-cache/x11-apps/mkfontscale-1.1.0
+++ b/metadata/md5-cache/x11-apps/mkfontscale-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libfontenc media-libs/freetype:2 x11-proto/xproto app-arch/gzip app-arch/bzip2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libfontenc media-libs/freetype:2 x11-proto/xproto app-arch/gzip app-arch/bzip2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=create an index of scalable font files for X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libfontenc media-libs/freetype:2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5d73b94b675d1dbb1c5a53fe4c2191cb
diff --git a/metadata/md5-cache/x11-apps/oclock-1.0.2 b/metadata/md5-cache/x11-apps/oclock-1.0.2
index fc49f7e6da52..548a954a4fbd 100644
--- a/metadata/md5-cache/x11-apps/oclock-1.0.2
+++ b/metadata/md5-cache/x11-apps/oclock-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=round X clock
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXext
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/oclock-1.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=1996126986379e9e859966908e5ebddf
diff --git a/metadata/md5-cache/x11-apps/oclock-1.0.3 b/metadata/md5-cache/x11-apps/oclock-1.0.3
index 35bcc1c1bb35..8518a5753498 100644
--- a/metadata/md5-cache/x11-apps/oclock-1.0.3
+++ b/metadata/md5-cache/x11-apps/oclock-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libxkbfile || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libxkbfile || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=round X clock
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libxkbfile
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/oclock-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7e22d5a61242e63640becd9ce00a99f6
diff --git a/metadata/md5-cache/x11-apps/rgb-1.0.4 b/metadata/md5-cache/x11-apps/rgb-1.0.4
index bb77e42addc2..2aa8bd94eac0 100644
--- a/metadata/md5-cache/x11-apps/rgb-1.0.4
+++ b/metadata/md5-cache/x11-apps/rgb-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=uncompile an rgb color-name database
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/rgb-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=11ff2152eb68eb6aa5bda8532aeea7b8
diff --git a/metadata/md5-cache/x11-apps/rgb-1.0.5 b/metadata/md5-cache/x11-apps/rgb-1.0.5
index f25c8712b98f..61945fc491a4 100644
--- a/metadata/md5-cache/x11-apps/rgb-1.0.5
+++ b/metadata/md5-cache/x11-apps/rgb-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=uncompile an rgb color-name database
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/rgb-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=637992de3b1120aa8503126f1a5ad5b3
diff --git a/metadata/md5-cache/x11-apps/rstart-1.0.4 b/metadata/md5-cache/x11-apps/rstart-1.0.4
index af989d3b2e74..28982830a930 100644
--- a/metadata/md5-cache/x11-apps/rstart-1.0.4
+++ b/metadata/md5-cache/x11-apps/rstart-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org rstart application
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/rstart-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=50880b329f120e1fbe2c4980534c58a0
diff --git a/metadata/md5-cache/x11-apps/rstart-1.0.5 b/metadata/md5-cache/x11-apps/rstart-1.0.5
index 440573b05b4c..85dafe6d1501 100644
--- a/metadata/md5-cache/x11-apps/rstart-1.0.5
+++ b/metadata/md5-cache/x11-apps/rstart-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org rstart application
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/rstart-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=46d54066f5191c95b6a47e6528d6931c
diff --git a/metadata/md5-cache/x11-apps/scripts-1.0.1-r1 b/metadata/md5-cache/x11-apps/scripts-1.0.1-r1
index f327f41132ee..b10c52efc394 100644
--- a/metadata/md5-cache/x11-apps/scripts-1.0.1-r1
+++ b/metadata/md5-cache/x11-apps/scripts-1.0.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=start an X program on a remote machine
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/scripts-1.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=b00c82f7e16080cc88cd0c6bb6824ce8
diff --git a/metadata/md5-cache/x11-apps/sessreg-1.0.7 b/metadata/md5-cache/x11-apps/sessreg-1.0.7
index 80534a2b4035..a05dc8e9e78a 100644
--- a/metadata/md5-cache/x11-apps/sessreg-1.0.7
+++ b/metadata/md5-cache/x11-apps/sessreg-1.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=manage utmp/wtmp entries for non-init clients
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/sessreg-1.0.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=226c4548a97991ffeeb2703e07f783b9
diff --git a/metadata/md5-cache/x11-apps/sessreg-1.0.8 b/metadata/md5-cache/x11-apps/sessreg-1.0.8
index 7388dfe06143..6cba6447c19d 100644
--- a/metadata/md5-cache/x11-apps/sessreg-1.0.8
+++ b/metadata/md5-cache/x11-apps/sessreg-1.0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=manage utmp/wtmp entries for non-init clients
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/sessreg-1.0.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5479040762f6368fac0431e95e043bc5
diff --git a/metadata/md5-cache/x11-apps/setxkbmap-1.2.0 b/metadata/md5-cache/x11-apps/setxkbmap-1.2.0
index 6140737375c1..7a4adff131a8 100644
--- a/metadata/md5-cache/x11-apps/setxkbmap-1.2.0
+++ b/metadata/md5-cache/x11-apps/setxkbmap-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libxkbfile x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libxkbfile x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Controls the keyboard layout of a running X server.
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libxkbfile x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4709fb56b6aac63f940e6d16d3b4f44f
diff --git a/metadata/md5-cache/x11-apps/setxkbmap-1.3.0 b/metadata/md5-cache/x11-apps/setxkbmap-1.3.0
index cd133edaac2f..93c614155d2a 100644
--- a/metadata/md5-cache/x11-apps/setxkbmap-1.3.0
+++ b/metadata/md5-cache/x11-apps/setxkbmap-1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libxkbfile x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libxkbfile x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Controls the keyboard layout of a running X server.
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libxkbfile x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=387927dce8591619338f91061694ac5a
diff --git a/metadata/md5-cache/x11-apps/showfont-1.0.3 b/metadata/md5-cache/x11-apps/showfont-1.0.3
index 7e7d8bba8f1a..f486a7328c9c 100644
--- a/metadata/md5-cache/x11-apps/showfont-1.0.3
+++ b/metadata/md5-cache/x11-apps/showfont-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libFS || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libFS || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=font dumper for X font server
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libFS
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/showfont-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d6fd6464055627c8ec204cf126de3909
diff --git a/metadata/md5-cache/x11-apps/showfont-1.0.4 b/metadata/md5-cache/x11-apps/showfont-1.0.4
index db71c8367ae3..67556cf3b5b8 100644
--- a/metadata/md5-cache/x11-apps/showfont-1.0.4
+++ b/metadata/md5-cache/x11-apps/showfont-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libFS || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libFS || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=font dumper for X font server
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libFS
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/showfont-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7b8730a9ceb4c522a230308d1db56b1d
diff --git a/metadata/md5-cache/x11-apps/smproxy-1.0.4 b/metadata/md5-cache/x11-apps/smproxy-1.0.4
index 7897d4a5a994..70ecb87def31 100644
--- a/metadata/md5-cache/x11-apps/smproxy-1.0.4
+++ b/metadata/md5-cache/x11-apps/smproxy-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libSM x11-libs/libXt x11-libs/libXmu || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libSM x11-libs/libXt x11-libs/libXmu || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Session Manager Proxy
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libSM x11-libs/libXt x11-libs/libXmu
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/smproxy-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=670546f230206dc5b082c9535203d04d
diff --git a/metadata/md5-cache/x11-apps/smproxy-1.0.5 b/metadata/md5-cache/x11-apps/smproxy-1.0.5
index f2d36e1c9e21..99037dd33333 100644
--- a/metadata/md5-cache/x11-apps/smproxy-1.0.5
+++ b/metadata/md5-cache/x11-apps/smproxy-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXt x11-libs/libXmu || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXt x11-libs/libXmu || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Session Manager Proxy
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXt x11-libs/libXmu
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/smproxy-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=8662dca33843c16c7f6a5f2af00cdfcc
diff --git a/metadata/md5-cache/x11-apps/transset-1.0.0 b/metadata/md5-cache/x11-apps/transset-1.0.0
index 5df292b27f61..0c35b298ac27 100644
--- a/metadata/md5-cache/x11-apps/transset-1.0.0
+++ b/metadata/md5-cache/x11-apps/transset-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 >=x11-proto/xproto-7.0.17 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 >=x11-proto/xproto-7.0.17 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=An utility for setting opacity property
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/xapps http://cgit.freedesktop.org/xorg/app/transset/
@@ -8,5 +8,5 @@ LICENSE=SGI-B-2.0
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/transset-1.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=07a5099567e68259de9cf0848a45b6b7
diff --git a/metadata/md5-cache/x11-apps/viewres-1.0.3 b/metadata/md5-cache/x11-apps/viewres-1.0.3
index 9d7d741d79e9..bd34f883d9c0 100644
--- a/metadata/md5-cache/x11-apps/viewres-1.0.3
+++ b/metadata/md5-cache/x11-apps/viewres-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=graphical class browser for Xt
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/viewres-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=9d1236d10dfa531bed42c5f4446e9264
diff --git a/metadata/md5-cache/x11-apps/viewres-1.0.4 b/metadata/md5-cache/x11-apps/viewres-1.0.4
index 197f042db509..4ee1d0114f9d 100644
--- a/metadata/md5-cache/x11-apps/viewres-1.0.4
+++ b/metadata/md5-cache/x11-apps/viewres-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=graphical class browser for Xt
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/viewres-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=0d860dfa7385ab8ca0f366fc3ced4b5c
diff --git a/metadata/md5-cache/x11-apps/x11perf-1.5.3 b/metadata/md5-cache/x11-apps/x11perf-1.5.3
index 3ef8bca4a07b..f9a6ea060b34 100644
--- a/metadata/md5-cache/x11-apps/x11perf-1.5.3
+++ b/metadata/md5-cache/x11-apps/x11perf-1.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXft x11-libs/libXrender x11-libs/libXext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXft x11-libs/libXrender x11-libs/libXext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X rendering operation stress test utility
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXft x11-libs/libXrender x11-libs/libXext
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/x11perf-1.5.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=0d219f8c633ff859ac7f3a17bee5b135
diff --git a/metadata/md5-cache/x11-apps/x11perf-1.5.4 b/metadata/md5-cache/x11-apps/x11perf-1.5.4
index 22f548c4533a..86dc9f385a0d 100644
--- a/metadata/md5-cache/x11-apps/x11perf-1.5.4
+++ b/metadata/md5-cache/x11-apps/x11perf-1.5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXft x11-libs/libXrender x11-libs/libXext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXft x11-libs/libXrender x11-libs/libXext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X rendering operation stress test utility
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXft x11-libs/libXrender x11-libs/libXext
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/x11perf-1.5.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a95c894c13390c0a53facad7bfa577ee
diff --git a/metadata/md5-cache/x11-apps/xauth-1.0.5 b/metadata/md5-cache/x11-apps/xauth-1.0.5
index 4e4df26adf4b..d74ec1c6ffb9 100644
--- a/metadata/md5-cache/x11-apps/xauth-1.0.5
+++ b/metadata/md5-cache/x11-apps/xauth-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X authority file utility
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xauth-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=981e9f0ce60a6562c2d7d1a08b668631
diff --git a/metadata/md5-cache/x11-apps/xauth-1.0.6 b/metadata/md5-cache/x11-apps/xauth-1.0.6
index 47e70fd3a249..2e5161c3592f 100644
--- a/metadata/md5-cache/x11-apps/xauth-1.0.6
+++ b/metadata/md5-cache/x11-apps/xauth-1.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X authority file utility
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xauth-1.0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=774611d3f78c2e2160f801bccebf0989
diff --git a/metadata/md5-cache/x11-apps/xauth-1.0.7 b/metadata/md5-cache/x11-apps/xauth-1.0.7
index 3f6037f20413..93e887118750 100644
--- a/metadata/md5-cache/x11-apps/xauth-1.0.7
+++ b/metadata/md5-cache/x11-apps/xauth-1.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X authority file utility
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xauth-1.0.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=c46a65468b57fb305c7bd8c2c69f3f34
diff --git a/metadata/md5-cache/x11-apps/xbacklight-1.2.0 b/metadata/md5-cache/x11-apps/xbacklight-1.2.0
index 1a0d001ade83..5246578b4be9 100644
--- a/metadata/md5-cache/x11-apps/xbacklight-1.2.0
+++ b/metadata/md5-cache/x11-apps/xbacklight-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libxcb >=x11-libs/xcb-util-0.3.8 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libxcb >=x11-libs/xcb-util-0.3.8 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Sets backlight level using the RandR 1.2 BACKLIGHT output property
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libxcb >=x11-libs/xcb-util-0.3.8
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xbacklight-1.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=86649454dcbabe4ee9c74fc2984680af
diff --git a/metadata/md5-cache/x11-apps/xbiff-1.0.3 b/metadata/md5-cache/x11-apps/xbiff-1.0.3
index 0686694e4c9d..6a27eba27a6c 100644
--- a/metadata/md5-cache/x11-apps/xbiff-1.0.3
+++ b/metadata/md5-cache/x11-apps/xbiff-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=mailbox flag for X
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXext
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xbiff-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=1056eb6c8658636074eb6392961e410d
diff --git a/metadata/md5-cache/x11-apps/xcalc-1.0.4.1 b/metadata/md5-cache/x11-apps/xcalc-1.0.4.1
index 422e24a60f45..25b6330cc92a 100644
--- a/metadata/md5-cache/x11-apps/xcalc-1.0.4.1
+++ b/metadata/md5-cache/x11-apps/xcalc-1.0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=scientific calculator for X
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcalc-1.0.4.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=e63b59f952267257b28f7dfc12e364f3
diff --git a/metadata/md5-cache/x11-apps/xcalc-1.0.5 b/metadata/md5-cache/x11-apps/xcalc-1.0.5
index 24d5ce2161f4..80f25d49f12a 100644
--- a/metadata/md5-cache/x11-apps/xcalc-1.0.5
+++ b/metadata/md5-cache/x11-apps/xcalc-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=scientific calculator for X
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcalc-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=c6cc0590c4cff25dc19004fdc769b099
diff --git a/metadata/md5-cache/x11-apps/xclipboard-1.1.1 b/metadata/md5-cache/x11-apps/xclipboard-1.1.1
index c3d7ebf00ebf..dad5afe140f9 100644
--- a/metadata/md5-cache/x11-apps/xclipboard-1.1.1
+++ b/metadata/md5-cache/x11-apps/xclipboard-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=interchange between cut buffer and selection
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xclipboard-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=84372162bd83b6f44f65a614dadd7880
diff --git a/metadata/md5-cache/x11-apps/xclipboard-1.1.2 b/metadata/md5-cache/x11-apps/xclipboard-1.1.2
index 1fa2152735d9..785064f852c2 100644
--- a/metadata/md5-cache/x11-apps/xclipboard-1.1.2
+++ b/metadata/md5-cache/x11-apps/xclipboard-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libxkbfile x11-libs/libXmu >=x11-libs/libXt-1.1 x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libxkbfile x11-libs/libXmu >=x11-libs/libXt-1.1 x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=interchange between cut buffer and selection
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libxkbfile x11-libs/libXmu >=x11-libs/libXt-1.1 x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xclipboard-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=8065cac6225df76645aedc09528e3763
diff --git a/metadata/md5-cache/x11-apps/xclock-1.0.5 b/metadata/md5-cache/x11-apps/xclock-1.0.5
index 08f82a87cb19..02aa2adc6626 100644
--- a/metadata/md5-cache/x11-apps/xclock-1.0.5
+++ b/metadata/md5-cache/x11-apps/xclock-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-libs/libxkbfile x11-libs/libXaw || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-libs/libxkbfile x11-libs/libXaw || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=analog / digital clock for X
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-libs/libxkbfile x11-libs/libXaw
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xclock-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=aa04d723c97d197c84fb0b6b6d3e46ef
diff --git a/metadata/md5-cache/x11-apps/xclock-1.0.6 b/metadata/md5-cache/x11-apps/xclock-1.0.6
index 4fc5282416a6..67e0bb074575 100644
--- a/metadata/md5-cache/x11-apps/xclock-1.0.6
+++ b/metadata/md5-cache/x11-apps/xclock-1.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-libs/libxkbfile x11-libs/libXaw || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-libs/libxkbfile x11-libs/libXaw || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=analog / digital clock for X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-libs/libxkbfile x11-libs/libXaw
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xclock-1.0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=403a7c108fc472546abc723559152237
diff --git a/metadata/md5-cache/x11-apps/xcmsdb-1.0.3 b/metadata/md5-cache/x11-apps/xcmsdb-1.0.3
index dce21d1ea52f..6787571c6345 100644
--- a/metadata/md5-cache/x11-apps/xcmsdb-1.0.3
+++ b/metadata/md5-cache/x11-apps/xcmsdb-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Device Color Characterization utility for X Color Management System
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcmsdb-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5291b1a022e88c803ba618b5640aa016
diff --git a/metadata/md5-cache/x11-apps/xcmsdb-1.0.4 b/metadata/md5-cache/x11-apps/xcmsdb-1.0.4
index 13e0b010f0bd..40945be94840 100644
--- a/metadata/md5-cache/x11-apps/xcmsdb-1.0.4
+++ b/metadata/md5-cache/x11-apps/xcmsdb-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Device Color Characterization utility for X Color Management System
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcmsdb-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4bdf4479947e58019bf563fcdd5dbfb2
diff --git a/metadata/md5-cache/x11-apps/xconsole-1.0.4 b/metadata/md5-cache/x11-apps/xconsole-1.0.4
index 994190292890..8d551890cc36 100644
--- a/metadata/md5-cache/x11-apps/xconsole-1.0.4
+++ b/metadata/md5-cache/x11-apps/xconsole-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=monitor system console messages with X
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xconsole-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=614c12f9030fd79d8d8d1173675ccbc8
diff --git a/metadata/md5-cache/x11-apps/xconsole-1.0.5 b/metadata/md5-cache/x11-apps/xconsole-1.0.5
index 88a622f9209c..3fb806cdbba8 100644
--- a/metadata/md5-cache/x11-apps/xconsole-1.0.5
+++ b/metadata/md5-cache/x11-apps/xconsole-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=monitor system console messages with X
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xconsole-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=120583ae0bb4d046e220bc7c9ac9975d
diff --git a/metadata/md5-cache/x11-apps/xcursorgen-1.0.4 b/metadata/md5-cache/x11-apps/xcursorgen-1.0.4
index 40496c3acd1a..b0e4de860793 100644
--- a/metadata/md5-cache/x11-apps/xcursorgen-1.0.4
+++ b/metadata/md5-cache/x11-apps/xcursorgen-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=media-libs/libpng x11-libs/libX11 x11-libs/libXcursor || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=media-libs/libpng x11-libs/libX11 x11-libs/libXcursor || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=create an X cursor file from a collection of PNG images
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=media-libs/libpng x11-libs/libX11 x11-libs/libXcursor
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcursorgen-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=c1399a9e32e72b08fb8e38cd2933f6d3
diff --git a/metadata/md5-cache/x11-apps/xcursorgen-1.0.5 b/metadata/md5-cache/x11-apps/xcursorgen-1.0.5
index acc8c46523c3..059fcedd280a 100644
--- a/metadata/md5-cache/x11-apps/xcursorgen-1.0.5
+++ b/metadata/md5-cache/x11-apps/xcursorgen-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXcursor media-libs/libpng:0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXcursor media-libs/libpng:0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=create an X cursor file from a collection of PNG images
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXcursor media-libs/libpng:0
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcursorgen-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=62c7499621a2bdccbe57221f6bca490d
diff --git a/metadata/md5-cache/x11-apps/xdbedizzy-1.1.0 b/metadata/md5-cache/x11-apps/xdbedizzy-1.1.0
index e26231b7aa21..ddf6b0def035 100644
--- a/metadata/md5-cache/x11-apps/xdbedizzy-1.1.0
+++ b/metadata/md5-cache/x11-apps/xdbedizzy-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXext x11-libs/libX11 x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXext x11-libs/libX11 x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xdbedizzy application
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXext x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xdbedizzy-1.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=458e0c48d1d7cdcd83ab062c686d0245
diff --git a/metadata/md5-cache/x11-apps/xditview-1.0.2 b/metadata/md5-cache/x11-apps/xditview-1.0.2
index cab4db6b7f48..12bef60122ed 100644
--- a/metadata/md5-cache/x11-apps/xditview-1.0.2
+++ b/metadata/md5-cache/x11-apps/xditview-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=display ditroff output
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xditview-1.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=f098438e25dcaeac5741d74a42d07304
diff --git a/metadata/md5-cache/x11-apps/xditview-1.0.3 b/metadata/md5-cache/x11-apps/xditview-1.0.3
index ac7b2f59572c..0c2fce364f22 100644
--- a/metadata/md5-cache/x11-apps/xditview-1.0.3
+++ b/metadata/md5-cache/x11-apps/xditview-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=display ditroff output
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xditview-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=19f5c0f03c011bbe520d7bd489c78a12
diff --git a/metadata/md5-cache/x11-apps/xdm-1.1.11-r1 b/metadata/md5-cache/x11-apps/xdm-1.1.11-r1
index b1c17506777c..87a52e74bb9c 100644
--- a/metadata/md5-cache/x11-apps/xdm-1.1.11-r1
+++ b/metadata/md5-cache/x11-apps/xdm-1.1.11-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/xrdb x11-libs/libXdmcp x11-libs/libXaw >=x11-apps/xinit-1.0.2-r3 x11-libs/libXinerama x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-apps/sessreg x11-apps/xconsole consolekit? ( sys-auth/consolekit ) pam? ( virtual/pam ) !<sys-apps/systemd-187 consolekit? ( !=sys-auth/pambase-20101024-r1 ) x11-proto/xineramaproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig virtual/pkgconfig
+DEPEND=x11-apps/xrdb x11-libs/libXdmcp x11-libs/libXaw >=x11-apps/xinit-1.0.2-r3 x11-libs/libXinerama x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-apps/sessreg x11-apps/xconsole consolekit? ( sys-auth/consolekit ) pam? ( virtual/pam ) !<sys-apps/systemd-187 consolekit? ( !=sys-auth/pambase-20101024-r1 ) x11-proto/xineramaproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=X.Org xdm application
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-apps/xrdb x11-libs/libXdmcp x11-libs/libXaw >=x11-apps/xinit-1.0.2-r3 x11-libs/libXinerama x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-apps/sessreg x11-apps/xconsole consolekit? ( sys-auth/consolekit ) pam? ( virtual/pam ) !<sys-apps/systemd-187
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xdm-1.1.11.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4918f8fbd70cf49e961cc4d326cfad91
diff --git a/metadata/md5-cache/x11-apps/xdm-1.1.11-r2 b/metadata/md5-cache/x11-apps/xdm-1.1.11-r2
index ec856d1119bf..fd0b7399671d 100644
--- a/metadata/md5-cache/x11-apps/xdm-1.1.11-r2
+++ b/metadata/md5-cache/x11-apps/xdm-1.1.11-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/xrdb x11-libs/libXdmcp x11-libs/libXaw >=x11-apps/xinit-1.0.2-r3 x11-libs/libXinerama x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-apps/sessreg x11-apps/xconsole consolekit? ( sys-auth/consolekit ) pam? ( virtual/pam ) !<sys-apps/systemd-187 consolekit? ( !=sys-auth/pambase-20101024-r1 ) x11-proto/xineramaproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig virtual/pkgconfig
+DEPEND=x11-apps/xrdb x11-libs/libXdmcp x11-libs/libXaw >=x11-apps/xinit-1.0.2-r3 x11-libs/libXinerama x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-apps/sessreg x11-apps/xconsole consolekit? ( sys-auth/consolekit ) pam? ( virtual/pam ) !<sys-apps/systemd-187 consolekit? ( !=sys-auth/pambase-20101024-r1 ) x11-proto/xineramaproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=X.Org xdm application
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-apps/xrdb x11-libs/libXdmcp x11-libs/libXaw >=x11-apps/xinit-1.0.2-r3 x11-libs/libXinerama x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-apps/sessreg x11-apps/xconsole consolekit? ( sys-auth/consolekit ) pam? ( virtual/pam ) !<sys-apps/systemd-187
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xdm-1.1.11.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=ceefe8b6f52ea89ada4ea5ba871d2af2
diff --git a/metadata/md5-cache/x11-apps/xdpyinfo-1.3.0-r1 b/metadata/md5-cache/x11-apps/xdpyinfo-1.3.0-r1
index 215a0f1d8deb..215c491e91b6 100644
--- a/metadata/md5-cache/x11-apps/xdpyinfo-1.3.0-r1
+++ b/metadata/md5-cache/x11-apps/xdpyinfo-1.3.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libXxf86vm x11-libs/libxcb dga? ( x11-libs/libXxf86dga ) dmx? ( x11-libs/libdmx ) xinerama? ( x11-libs/libXinerama ) x11-proto/compositeproto x11-proto/inputproto x11-proto/kbproto x11-proto/renderproto x11-proto/xf86vidmodeproto x11-proto/xextproto x11-proto/xproto dga? ( x11-proto/xf86dgaproto ) dmx? ( x11-proto/dmxproto ) xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libXxf86vm x11-libs/libxcb dga? ( x11-libs/libXxf86dga ) dmx? ( x11-libs/libdmx ) xinerama? ( x11-libs/libXinerama ) x11-proto/compositeproto x11-proto/inputproto x11-proto/kbproto x11-proto/renderproto x11-proto/xf86vidmodeproto x11-proto/xextproto x11-proto/xproto dga? ( x11-proto/xf86dgaproto ) dmx? ( x11-proto/dmxproto ) xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Display information utility for X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libXxf86vm x11-libs/libxcb dga? ( x11-libs/libXxf86dga ) dmx? ( x11-libs/libdmx ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xdpyinfo-1.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=3cb2404fd0d62e50982de2acbdca2665
diff --git a/metadata/md5-cache/x11-apps/xdriinfo-1.0.4 b/metadata/md5-cache/x11-apps/xdriinfo-1.0.4
index e10334db0934..a630d51770a3 100644
--- a/metadata/md5-cache/x11-apps/xdriinfo-1.0.4
+++ b/metadata/md5-cache/x11-apps/xdriinfo-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 virtual/opengl x11-proto/glproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 virtual/opengl x11-proto/glproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=query configuration information of DRI drivers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 virtual/opengl
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xdriinfo-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=74431fd39ed34e1bfdd4e854f0c030b0
diff --git a/metadata/md5-cache/x11-apps/xedit-1.2.0 b/metadata/md5-cache/x11-apps/xedit-1.2.0
index a4b3f7777fa9..757b2f6a9e7c 100644
--- a/metadata/md5-cache/x11-apps/xedit-1.2.0
+++ b/metadata/md5-cache/x11-apps/xedit-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=simple text editor for X
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xedit-1.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=9e6d765374c67d266d6fe984b2c07b91
diff --git a/metadata/md5-cache/x11-apps/xedit-1.2.1 b/metadata/md5-cache/x11-apps/xedit-1.2.1
index a7fa3839ea5c..a02884a1383f 100644
--- a/metadata/md5-cache/x11-apps/xedit-1.2.1
+++ b/metadata/md5-cache/x11-apps/xedit-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=simple text editor for X
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xedit-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=c9bd94b53dffdb2e3a399d577b9ea1c2
diff --git a/metadata/md5-cache/x11-apps/xev-1.2.0 b/metadata/md5-cache/x11-apps/xev-1.2.0
index d9c69a3b301c..a25f704e980f 100644
--- a/metadata/md5-cache/x11-apps/xev-1.2.0
+++ b/metadata/md5-cache/x11-apps/xev-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXrandr x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXrandr x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=print contents of X events
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXrandr
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xev-1.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6de4ea717ccd207ce964f46234c4b511
diff --git a/metadata/md5-cache/x11-apps/xev-1.2.1 b/metadata/md5-cache/x11-apps/xev-1.2.1
index 14fd90d47603..0eaface617c3 100644
--- a/metadata/md5-cache/x11-apps/xev-1.2.1
+++ b/metadata/md5-cache/x11-apps/xev-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXrandr x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXrandr x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=print contents of X events
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXrandr
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xev-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7a1d15dc28a7bfbcbb19ab059ffa4384
diff --git a/metadata/md5-cache/x11-apps/xeyes-1.1.1 b/metadata/md5-cache/x11-apps/xeyes-1.1.1
index d32cbd9e5705..3005c5c27875 100644
--- a/metadata/md5-cache/x11-apps/xeyes-1.1.1
+++ b/metadata/md5-cache/x11-apps/xeyes-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXrender || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXrender || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xeyes application
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXrender
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xeyes-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7560e1ab1b6308f37c238cfdff925e89
diff --git a/metadata/md5-cache/x11-apps/xf86dga-1.0.3 b/metadata/md5-cache/x11-apps/xf86dga-1.0.3
index a7a673449348..f2fea0f3fc44 100644
--- a/metadata/md5-cache/x11-apps/xf86dga-1.0.3
+++ b/metadata/md5-cache/x11-apps/xf86dga-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 >=x11-libs/libXxf86dga-1.1 x11-proto/xf86dgaproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 >=x11-libs/libXxf86dga-1.1 x11-proto/xf86dgaproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=test program for the XFree86-DGA extension
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 >=x11-libs/libXxf86dga-1.1
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xf86dga-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=98f22a71c3efe508cdcfd1351ae68eb2
diff --git a/metadata/md5-cache/x11-apps/xfd-1.1.0 b/metadata/md5-cache/x11-apps/xfd-1.1.0
index 2c4a1ff26ee9..390926e9edbb 100644
--- a/metadata/md5-cache/x11-apps/xfd-1.1.0
+++ b/metadata/md5-cache/x11-apps/xfd-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=media-libs/freetype:2 media-libs/fontconfig x11-libs/libXft x11-libs/libXt x11-libs/libXmu x11-libs/libXrender x11-libs/libXaw sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=media-libs/freetype:2 media-libs/fontconfig x11-libs/libXft x11-libs/libXt x11-libs/libXmu x11-libs/libXrender x11-libs/libXaw sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xfd application
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=media-libs/freetype:2 media-libs/fontconfig x11-libs/libXft x11-libs/libXt x11-libs/libXmu x11-libs/libXrender x11-libs/libXaw
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xfd-1.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=21a3767ad36a4c4107cba178c21ced6d
diff --git a/metadata/md5-cache/x11-apps/xfd-1.1.1 b/metadata/md5-cache/x11-apps/xfd-1.1.1
index aee181372006..fe0a529237c1 100644
--- a/metadata/md5-cache/x11-apps/xfd-1.1.1
+++ b/metadata/md5-cache/x11-apps/xfd-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=media-libs/freetype:2 media-libs/fontconfig x11-libs/libXft x11-libs/libXt x11-libs/libXmu x11-libs/libXrender x11-libs/libXaw sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=media-libs/freetype:2 media-libs/fontconfig x11-libs/libXft x11-libs/libXt x11-libs/libXmu x11-libs/libXrender x11-libs/libXaw sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xfd application
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=media-libs/freetype:2 media-libs/fontconfig x11-libs/libXft x11-libs/libXt x11-libs/libXmu x11-libs/libXrender x11-libs/libXaw
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xfd-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d21a55cbb01cc2e3e9a5df01411377e9
diff --git a/metadata/md5-cache/x11-apps/xfontsel-1.0.3 b/metadata/md5-cache/x11-apps/xfontsel-1.0.3
index 9e963b0e7913..b00fac1c2363 100644
--- a/metadata/md5-cache/x11-apps/xfontsel-1.0.3
+++ b/metadata/md5-cache/x11-apps/xfontsel-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=point and click selection of X11 font names
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xfontsel-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=32534fb207072bc68bcb8c24d6284ed6
diff --git a/metadata/md5-cache/x11-apps/xfontsel-1.0.4 b/metadata/md5-cache/x11-apps/xfontsel-1.0.4
index c5a68c367011..62fd8dba2abe 100644
--- a/metadata/md5-cache/x11-apps/xfontsel-1.0.4
+++ b/metadata/md5-cache/x11-apps/xfontsel-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=point and click selection of X11 font names
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xfontsel-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=8e3276393e0bb16c27fbe18e94019cf4
diff --git a/metadata/md5-cache/x11-apps/xgamma-1.0.4 b/metadata/md5-cache/x11-apps/xgamma-1.0.4
index 3e7ed4cbc12c..5abf4b531edd 100644
--- a/metadata/md5-cache/x11-apps/xgamma-1.0.4
+++ b/metadata/md5-cache/x11-apps/xgamma-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXxf86vm x11-libs/libX11 x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXxf86vm x11-libs/libX11 x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Alter a monitor's gamma correction through the X server
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXxf86vm x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xgamma-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7c06d792b8dfee4e70e4dd4621f76c18
diff --git a/metadata/md5-cache/x11-apps/xgamma-1.0.5 b/metadata/md5-cache/x11-apps/xgamma-1.0.5
index 43c2a4499d78..de098b154cea 100644
--- a/metadata/md5-cache/x11-apps/xgamma-1.0.5
+++ b/metadata/md5-cache/x11-apps/xgamma-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXxf86vm x11-libs/libX11 x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXxf86vm x11-libs/libX11 x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Alter a monitor's gamma correction through the X server
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXxf86vm x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xgamma-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=91b4d91b28b8257e49d2fd7b34911ba7
diff --git a/metadata/md5-cache/x11-apps/xgc-1.0.3 b/metadata/md5-cache/x11-apps/xgc-1.0.3
index 2e9a0ee04fa3..826c6139df66 100644
--- a/metadata/md5-cache/x11-apps/xgc-1.0.3
+++ b/metadata/md5-cache/x11-apps/xgc-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X graphics demo
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xgc-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7164cc5e3d73a724486bc3e0977150e4
diff --git a/metadata/md5-cache/x11-apps/xgc-1.0.4 b/metadata/md5-cache/x11-apps/xgc-1.0.4
index e3612019ac86..c43f0aefb415 100644
--- a/metadata/md5-cache/x11-apps/xgc-1.0.4
+++ b/metadata/md5-cache/x11-apps/xgc-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X graphics demo
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xgc-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a749c47f3067d3f4960f0bc049ad45f9
diff --git a/metadata/md5-cache/x11-apps/xhost-1.0.4 b/metadata/md5-cache/x11-apps/xhost-1.0.4
index c67b061d4507..4fa6f7aa4c18 100644
--- a/metadata/md5-cache/x11-apps/xhost-1.0.4
+++ b/metadata/md5-cache/x11-apps/xhost-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXau || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXau || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Controls host and/or user access to a running X server.
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXau
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xhost-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=ded148184b0a111ed54a2f5468b8b800
diff --git a/metadata/md5-cache/x11-apps/xhost-1.0.5 b/metadata/md5-cache/x11-apps/xhost-1.0.5
index 809a03387bf0..ce3d5508007c 100644
--- a/metadata/md5-cache/x11-apps/xhost-1.0.5
+++ b/metadata/md5-cache/x11-apps/xhost-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXau || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXau || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Controls host and/or user access to a running X server.
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXau
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xhost-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4c95d2aa495dc526ae010b9ef07cbdee
diff --git a/metadata/md5-cache/x11-apps/xinit-1.3.0-r2 b/metadata/md5-cache/x11-apps/xinit-1.3.0-r2
index ef3f8ed5e910..1970455b84c1 100644
--- a/metadata/md5-cache/x11-apps/xinit-1.3.0-r2
+++ b/metadata/md5-cache/x11-apps/xinit-1.3.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X Window System initializer
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=x11-apps/xrdb !minimal? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x
 RDEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinit-1.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7963ed1b386e2dfbbe1ba2576eeb6a8e
diff --git a/metadata/md5-cache/x11-apps/xinit-1.3.1 b/metadata/md5-cache/x11-apps/xinit-1.3.1
index a6981c717349..e96be287e2df 100644
--- a/metadata/md5-cache/x11-apps/xinit-1.3.1
+++ b/metadata/md5-cache/x11-apps/xinit-1.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X Window System initializer
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=x11-apps/xrdb !minimal? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x
 RDEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinit-1.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=531281d5eca3984a04d1dbe03f929b87
diff --git a/metadata/md5-cache/x11-apps/xinit-1.3.1-r1 b/metadata/md5-cache/x11-apps/xinit-1.3.1-r1
index aa66a78ff201..df64b2523e68 100644
--- a/metadata/md5-cache/x11-apps/xinit-1.3.1-r1
+++ b/metadata/md5-cache/x11-apps/xinit-1.3.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X Window System initializer
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=x11-apps/xrdb !minimal? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x
 RDEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinit-1.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=00c8c603d42bc2586c82d7438e509b67
diff --git a/metadata/md5-cache/x11-apps/xinit-1.3.2 b/metadata/md5-cache/x11-apps/xinit-1.3.2
index 69bafc9823ee..21282ebd6b56 100644
--- a/metadata/md5-cache/x11-apps/xinit-1.3.2
+++ b/metadata/md5-cache/x11-apps/xinit-1.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X Window System initializer
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=x11-apps/xrdb !minimal? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x
 RDEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinit-1.3.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=69d117394e2b3f89406ee14eafd8dfbc
diff --git a/metadata/md5-cache/x11-apps/xinput-1.5.3 b/metadata/md5-cache/x11-apps/xinput-1.5.3
index 72d284b18e94..767b28841937 100644
--- a/metadata/md5-cache/x11-apps/xinput-1.5.3
+++ b/metadata/md5-cache/x11-apps/xinput-1.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.3 <x11-proto/inputproto-2.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.3 <x11-proto/inputproto-2.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Utility to set XInput device parameters
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinput-1.5.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=bafc5e3d78b8027ce6c661fe96a6a31a
diff --git a/metadata/md5-cache/x11-apps/xinput-1.5.3-r1 b/metadata/md5-cache/x11-apps/xinput-1.5.3-r1
index 34efbc067462..68a83b0b8fae 100644
--- a/metadata/md5-cache/x11-apps/xinput-1.5.3-r1
+++ b/metadata/md5-cache/x11-apps/xinput-1.5.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.4.5 >=x11-proto/inputproto-2.0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.4.5 >=x11-proto/inputproto-2.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Utility to set XInput device parameters
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.4.5
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinput-1.5.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=449941e5227eb394b5dde6e395d876c5
diff --git a/metadata/md5-cache/x11-apps/xinput-1.5.4 b/metadata/md5-cache/x11-apps/xinput-1.5.4
index 312aa2462547..fcfd03fa1341 100644
--- a/metadata/md5-cache/x11-apps/xinput-1.5.4
+++ b/metadata/md5-cache/x11-apps/xinput-1.5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.4.5 >=x11-proto/inputproto-2.0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.4.5 >=x11-proto/inputproto-2.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Utility to set XInput device parameters
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.4.5
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinput-1.5.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=f05c5910f618748b64cb8aaf0b2fbbc0
diff --git a/metadata/md5-cache/x11-apps/xinput-1.6.0 b/metadata/md5-cache/x11-apps/xinput-1.6.0
index 054946af47b2..3ae53dd348f5 100644
--- a/metadata/md5-cache/x11-apps/xinput-1.6.0
+++ b/metadata/md5-cache/x11-apps/xinput-1.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.5.99.1 x11-libs/libXinerama >=x11-proto/inputproto-2.1.99.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.5.99.1 x11-libs/libXinerama >=x11-proto/inputproto-2.1.99.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Utility to set XInput device parameters
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.5.99.1 x11-libs/libXinerama
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinput-1.6.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=70645300fe0f68863f126ce6614bc644
diff --git a/metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5 b/metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5
index 2ea2aebd959b..269f3669c18e 100644
--- a/metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5
+++ b/metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-proto/inputproto gtk? ( dev-cpp/gtkmm:2.4 )
 SLOT=0
 SRC_URI=mirror://github/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=90a23ab0bddb02760d8ac633dd51e743
diff --git a/metadata/md5-cache/x11-apps/xkbcomp-1.2.3 b/metadata/md5-cache/x11-apps/xkbcomp-1.2.3
index 94e1ff8ba044..c819a818722e 100644
--- a/metadata/md5-cache/x11-apps/xkbcomp-1.2.3
+++ b/metadata/md5-cache/x11-apps/xkbcomp-1.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libxkbfile sys-devel/bison || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libxkbfile sys-devel/bison || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=compile XKB keyboard description
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libxkbfile
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.2.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=9d699bb34a042aa5bbdcbd3bcf982ed5
diff --git a/metadata/md5-cache/x11-apps/xkbcomp-1.2.4 b/metadata/md5-cache/x11-apps/xkbcomp-1.2.4
index 67dde7781b08..7eadf97fb773 100644
--- a/metadata/md5-cache/x11-apps/xkbcomp-1.2.4
+++ b/metadata/md5-cache/x11-apps/xkbcomp-1.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libxkbfile sys-devel/bison || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libxkbfile sys-devel/bison || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=compile XKB keyboard description
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libxkbfile
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.2.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=59e8508ef8ef4daea3ffcbdce79d3153
diff --git a/metadata/md5-cache/x11-apps/xkbevd-1.1.2 b/metadata/md5-cache/x11-apps/xkbevd-1.1.2
index 29743d9c79f0..4d50a9c3e90b 100644
--- a/metadata/md5-cache/x11-apps/xkbevd-1.1.2
+++ b/metadata/md5-cache/x11-apps/xkbevd-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libxkbfile sys-devel/bison || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libxkbfile sys-devel/bison || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=XKB event daemon
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libxkbfile
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkbevd-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=21fc3c20957de46d7fb914fa22dcb19d
diff --git a/metadata/md5-cache/x11-apps/xkbevd-1.1.3 b/metadata/md5-cache/x11-apps/xkbevd-1.1.3
index e7018296906f..d9635d08c003 100644
--- a/metadata/md5-cache/x11-apps/xkbevd-1.1.3
+++ b/metadata/md5-cache/x11-apps/xkbevd-1.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libxkbfile sys-devel/bison || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libxkbfile sys-devel/bison || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=XKB event daemon
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libxkbfile
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkbevd-1.1.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=95544254706d14f4b6b69bef97e1443f
diff --git a/metadata/md5-cache/x11-apps/xkbprint-1.0.3 b/metadata/md5-cache/x11-apps/xkbprint-1.0.3
index 36fae7b4407b..a708934bb48a 100644
--- a/metadata/md5-cache/x11-apps/xkbprint-1.0.3
+++ b/metadata/md5-cache/x11-apps/xkbprint-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libxkbfile x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libxkbfile x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=print an XKB keyboard description
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libxkbfile x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkbprint-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=02b35a4cb2cc220f90f961e8ecc63da7
diff --git a/metadata/md5-cache/x11-apps/xkbutils-1.0.3 b/metadata/md5-cache/x11-apps/xkbutils-1.0.3
index 6360f10f835f..1f12097e1441 100644
--- a/metadata/md5-cache/x11-apps/xkbutils-1.0.3
+++ b/metadata/md5-cache/x11-apps/xkbutils-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw x11-proto/xproto x11-proto/inputproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw x11-proto/xproto x11-proto/inputproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xkbutils application
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkbutils-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=04439941e3419cc4e952fef83ee0e9bf
diff --git a/metadata/md5-cache/x11-apps/xkbutils-1.0.4 b/metadata/md5-cache/x11-apps/xkbutils-1.0.4
index 4e703bb76fb3..513b59f0a3b7 100644
--- a/metadata/md5-cache/x11-apps/xkbutils-1.0.4
+++ b/metadata/md5-cache/x11-apps/xkbutils-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw x11-proto/xproto x11-proto/inputproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw x11-proto/xproto x11-proto/inputproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xkbutils application
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkbutils-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=aad98131811373c1f9c2260c99cc8bf0
diff --git a/metadata/md5-cache/x11-apps/xkill-1.0.3 b/metadata/md5-cache/x11-apps/xkill-1.0.3
index 32434615e8d2..7c0917550cc4 100644
--- a/metadata/md5-cache/x11-apps/xkill-1.0.3
+++ b/metadata/md5-cache/x11-apps/xkill-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXmu || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=kill a client by its X resource
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkill-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=94c818fada6fefc8383076bae5c8615e
diff --git a/metadata/md5-cache/x11-apps/xload-1.1.0 b/metadata/md5-cache/x11-apps/xload-1.1.0
index e1d00ed8571c..8db4e7ba4711 100644
--- a/metadata/md5-cache/x11-apps/xload-1.1.0
+++ b/metadata/md5-cache/x11-apps/xload-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=system load average display for X
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xload-1.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6b37b36bd8a3b15c44caf536f7f15532
diff --git a/metadata/md5-cache/x11-apps/xload-1.1.1 b/metadata/md5-cache/x11-apps/xload-1.1.1
index c0d1c6dfbe9a..17616993fc91 100644
--- a/metadata/md5-cache/x11-apps/xload-1.1.1
+++ b/metadata/md5-cache/x11-apps/xload-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=system load average display for X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xload-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=be2fcc2ed6666d2b954aadcefd3c7981
diff --git a/metadata/md5-cache/x11-apps/xlogo-1.0.3 b/metadata/md5-cache/x11-apps/xlogo-1.0.3
index dc9ae07692b8..9fafc6d15419 100644
--- a/metadata/md5-cache/x11-apps/xlogo-1.0.3
+++ b/metadata/md5-cache/x11-apps/xlogo-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXrender x11-libs/libXext x11-libs/libXt x11-libs/libXft x11-libs/libXaw x11-libs/libSM x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXrender x11-libs/libXext x11-libs/libXt x11-libs/libXft x11-libs/libXaw x11-libs/libSM x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X Window System logo
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXrender x11-libs/libXext x11-libs/libXt x11-libs/libXft x11-libs/libXaw x11-libs/libSM x11-libs/libXmu x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlogo-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=05502aae677645b8d0ab67af26db015f
diff --git a/metadata/md5-cache/x11-apps/xlogo-1.0.4 b/metadata/md5-cache/x11-apps/xlogo-1.0.4
index 7dbe57b9835c..8854730a151c 100644
--- a/metadata/md5-cache/x11-apps/xlogo-1.0.4
+++ b/metadata/md5-cache/x11-apps/xlogo-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXrender x11-libs/libXext x11-libs/libXt x11-libs/libXft x11-libs/libXaw x11-libs/libSM x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXrender x11-libs/libXext x11-libs/libXt x11-libs/libXft x11-libs/libXaw x11-libs/libSM x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X Window System logo
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXrender x11-libs/libXext x11-libs/libXt x11-libs/libXft x11-libs/libXaw x11-libs/libSM x11-libs/libXmu x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlogo-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=54aec7a0fe5dd50cbb59ec47d4052b97
diff --git a/metadata/md5-cache/x11-apps/xlsatoms-1.1.0 b/metadata/md5-cache/x11-apps/xlsatoms-1.1.0
index 50ba85663df4..8ae8185adca9 100644
--- a/metadata/md5-cache/x11-apps/xlsatoms-1.1.0
+++ b/metadata/md5-cache/x11-apps/xlsatoms-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libxcb || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libxcb || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=list interned atoms defined on server
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libxcb
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlsatoms-1.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6bed074ae4d8962ad8ff26f1841a9e9c
diff --git a/metadata/md5-cache/x11-apps/xlsatoms-1.1.1 b/metadata/md5-cache/x11-apps/xlsatoms-1.1.1
index 34832b82aa52..d935c9e4f0fc 100644
--- a/metadata/md5-cache/x11-apps/xlsatoms-1.1.1
+++ b/metadata/md5-cache/x11-apps/xlsatoms-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libxcb || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libxcb || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=list interned atoms defined on server
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libxcb
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlsatoms-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=74131ea75eca7b42969eaeb22a614ce9
diff --git a/metadata/md5-cache/x11-apps/xlsclients-1.1.1 b/metadata/md5-cache/x11-apps/xlsclients-1.1.1
index f838e0f5de92..de3364e6d82a 100644
--- a/metadata/md5-cache/x11-apps/xlsclients-1.1.1
+++ b/metadata/md5-cache/x11-apps/xlsclients-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libxcb x11-libs/xcb-util || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libxcb x11-libs/xcb-util || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xlsclients application
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libxcb x11-libs/xcb-util
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlsclients-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=b2e34f01ef57c97929bdd60ca1d2c1bd
diff --git a/metadata/md5-cache/x11-apps/xlsclients-1.1.2 b/metadata/md5-cache/x11-apps/xlsclients-1.1.2
index 66e49cca6b0b..e55f6fa5c119 100644
--- a/metadata/md5-cache/x11-apps/xlsclients-1.1.2
+++ b/metadata/md5-cache/x11-apps/xlsclients-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libxcb-1.7 >=x11-libs/xcb-util-0.3.8 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libxcb-1.7 >=x11-libs/xcb-util-0.3.8 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xlsclients application
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.7 >=x11-libs/xcb-util-0.3.8
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlsclients-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=070cd315d548dfcd94ccbf9899348d9c
diff --git a/metadata/md5-cache/x11-apps/xlsfonts-1.0.3 b/metadata/md5-cache/x11-apps/xlsfonts-1.0.3
index ae6d512c0fcb..dce37c96fc36 100644
--- a/metadata/md5-cache/x11-apps/xlsfonts-1.0.3
+++ b/metadata/md5-cache/x11-apps/xlsfonts-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xlsfonts application
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlsfonts-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=03f59f464c06ed495ea7c0a865b96064
diff --git a/metadata/md5-cache/x11-apps/xlsfonts-1.0.4 b/metadata/md5-cache/x11-apps/xlsfonts-1.0.4
index b1c2edd95cee..3ff454f3f104 100644
--- a/metadata/md5-cache/x11-apps/xlsfonts-1.0.4
+++ b/metadata/md5-cache/x11-apps/xlsfonts-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xlsfonts application
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlsfonts-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=600409abecc387da80707a9f5c66ed67
diff --git a/metadata/md5-cache/x11-apps/xmag-1.0.4 b/metadata/md5-cache/x11-apps/xmag-1.0.4
index 07dd3d072fef..91ec535f4821 100644
--- a/metadata/md5-cache/x11-apps/xmag-1.0.4
+++ b/metadata/md5-cache/x11-apps/xmag-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xmag application
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xmag-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=cb5db16cf92eeffc242f92b815e4af1f
diff --git a/metadata/md5-cache/x11-apps/xmag-1.0.5 b/metadata/md5-cache/x11-apps/xmag-1.0.5
index e9a4774a60dd..f95f0261c522 100644
--- a/metadata/md5-cache/x11-apps/xmag-1.0.5
+++ b/metadata/md5-cache/x11-apps/xmag-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xmag application
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xmag-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=738174d97aaab65489c51984a44b39ec
diff --git a/metadata/md5-cache/x11-apps/xman-1.1.1 b/metadata/md5-cache/x11-apps/xman-1.1.1
index adf3c8a5db19..65cbe97b83e8 100644
--- a/metadata/md5-cache/x11-apps/xman-1.1.1
+++ b/metadata/md5-cache/x11-apps/xman-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Manual page display program for the X Window System
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xman-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7998999780848533f35fe8a5f3bf1898
diff --git a/metadata/md5-cache/x11-apps/xman-1.1.2 b/metadata/md5-cache/x11-apps/xman-1.1.2
index 93f4ecf5fb0c..6bb914ef62f7 100644
--- a/metadata/md5-cache/x11-apps/xman-1.1.2
+++ b/metadata/md5-cache/x11-apps/xman-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Manual page display program for the X Window System
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xman-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d58ec8930991a8378ba3a427dfcdbddd
diff --git a/metadata/md5-cache/x11-apps/xmessage-1.0.3 b/metadata/md5-cache/x11-apps/xmessage-1.0.3
index 023610173930..92a2298dcf09 100644
--- a/metadata/md5-cache/x11-apps/xmessage-1.0.3
+++ b/metadata/md5-cache/x11-apps/xmessage-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=display a message or query in a window (X-based /bin/echo)
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xmessage-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=aa47d9a0c1258fb8074f1ed70d8b5923
diff --git a/metadata/md5-cache/x11-apps/xmessage-1.0.4 b/metadata/md5-cache/x11-apps/xmessage-1.0.4
index 1f25c3a6d3bd..3e98c9ce0bdd 100644
--- a/metadata/md5-cache/x11-apps/xmessage-1.0.4
+++ b/metadata/md5-cache/x11-apps/xmessage-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=display a message or query in a window (X-based /bin/echo)
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xmessage-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=36a02e547e2ed98c231e4e31821aab3c
diff --git a/metadata/md5-cache/x11-apps/xmodmap-1.0.5 b/metadata/md5-cache/x11-apps/xmodmap-1.0.5
index 0a5044a45526..6a42d0b89f07 100644
--- a/metadata/md5-cache/x11-apps/xmodmap-1.0.5
+++ b/metadata/md5-cache/x11-apps/xmodmap-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=utility for modifying keymaps and pointer button mappings in X
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=37bb6f9f7e07efb3f370ade52673881e
diff --git a/metadata/md5-cache/x11-apps/xmodmap-1.0.6 b/metadata/md5-cache/x11-apps/xmodmap-1.0.6
index dfff54672ff0..dc60807a7782 100644
--- a/metadata/md5-cache/x11-apps/xmodmap-1.0.6
+++ b/metadata/md5-cache/x11-apps/xmodmap-1.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=utility for modifying keymaps and pointer button mappings in X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=94bb895e69b7f472555049f466cfb3df
diff --git a/metadata/md5-cache/x11-apps/xmodmap-1.0.7 b/metadata/md5-cache/x11-apps/xmodmap-1.0.7
index c7d88765d7dd..495f43303575 100644
--- a/metadata/md5-cache/x11-apps/xmodmap-1.0.7
+++ b/metadata/md5-cache/x11-apps/xmodmap-1.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=utility for modifying keymaps and pointer button mappings in X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=8d11f5fb3d778ff68fec66b6caaf5377
diff --git a/metadata/md5-cache/x11-apps/xmore-1.0.2 b/metadata/md5-cache/x11-apps/xmore-1.0.2
index be00ebd568be..b6cf27591669 100644
--- a/metadata/md5-cache/x11-apps/xmore-1.0.2
+++ b/metadata/md5-cache/x11-apps/xmore-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=plain text display program for the X Window System
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xmore-1.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7423b372efcdb2c946ea5830cbb0fad9
diff --git a/metadata/md5-cache/x11-apps/xpr-1.0.3 b/metadata/md5-cache/x11-apps/xpr-1.0.3
index df164c9dba81..87b906fae545 100644
--- a/metadata/md5-cache/x11-apps/xpr-1.0.3
+++ b/metadata/md5-cache/x11-apps/xpr-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=X.Org xpr application
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXmu x11-libs/libX11 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xpr-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=a9f78cf3013622583fdd18324eaf95e9
diff --git a/metadata/md5-cache/x11-apps/xpr-1.0.4 b/metadata/md5-cache/x11-apps/xpr-1.0.4
index 3dc5b0986ed8..47efd8380b58 100644
--- a/metadata/md5-cache/x11-apps/xpr-1.0.4
+++ b/metadata/md5-cache/x11-apps/xpr-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xpr application
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXmu x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xpr-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=48c4ad412692be4b3d9586883a46f501
diff --git a/metadata/md5-cache/x11-apps/xprop-1.2.0 b/metadata/md5-cache/x11-apps/xprop-1.2.0
index fcee22d953b7..a9762bc4ab29 100644
--- a/metadata/md5-cache/x11-apps/xprop-1.2.0
+++ b/metadata/md5-cache/x11-apps/xprop-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=property displayer for X
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xprop-1.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4890eb19b380696c9e3c988707b767f9
diff --git a/metadata/md5-cache/x11-apps/xprop-1.2.1 b/metadata/md5-cache/x11-apps/xprop-1.2.1
index d2d30c134875..78b135563a38 100644
--- a/metadata/md5-cache/x11-apps/xprop-1.2.1
+++ b/metadata/md5-cache/x11-apps/xprop-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 >=x11-proto/xproto-7.0.17 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 >=x11-proto/xproto-7.0.17 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=property displayer for X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xprop-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a4b25f9f6f95fd7adc45aed67dcadeeb
diff --git a/metadata/md5-cache/x11-apps/xrandr-1.3.5 b/metadata/md5-cache/x11-apps/xrandr-1.3.5
index bb6f94726232..0b0eb7464873 100644
--- a/metadata/md5-cache/x11-apps/xrandr-1.3.5
+++ b/metadata/md5-cache/x11-apps/xrandr-1.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libXrandr-1.3 x11-libs/libXrender x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libXrandr-1.3 x11-libs/libXrender x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=primitive command line interface to RandR extension
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrandr-1.3 x11-libs/libXrender x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xrandr-1.3.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=992320e1fbbe51367a0d9234317fd8b2
diff --git a/metadata/md5-cache/x11-apps/xrandr-1.4.0 b/metadata/md5-cache/x11-apps/xrandr-1.4.0
index 7bbd894ad425..ede98a331034 100644
--- a/metadata/md5-cache/x11-apps/xrandr-1.4.0
+++ b/metadata/md5-cache/x11-apps/xrandr-1.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libXrandr-1.4 x11-libs/libXrender x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libXrandr-1.4 x11-libs/libXrender x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=primitive command line interface to RandR extension
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrandr-1.4 x11-libs/libXrender x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xrandr-1.4.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=0120846ebd58906b5bec296901f7e4f3
diff --git a/metadata/md5-cache/x11-apps/xrdb-1.0.9 b/metadata/md5-cache/x11-apps/xrdb-1.0.9
index d0443ecc5700..5a963437521a 100644
--- a/metadata/md5-cache/x11-apps/xrdb-1.0.9
+++ b/metadata/md5-cache/x11-apps/xrdb-1.0.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X server resource database utility
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXmu x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xrdb-1.0.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=9b4314f3da9f9127b030ca82b83162b7
diff --git a/metadata/md5-cache/x11-apps/xrefresh-1.0.4 b/metadata/md5-cache/x11-apps/xrefresh-1.0.4
index 61c1912b4f63..c74ea13e0ad7 100644
--- a/metadata/md5-cache/x11-apps/xrefresh-1.0.4
+++ b/metadata/md5-cache/x11-apps/xrefresh-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=refresh all or part of an X screen
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xrefresh-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4d15e7c5ee862c2a6f5e1687cb926eb0
diff --git a/metadata/md5-cache/x11-apps/xset-1.2.1-r1 b/metadata/md5-cache/x11-apps/xset-1.2.1-r1
index 8e87de90e56e..4394922076ae 100644
--- a/metadata/md5-cache/x11-apps/xset-1.2.1-r1
+++ b/metadata/md5-cache/x11-apps/xset-1.2.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xset application
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXext
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xset-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a0de4b2ed6089df91ccd0dbcd0616a89
diff --git a/metadata/md5-cache/x11-apps/xset-1.2.2 b/metadata/md5-cache/x11-apps/xset-1.2.2
index 84372fac296d..e537a91974a3 100644
--- a/metadata/md5-cache/x11-apps/xset-1.2.2
+++ b/metadata/md5-cache/x11-apps/xset-1.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xset application
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXext
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xset-1.2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=2a4b477504bb918f04fca53bb2b4d115
diff --git a/metadata/md5-cache/x11-apps/xsetroot-1.1.0 b/metadata/md5-cache/x11-apps/xsetroot-1.1.0
index 69e683421705..f9adbaf45979 100644
--- a/metadata/md5-cache/x11-apps/xsetroot-1.1.0
+++ b/metadata/md5-cache/x11-apps/xsetroot-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXcursor || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXcursor || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xsetroot application
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXcursor
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xsetroot-1.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=56f1e434b4f1262572e611be7f98621e
diff --git a/metadata/md5-cache/x11-apps/xsetroot-1.1.1 b/metadata/md5-cache/x11-apps/xsetroot-1.1.1
index 2608afdc522b..94d4533724c5 100644
--- a/metadata/md5-cache/x11-apps/xsetroot-1.1.1
+++ b/metadata/md5-cache/x11-apps/xsetroot-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXcursor || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXcursor || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xsetroot application
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXcursor
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xsetroot-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=e5e3746d50ba0c416e7bdcbb982608df
diff --git a/metadata/md5-cache/x11-apps/xsm-1.0.2 b/metadata/md5-cache/x11-apps/xsm-1.0.2
index 0af1b2beb622..9a77e18d0855 100644
--- a/metadata/md5-cache/x11-apps/xsm-1.0.2
+++ b/metadata/md5-cache/x11-apps/xsm-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libXaw x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM rsh? ( net-misc/netkit-rsh ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM rsh? ( net-misc/netkit-rsh ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X Session Manager
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM rsh? ( net-misc/netkit-rsh )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xsm-1.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=e89ba5a6bfa1fd6f89752a3f8ac2eb2a
diff --git a/metadata/md5-cache/x11-apps/xsm-1.0.3 b/metadata/md5-cache/x11-apps/xsm-1.0.3
index ee9068b558b9..6b6e1e8b0b87 100644
--- a/metadata/md5-cache/x11-apps/xsm-1.0.3
+++ b/metadata/md5-cache/x11-apps/xsm-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libXaw x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM rsh? ( net-misc/netkit-rsh ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM rsh? ( net-misc/netkit-rsh ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X Session Manager
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM rsh? ( net-misc/netkit-rsh )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xsm-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=3f620b36768f7e7529a096322ebab473
diff --git a/metadata/md5-cache/x11-apps/xstdcmap-1.0.2 b/metadata/md5-cache/x11-apps/xstdcmap-1.0.2
index 8aff53cfaec8..9671e017a320 100644
--- a/metadata/md5-cache/x11-apps/xstdcmap-1.0.2
+++ b/metadata/md5-cache/x11-apps/xstdcmap-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X standard colormap utility
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXmu x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xstdcmap-1.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4bf3d1de809fa1534714f288bae2ea49
diff --git a/metadata/md5-cache/x11-apps/xstdcmap-1.0.3 b/metadata/md5-cache/x11-apps/xstdcmap-1.0.3
index eb24c2caffa7..6c42b0a01f29 100644
--- a/metadata/md5-cache/x11-apps/xstdcmap-1.0.3
+++ b/metadata/md5-cache/x11-apps/xstdcmap-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X standard colormap utility
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXmu x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xstdcmap-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=ce043ab4d5b2a4c6308be9c24330255a
diff --git a/metadata/md5-cache/x11-apps/xtrap-1.0.2 b/metadata/md5-cache/x11-apps/xtrap-1.0.2
index 763c9b58b940..f4ebe221c095 100644
--- a/metadata/md5-cache/x11-apps/xtrap-1.0.2
+++ b/metadata/md5-cache/x11-apps/xtrap-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=x11-libs/libX11 x11-libs/libXTrap x11-proto/trapproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=x11-libs/libX11 x11-libs/libXTrap x11-proto/trapproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=X.Org xtrap application
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXTrap !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xtrap-1.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=d123bcc4078122f3d7cff0fc564ddf1c
diff --git a/metadata/md5-cache/x11-apps/xtrap-1.0.2-r1 b/metadata/md5-cache/x11-apps/xtrap-1.0.2-r1
index 81c1323b3120..986f9995d987 100644
--- a/metadata/md5-cache/x11-apps/xtrap-1.0.2-r1
+++ b/metadata/md5-cache/x11-apps/xtrap-1.0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXTrap x11-proto/trapproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXTrap x11-proto/trapproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xtrap application
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXTrap
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xtrap-1.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4275be2febd1a553d4f6c11442fd470f
diff --git a/metadata/md5-cache/x11-apps/xvidtune-1.0.2-r1 b/metadata/md5-cache/x11-apps/xvidtune-1.0.2-r1
index 0082f37e8b41..b09881fc8482 100644
--- a/metadata/md5-cache/x11-apps/xvidtune-1.0.2-r1
+++ b/metadata/md5-cache/x11-apps/xvidtune-1.0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXxf86vm x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXxf86vm x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=video mode tuner for Xorg
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xvidtune-1.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=abfcee5a598f776c557220bfa53a424a
diff --git a/metadata/md5-cache/x11-apps/xvidtune-1.0.3 b/metadata/md5-cache/x11-apps/xvidtune-1.0.3
index 2c5843866936..2282a4238db0 100644
--- a/metadata/md5-cache/x11-apps/xvidtune-1.0.3
+++ b/metadata/md5-cache/x11-apps/xvidtune-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXxf86vm x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXxf86vm x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=video mode tuner for Xorg
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xvidtune-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=b7905b1de86556be5b3688d1b6c543de
diff --git a/metadata/md5-cache/x11-apps/xvinfo-1.1.1 b/metadata/md5-cache/x11-apps/xvinfo-1.1.1
index 452b80a57e62..fd3fc6f3fd68 100644
--- a/metadata/md5-cache/x11-apps/xvinfo-1.1.1
+++ b/metadata/md5-cache/x11-apps/xvinfo-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXv x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXv x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Print out X-Video extension adaptor information
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXv x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xvinfo-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=f9a4a37368e0aae3c9966ef964e321ef
diff --git a/metadata/md5-cache/x11-apps/xvinfo-1.1.2 b/metadata/md5-cache/x11-apps/xvinfo-1.1.2
index f0ac7f9cdce5..258511c1f5ed 100644
--- a/metadata/md5-cache/x11-apps/xvinfo-1.1.2
+++ b/metadata/md5-cache/x11-apps/xvinfo-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXv x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXv x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Print out X-Video extension adaptor information
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXv x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xvinfo-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7d460e8d567be4d10130805cda9221f9
diff --git a/metadata/md5-cache/x11-apps/xwd-1.0.4 b/metadata/md5-cache/x11-apps/xwd-1.0.4
index ff3849c1bb3e..22d553001e19 100644
--- a/metadata/md5-cache/x11-apps/xwd-1.0.4
+++ b/metadata/md5-cache/x11-apps/xwd-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=dump an image of an X window
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xwd-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=8f1834e447c8f8beaae104b8103f619e
diff --git a/metadata/md5-cache/x11-apps/xwd-1.0.5 b/metadata/md5-cache/x11-apps/xwd-1.0.5
index ba0c44927a59..b51d3f3e8d44 100644
--- a/metadata/md5-cache/x11-apps/xwd-1.0.5
+++ b/metadata/md5-cache/x11-apps/xwd-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libxkbfile x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libxkbfile x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=dump an image of an X window
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xwd-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a933defac103b9888460a4b13b01403e
diff --git a/metadata/md5-cache/x11-apps/xwininfo-1.1.1 b/metadata/md5-cache/x11-apps/xwininfo-1.1.1
index a7042098dfb3..9dd156a4317f 100644
--- a/metadata/md5-cache/x11-apps/xwininfo-1.1.1
+++ b/metadata/md5-cache/x11-apps/xwininfo-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libxcb-1.6 x11-libs/libX11 >=x11-proto/xproto-7.0.17 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libxcb-1.6 x11-libs/libX11 >=x11-proto/xproto-7.0.17 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=window information utility for X
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.6
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xwininfo-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5e159dd4a059d92bf385ca0588a7efd0
diff --git a/metadata/md5-cache/x11-apps/xwininfo-1.1.2 b/metadata/md5-cache/x11-apps/xwininfo-1.1.2
index f38d7d14b1df..f16ff0d62f9f 100644
--- a/metadata/md5-cache/x11-apps/xwininfo-1.1.2
+++ b/metadata/md5-cache/x11-apps/xwininfo-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libxcb-1.6 x11-libs/libX11 >=x11-proto/xproto-7.0.17 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libxcb-1.6 x11-libs/libX11 >=x11-proto/xproto-7.0.17 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=window information utility for X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.6
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xwininfo-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d6d1fcdab963f323d308150fa887a94f
diff --git a/metadata/md5-cache/x11-apps/xwud-1.0.3 b/metadata/md5-cache/x11-apps/xwud-1.0.3
index f3f13357fdad..7a20e0494c98 100644
--- a/metadata/md5-cache/x11-apps/xwud-1.0.3
+++ b/metadata/md5-cache/x11-apps/xwud-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=image displayer for X
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xwud-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=72ffec609fecc4d04f4da1196ab28287
diff --git a/metadata/md5-cache/x11-apps/xwud-1.0.4 b/metadata/md5-cache/x11-apps/xwud-1.0.4
index 16e85c937c62..084b470d6186 100644
--- a/metadata/md5-cache/x11-apps/xwud-1.0.4
+++ b/metadata/md5-cache/x11-apps/xwud-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=image displayer for X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xwud-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=8c5dd2a69a2c0d8b4fcdd1a66358f8e1
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.10.6-r2 b/metadata/md5-cache/x11-base/xorg-server-1.10.6-r2
index ded87fe4ffdf..153c2c73ea61 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.10.6-r2
+++ b/metadata/md5-cache/x11-base/xorg-server-1.10.6-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-4.0.3 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-4.1 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.11 >=x11-proto/inputproto-1.9.99.902 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.17 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.3 >=x11-libs/libdrm-2.4.20 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-4.0.3 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-4.1 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.11 >=x11-proto/inputproto-1.9.99.902 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.17 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.3 >=x11-libs/libdrm-2.4.20 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org X servers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -11,5 +11,5 @@ RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=
 REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
 SLOT=0/1.10.6
 SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.10.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=af275be1203d6545f3e0d0aea8de3f8d
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.11.4-r2 b/metadata/md5-cache/x11-base/xorg-server-1.11.4-r2
index d3ebcfb8355b..ea18fd8a070e 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.11.4-r2
+++ b/metadata/md5-cache/x11-base/xorg-server-1.11.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver ) sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.14 >=x11-proto/inputproto-1.9.99.902 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.6 >=x11-libs/libdrm-2.4.20 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver ) sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.14 >=x11-proto/inputproto-1.9.99.902 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.6 >=x11-libs/libdrm-2.4.20 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org X servers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -11,5 +11,5 @@ RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=
 REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
 SLOT=0/1.11.4
 SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.11.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=58b16df3fa95e08fb8dbc1271c760764
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.12.4-r1 b/metadata/md5-cache/x11-base/xorg-server-1.12.4-r1
index d16e27b75a23..0846b392bf37 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.12.4-r1
+++ b/metadata/md5-cache/x11-base/xorg-server-1.12.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend test unpack
-DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver ) sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.14 >=x11-proto/inputproto-2.1.99.3 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.6 >=x11-libs/libdrm-2.4.20 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver ) sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.14 >=x11-proto/inputproto-2.1.99.3 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.6 >=x11-libs/libdrm-2.4.20 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org X servers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -11,5 +11,5 @@ RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=
 REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
 SLOT=0/1.12.4
 SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.12.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4351c3045279f7c54e46e7ebfd5edc80
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.13.4 b/metadata/md5-cache/x11-base/xorg-server-1.13.4
index a22c77fed025..b9a235a41fd0 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.13.4
+++ b/metadata/md5-cache/x11-base/xorg-server-1.13.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend test unpack
-DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.20 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-8[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver ) sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.16 >=x11-proto/inputproto-2.1.99.3 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.4.0 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.2.0 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.8 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.20 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-8[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver ) sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.16 >=x11-proto/inputproto-2.1.99.3 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.4.0 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.2.0 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.8 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org X servers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -11,5 +11,5 @@ RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=
 REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
 SLOT=0/1.13.4
 SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.13.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=998cdc9b215838cbfca29f89f6740ac6
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.14.1 b/metadata/md5-cache/x11-base/xorg-server-1.14.1
index bb147baf2769..332e56f78a05 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.14.1
+++ b/metadata/md5-cache/x11-base/xorg-server-1.14.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend test unpack
-DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.20 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-8[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver ) sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.16 >=x11-proto/inputproto-2.2.99.1 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.4.0 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.2.0 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.8 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.20 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-8[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver ) sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.16 >=x11-proto/inputproto-2.2.99.1 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.4.0 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.2.0 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.8 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org X servers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -11,5 +11,5 @@ RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=
 REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
 SLOT=0/1.14.1
 SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.14.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=8d8f99bc1a10471d6cb58e7b7cd18342
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.9.5-r2 b/metadata/md5-cache/x11-base/xorg-server-1.9.5-r2
index e53425a7c51d..dc6238f96854 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.9.5-r2
+++ b/metadata/md5-cache/x11-base/xorg-server-1.9.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.15.20 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.5 >=x11-libs/libXfixes-4.0.3 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.3 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) udev? ( >=virtual/udev-150 ) sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-4.1 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.11 >=x11-proto/inputproto-1.9.99.902 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.0.99.3 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.17 dmx? ( >=x11-proto/dmxproto-2.2.99.1 ) doc? ( >=app-doc/doxygen-1.6.1 app-text/xmlto ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.3 >=x11-libs/libdrm-2.4.20 ) >=x11-apps/xinit-1.3 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.15.20 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.5 >=x11-libs/libXfixes-4.0.3 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.3 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) udev? ( >=virtual/udev-150 ) sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-4.1 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.11 >=x11-proto/inputproto-1.9.99.902 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.0.99.3 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.17 dmx? ( >=x11-proto/dmxproto-2.2.99.1 ) doc? ( >=app-doc/doxygen-1.6.1 app-text/xmlto ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.3 >=x11-libs/libdrm-2.4.20 ) >=x11-apps/xinit-1.3 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org X servers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.9 )
 RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.15.20 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.5 >=x11-libs/libXfixes-4.0.3 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.3 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) udev? ( >=virtual/udev-150 )
 SLOT=0/1.9.5
 SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.9.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d8dcd7c2ab5d170bbc770bfb242a1171
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-acecad-1.4.0 b/metadata/md5-cache/x11-drivers/xf86-input-acecad-1.4.0
index eef5f7644f40..cdf3a59d2e06 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-acecad-1.4.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-acecad-1.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99.901 x11-proto/inputproto x11-proto/randrproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99.901 x11-proto/inputproto x11-proto/randrproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=Acecad Flair input driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99.901 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-acecad-1.4.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=4cc3b7e05dccf64d399c88363bec1c08
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-acecad-1.5.0 b/metadata/md5-cache/x11-drivers/xf86-input-acecad-1.5.0
index 733db740820d..3065fc2f9c7c 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-acecad-1.5.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-acecad-1.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Acecad Flair input driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-acecad-1.5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a3512e971277a0a65ec86f93be162f7e
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.3.1 b/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.3.1
index 12f8b63edd9d..acaace01d147 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.3.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/inputproto x11-proto/randrproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/inputproto x11-proto/randrproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Aiptek USB Digital Tablet Input Driver for Linux
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-aiptek-1.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=386c5a6ad838077f05f512567754bf8a
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.0 b/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.0
index cba12875513f..42687eb281e0 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Aiptek USB Digital Tablet Input Driver for Linux
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-aiptek-1.4.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=57214a70b95580cc30f1d145f40d3ff5
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.1 b/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.1
index e6ced2219ff4..9ecb9faf718b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Aiptek USB Digital Tablet Input Driver for Linux
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-aiptek-1.4.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=8890bdca96abeb66f19c61c83a8cfdb7
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-citron-2.2.2 b/metadata/md5-cache/x11-drivers/xf86-input-citron-2.2.2
index 6d6eab64b7c0..c673430e4cef 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-citron-2.2.2
+++ b/metadata/md5-cache/x11-drivers/xf86-input-citron-2.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.6 >=x11-proto/inputproto-1.4.1 x11-proto/randrproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.6 >=x11-proto/inputproto-1.4.1 x11-proto/randrproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=X.Org driver for citron input devices
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-citron-2.2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=60172d06059ca674affd9a50c26b4861
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.2.4 b/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.2.4
index db9da66b8f17..6971ba6ec481 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.2.4
+++ b/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/inputproto x11-proto/randrproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/inputproto x11-proto/randrproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Elographics input driver
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elographics-1.2.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=98f529fc8739d106f8aa7e772fbe162e
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.3.0 b/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.3.0
index 09dc50db614d..f22aa89808f0 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.3.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Elographics input driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elographics-1.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=faaf10fd39c311680029091db3d02a64
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.0 b/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.0
index d712d9aa041f..dc9267cdebe2 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Elographics input driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elographics-1.4.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=71dc812f74100dcca1f979a678742df5
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.1 b/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.1
index bcd2db49eb17..ad7790b49809 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Elographics input driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elographics-1.4.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4c5b430655c520615b08a0526d2a4395
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.6.0 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.6.0
index 6deb8e579385..b95532fd35ce 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.6.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.6.3 >=sys-kernel/linux-headers-2.6 x11-proto/inputproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=x11-base/xorg-server-1.6.3 >=sys-kernel/linux-headers-2.6 x11-proto/inputproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Generic Linux input driver
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6.3 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.6.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a4cc1e4d96904e8fe0f123b90ed336ba
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3
index b444eaa298ab..cdbefc79f1f9 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3
+++ b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev >=x11-proto/inputproto-2.1.99.3 >=sys-kernel/linux-headers-2.6 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev >=x11-proto/inputproto-2.1.99.3 >=sys-kernel/linux-headers-2.6 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Generic Linux input driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.7.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=3a9f6689da481a67c1c5065609ca46d8
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3-r1 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3-r1
index 1da006d5ed7b..9242a82e3b0d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev >=x11-proto/inputproto-2.1.99.3 >=sys-kernel/linux-headers-2.6 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev >=x11-proto/inputproto-2.1.99.3 >=sys-kernel/linux-headers-2.6 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Generic Linux input driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.7.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=2c608fc34d2d69a5dd0b1c1eea7da3bc
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.8.0 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.8.0
index 4046afbdc402..b17e70f6880b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.8.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.12[udev] sys-libs/mtdev >=x11-proto/inputproto-2.1.99.3 >=sys-kernel/linux-headers-2.6 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=x11-base/xorg-server-1.12[udev] sys-libs/mtdev >=x11-proto/inputproto-2.1.99.3 >=sys-kernel/linux-headers-2.6 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Generic Linux input driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.12[udev] sys-libs/mtdev x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.8.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=1cbe51a2a9375bc2869ae3cd8e4df594
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-fpit-1.3.0-r1 b/metadata/md5-cache/x11-drivers/xf86-input-fpit-1.3.0-r1
index b5b6355fe02d..35f79f122937 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-fpit-1.3.0-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-fpit-1.3.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/inputproto x11-proto/randrproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/inputproto x11-proto/randrproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=Fujitsu Stylistic input driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-fpit-1.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=bbf5d6811ca86a877a135439bfa3709e
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-fpit-1.4.0 b/metadata/md5-cache/x11-drivers/xf86-input-fpit-1.4.0
index e51d2d036fed..076e84bd87af 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-fpit-1.4.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-fpit-1.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Fujitsu Stylistic input driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-fpit-1.4.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=e3b66083af414c631a0e0f711a48741f
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-hyperpen-1.3.0 b/metadata/md5-cache/x11-drivers/xf86-input-hyperpen-1.3.0
index b43774288f3c..ffe9fe89429b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-hyperpen-1.3.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-hyperpen-1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/inputproto x11-proto/randrproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/inputproto x11-proto/randrproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=X.Org driver for hyperpen input devices
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-hyperpen-1.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=6cf815577e1143530b76dc38553b1cb5
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-hyperpen-1.4.1 b/metadata/md5-cache/x11-drivers/xf86-input-hyperpen-1.4.1
index b62f2c024af5..70e7f62278f0 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-hyperpen-1.4.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-hyperpen-1.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=X.Org driver for hyperpen input devices
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-hyperpen-1.4.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=af9bdf6251e151ec18a61aa07e89cd21
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.1 b/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.1
index 70db5573962d..77b557b29760 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.10 x11-proto/inputproto x11-proto/kbproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=x11-base/xorg-server-1.10 x11-proto/inputproto x11-proto/kbproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=X.Org driver for joystick input devices
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.10 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.6.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=fd25c9db5edd24e1918c7875c8c6833c
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.2 b/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.2
index ba03c16d9ec5..8c34d67b1fdf 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.2
+++ b/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.10 x11-proto/inputproto x11-proto/kbproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=x11-base/xorg-server-1.10 x11-proto/inputproto x11-proto/kbproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=X.Org driver for joystick input devices
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.10 x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=3d86b07846a2557ba679c6df69fe4646
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.6.2 b/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.6.2
index 85ef1ff13d5b..39bf18800d47 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.6.2
+++ b/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.6.3 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=x11-base/xorg-server-1.6.3 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Keyboard input driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6.3 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.6.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=aa3bc0ccc648770b5e4dd868af80963c
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.7.0 b/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.7.0
index b3373f1d4739..7a673736d1ee 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.7.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.6.3 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=x11-base/xorg-server-1.6.3 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Keyboard input driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6.3 x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.7.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=31a7b32d0561f18876ed930eef58f662
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.8.1 b/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.8.1
index a700a8a42f2a..65eb0a92546e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.8.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.7 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=x11-base/xorg-server-1.7 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=X.Org driver for mouse input devices
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.7 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.8.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=49f043bc82ba471ee34b0b34626e15cc
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.9.0 b/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.9.0
index 2efc59756436..b58e4e0d6544 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.9.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.7 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=x11-base/xorg-server-1.7 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=X.Org driver for mouse input devices
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.7 x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.9.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=92a05eef47d3a9e6bcf4ebf581aa5010
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.1.1-r1 b/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.1.1-r1
index 53fd117ae249..53231b5425a3 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.1.1-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.1.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=sys-libs/mtdev-1.0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=sys-libs/mtdev-1.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Xorg Driver for Multitouch Trackpads
 EAPI=4
 HOMEPAGE=https://github.com/BlueDragonX/xf86-input-mtrack
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/mtdev-1.0 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://github.com/BlueDragonX/xf86-input-mtrack/tarball/v0.1.1 -> xf86-input-mtrack-0.1.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=ff69ffb6ec094b860256430d1fce883c
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.2.0 b/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.2.0
index a9702f740507..b914acbc7f5b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.2.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=sys-libs/mtdev-1.0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=sys-libs/mtdev-1.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Xorg Driver for Multitouch Trackpads
 EAPI=4
 HOMEPAGE=https://github.com/BlueDragonX/xf86-input-mtrack
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/mtdev-1.0 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://github.com/BlueDragonX/xf86-input-mtrack/tarball/v0.2.0 -> xf86-input-mtrack-0.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=17022345a1f93c64526aa8d543d1adee
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.3.0 b/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.3.0
index 3ef0ffe11b23..51e22df42c9f 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.3.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=sys-libs/mtdev-1.0 x11-proto/randrproto x11-proto/videoproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=sys-libs/mtdev-1.0 x11-proto/randrproto x11-proto/videoproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Xorg Driver for Multitouch Trackpads
 EAPI=4
 HOMEPAGE=https://github.com/BlueDragonX/xf86-input-mtrack
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/mtdev-1.0 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://github.com/BlueDragonX/xf86-input-mtrack/tarball/v0.3.0 -> xf86-input-mtrack-0.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=cb49e890f02094bbef3916a52f3a61f8
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mutouch-1.2.1 b/metadata/md5-cache/x11-drivers/xf86-input-mutouch-1.2.1
index d403e589d9e8..9e4909d5f764 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-mutouch-1.2.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-mutouch-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/inputproto x11-proto/randrproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/inputproto x11-proto/randrproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=Microtouch input driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mutouch-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=2d2a999ddc48b97d314f7405232ab9e0
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mutouch-1.3.0 b/metadata/md5-cache/x11-drivers/xf86-input-mutouch-1.3.0
index ff1c524bd722..d02bfd3c2d1f 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-mutouch-1.3.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-mutouch-1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Microtouch input driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mutouch-1.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=96812820e2a6fd330395b879ac814add
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-penmount-1.4.1 b/metadata/md5-cache/x11-drivers/xf86-input-penmount-1.4.1
index eb8e4a341c54..8fe0dc07a7cc 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-penmount-1.4.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-penmount-1.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-proto/inputproto-1.4.1 x11-proto/randrproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-proto/inputproto-1.4.1 x11-proto/randrproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=PenMount input driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-penmount-1.4.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=38810715be17aa904de1b3c20d2879b4
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-penmount-1.5.0 b/metadata/md5-cache/x11-drivers/xf86-input-penmount-1.5.0
index 9e7842deffe1..7000efbd4f69 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-penmount-1.5.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-penmount-1.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=PenMount input driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-penmount-1.5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7b55bd09abe4c61065ed0809de8c9890
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.4.0 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.4.0
index 154225c6064a..77f7d6b34aaf 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.4.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=<x11-base/xorg-server-1.11.99 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-proto/inputproto >=x11-proto/recordproto-1.14 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=<x11-base/xorg-server-1.11.99 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-proto/inputproto >=x11-proto/recordproto-1.14 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Driver for Synaptics touchpads
 EAPI=4
 HOMEPAGE=http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=<x11-base/xorg-server-1.11.99 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.4.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=473430dc9644d1f30b0206f04e4eadd5
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.5.2 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.5.2
index 9f540a461712..10b400e5014a 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.5.2
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=x11-base/xorg-server-1.8 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 >=x11-proto/recordproto-1.14 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=x11-base/xorg-server-1.8 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 >=x11-proto/recordproto-1.14 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Driver for Synaptics touchpads
 EAPI=4
 HOMEPAGE=http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.8 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.5.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=05565746efad783106bc5391ca2835e9
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.6.2-r1 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.6.2-r1
index 7552a6be989c..38e583faa926 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.6.2-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.6.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-libs/mtdev >=x11-base/xorg-server-1.8 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 >=sys-kernel/linux-headers-2.6.37 >=x11-proto/recordproto-1.14 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=sys-libs/mtdev >=x11-base/xorg-server-1.8 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 >=sys-kernel/linux-headers-2.6.37 >=x11-proto/recordproto-1.14 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Driver for Synaptics touchpads
 EAPI=4
 HOMEPAGE=http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/mtdev >=x11-base/xorg-server-1.8 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.6.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=fdfd8393372a0963dac80f01bd5735a7
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.6.3 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.6.3
index c2e22454e22d..8fe58660ab9e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.6.3
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.6.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-libs/mtdev >=x11-base/xorg-server-1.8 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 >=sys-kernel/linux-headers-2.6.37 >=x11-proto/recordproto-1.14 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=sys-libs/mtdev >=x11-base/xorg-server-1.8 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 >=sys-kernel/linux-headers-2.6.37 >=x11-proto/recordproto-1.14 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Driver for Synaptics touchpads
 EAPI=5
 HOMEPAGE=http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/mtdev >=x11-base/xorg-server-1.8 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.6.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=3f800dacf2188beee34dffd0a77d24ac
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.7.0 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.7.0
index 24f1b570d722..64ce5e7ef237 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.7.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-libs/mtdev >=x11-base/xorg-server-1.12 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 >=sys-kernel/linux-headers-2.6.37 >=x11-proto/inputproto-2.1.99.3 >=x11-proto/recordproto-1.14 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=sys-libs/mtdev >=x11-base/xorg-server-1.12 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 >=sys-kernel/linux-headers-2.6.37 >=x11-proto/inputproto-2.1.99.3 >=x11-proto/recordproto-1.14 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Driver for Synaptics touchpads
 EAPI=5
 HOMEPAGE=http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/mtdev >=x11-base/xorg-server-1.12 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.7.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=8163646888364eadf4f0aab6fcf6e66d
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-tslib-0.0.6-r2 b/metadata/md5-cache/x11-drivers/xf86-input-tslib-0.0.6-r2
index f82b35ab3f02..15551d3e951f 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-tslib-0.0.6-r2
+++ b/metadata/md5-cache/x11-drivers/xf86-input-tslib-0.0.6-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/tslib x11-proto/randrproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=x11-libs/tslib x11-proto/randrproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=xorg input driver for use of tslib based touchscreen devices
 EAPI=4
 HOMEPAGE=http://www.pengutronix.de/software/xf86-input-tslib/index_en.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/tslib x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=ftp://cdn.debian.net/debian/pool/main/x/xf86-input-tslib/xf86-input-tslib_0.0.6-3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=938a95a2479eb3711b8c794f20cf978e
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-12.9.0 b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-12.9.0
index ea7dc463037e..0dba51c1bb03 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-12.9.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-12.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-proto/randrproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=x11-proto/randrproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=VMWare mouse input driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-vmmouse-12.9.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=e9eaf755576123ed6fb5c95a665d4237
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.0.0 b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.0.0
index 89f975a83954..db16a7733807 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.0.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-proto/randrproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=x11-proto/randrproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=VMWare mouse input driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=1c1b1b8577884ba8e67341d6e3dc1d94
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-void-1.3.1 b/metadata/md5-cache/x11-drivers/xf86-input-void-1.3.1
index 4fc4cbbaaddb..a3e4f80bedde 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-void-1.3.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-void-1.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-server x11-proto/inputproto x11-proto/randrproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=x11-base/xorg-server x11-proto/inputproto x11-proto/randrproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=null input driver
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-void-1.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=f40179b00e563999a504341a2287b704
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.0 b/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.0
index 5935a431aea4..69a898e2cea5 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.9.99.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=x11-base/xorg-server-1.9.99.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=null input driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.9.99.1 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-void-1.4.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=1937bec485dcbc0e58ac51f87ddb5fbf
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.17.0 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.17.0
index 5b53ae879c28..c357b4d0da2c 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.17.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.17.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-proto/randrproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-proto/randrproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Driver for Wacom tablets and drawing devices
 EAPI=4
 HOMEPAGE=http://linuxwacom.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.17.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=ad4069d947a3a0a36abfa4132119fef3
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.18.0 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.18.0
index 28c51447bbab..e140aef0ded8 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.18.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.18.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-proto/randrproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-proto/randrproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Driver for Wacom tablets and drawing devices
 EAPI=4
 HOMEPAGE=http://linuxwacom.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.18.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=8648c54959b368ac45aeeecaa0f6d221
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.19.0 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.19.0
index 4f6ef3a279e0..e37bf179f553 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.19.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.19.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-proto/randrproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-proto/randrproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Driver for Wacom tablets and drawing devices
 EAPI=4
 HOMEPAGE=http://linuxwacom.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.19.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=c75f2d0b0c31688fa1f3001b228396bb
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.20.0 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.20.0
index 633437dad29c..c725cce1c1ef 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.20.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.20.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-proto/randrproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-proto/randrproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=Driver for Wacom tablets and drawing devices
 EAPI=5
 HOMEPAGE=http://linuxwacom.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.20.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=572037d22b2b60b2c60b434534dbba02
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.4 b/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.4
index 2f0c260faf56..8d19f5f1fbcf 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Alliance ProMotion video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-apm-1.2.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=e263adf71e2da72f3e67949e62708069
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5 b/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5
index 7c6f10da1cf0..4722d7fbfef4 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Alliance ProMotion video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-apm-1.2.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=3262cd242241d701982707eac3377970
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5-r1 b/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5-r1
index 416ef9638598..acf3ffca8f09 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Alliance ProMotion video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-apm-1.2.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=e6bc54ae0a45c3fde83408c6aa1cbd83
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.3 b/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.3
index 687aacca5289..5fb57fb26c73 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for ark cards
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ark-0.7.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=eb2c662ee128b6f9c7e37e0162b135fd
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.4 b/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.4
index 80d0b8ca6628..01b4c946ea12 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-libs/libpciaccess-0.12.901 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-libs/libpciaccess-0.12.901 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for ark cards
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ark-0.7.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=2d3d1d577d2239d46ba70ca9068170d7
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.5 b/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.5
index fdf68ca476a3..41e3db021748 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-libs/libpciaccess-0.12.901 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-libs/libpciaccess-0.12.901 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for ark cards
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ark-0.7.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=2affea1fcad73c302cf8052aa55dda79
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ast-0.96.0 b/metadata/md5-cache/x11-drivers/xf86-video-ast-0.96.0
index 178fdc3e20ce..6802fafbc670 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ast-0.96.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ast-0.96.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for ASpeedTech cards
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ast-0.96.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7a6a089014c33f67fe281d2c5ba248d3
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ast-0.97.0 b/metadata/md5-cache/x11-drivers/xf86-video-ast-0.97.0
index b8266f47cb5e..afae29377aa2 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ast-0.97.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ast-0.97.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for ASpeedTech cards
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ast-0.97.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=f8c757f67790e41a68d732e5dd599fc7
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ast-0.97.0-r1 b/metadata/md5-cache/x11-drivers/xf86-video-ast-0.97.0-r1
index 694e86c40b69..ea32a5083bcc 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ast-0.97.0-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ast-0.97.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for ASpeedTech cards
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ast-0.97.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=31bad619026f8f9de4822b7fd619ccdb
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.13.2 b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.13.2
index f6bef2cb67fb..b2ccdcccd64c 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.13.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.13.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.6.3[-minimal] || ( <x11-libs/libdrm-2.4.22 x11-libs/libdrm[video_cards_radeon] ) x11-proto/fontsproto x11-proto/glproto x11-proto/randrproto x11-proto/videoproto x11-proto/xextproto x11-proto/xf86driproto x11-proto/xf86miscproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.6.3[-minimal] || ( <x11-libs/libdrm-2.4.22 x11-libs/libdrm[video_cards_radeon] ) x11-proto/fontsproto x11-proto/glproto x11-proto/randrproto x11-proto/videoproto x11-proto/xextproto x11-proto/xf86driproto x11-proto/xf86miscproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=ATI video driver
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6.3[-minimal] x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.13.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=f095eb564d4ef435a414b3fb72a0676e
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.3-r1 b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.3-r1
index 16b723b5d288..b4b0983c580f 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.3-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libdrm[video_cards_radeon] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=x11-libs/libdrm[video_cards_radeon] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=ATI video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libdrm[video_cards_radeon] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.14.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=cc568779c6e071b0d5c86e9eb75031a0
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.6-r1 b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.6-r1
index f90f422c40f7..ee6f38d90874 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.6-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libdrm-2.4.36[video_cards_radeon] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-libs/libdrm-2.4.36[video_cards_radeon] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=ATI video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.36[video_cards_radeon] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.14.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a8263852e90b49cb17a732b46faa0a48
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-7.0.0 b/metadata/md5-cache/x11-drivers/xf86-video-ati-7.0.0
index 8a26d4bb630d..36bc7eea6c65 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-7.0.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-7.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libdrm-2.4.36[video_cards_radeon] glamor? ( x11-libs/glamor ) udev? ( virtual/udev ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-libs/libdrm-2.4.36[video_cards_radeon] glamor? ( x11-libs/glamor ) udev? ( virtual/udev ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=ATI video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.36[video_cards_radeon] glamor? ( x11-libs/glamor ) udev? ( virtual/udev ) x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-7.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=da1d7660fc12aa41b49647bebaeb37ae
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-7.0.0-r1 b/metadata/md5-cache/x11-drivers/xf86-video-ati-7.0.0-r1
index 4865ba45fbc1..978f91676677 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-7.0.0-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-7.0.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libdrm-2.4.36[video_cards_radeon] glamor? ( x11-libs/glamor ) udev? ( virtual/udev ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-libs/libdrm-2.4.36[video_cards_radeon] glamor? ( x11-libs/glamor ) udev? ( virtual/udev ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=ATI video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.36[video_cards_radeon] glamor? ( x11-libs/glamor ) udev? ( virtual/udev ) x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-7.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=1bbf7460376876a99d117f0201303b05
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-7.1.0 b/metadata/md5-cache/x11-drivers/xf86-video-ati-7.1.0
index de808d77d09f..6ab1f47c9440 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-7.1.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-7.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=x11-libs/libdrm-2.4.36[video_cards_radeon] glamor? ( x11-libs/glamor ) udev? ( virtual/udev ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-libs/libdrm-2.4.36[video_cards_radeon] glamor? ( x11-libs/glamor ) udev? ( virtual/udev ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=ATI video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.36[video_cards_radeon] glamor? ( x11-libs/glamor ) udev? ( virtual/udev ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-7.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=44d7ff64f5b9bf96ee6bff72f768d497
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.4 b/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.4
index ba2e8bb7a8cf..f8a2563bcc23 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Chips and Technologies video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-chips-1.2.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5ddd3acdbe3eae9c6d57712e97a64fa7
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.5 b/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.5
index 8596226ccf88..88947ce2dfc6 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Chips and Technologies video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-chips-1.2.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=001932ceba2d4db31bad59b7fc9f12ad
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.5-r1 b/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.5-r1
index 79971952b86f..be23e8147ca3 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.5-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Chips and Technologies video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-chips-1.2.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=2320d3293215f8c55fb24ce5c3309a72
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.1 b/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.1
index 151312357e72..e427a08bdab7 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Cirrus Logic video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-cirrus-1.5.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=c6062bb1e9d690bc450be75db6f1a781
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.2 b/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.2
index f18499777445..d106b69e5d59 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Cirrus Logic video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=dba757e7d448f52c5d87ad9563ebf414
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-cyrix-1.1.0 b/metadata/md5-cache/x11-drivers/xf86-video-cyrix-1.1.0
index 3ebaed65a932..042555440294 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-cyrix-1.1.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-cyrix-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=Cyrix video driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-cyrix-1.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=668d52abc0962a473ffd10b4418e5adb
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.6 b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.6
index f8deb2709845..d59ec2aba0d2 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.6
+++ b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 dga? ( x11-proto/xf86dgaproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 dga? ( x11-proto/xf86dgaproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for dummy cards
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-0.3.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6a0fd7619935f6b29c06e1564b9b8b44
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.6-r1 b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.6-r1
index 9e012613684f..f3bcbe6ebe30 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.6-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 dga? ( x11-proto/xf86dgaproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 dga? ( x11-proto/xf86dgaproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for dummy cards
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-0.3.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=2cdecf24c78b9d038d6d526acbcb03d9
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.4.3 b/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.4.3
index 0e49ac13096e..4170824c5974 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.4.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-server x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=x11-base/xorg-server x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=video driver for framebuffer device
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-fbdev-0.4.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=aa4392ed8f880528919364e4483e363b
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.4.3-r1 b/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.4.3-r1
index c7769fcdc984..45b1d5b05bcb 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.4.3-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.4.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-server x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=x11-base/xorg-server x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=video driver for framebuffer device
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-fbdev-0.4.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7691352aab630ed27ff026fd30079f83
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.14 b/metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.14
index 54fae0a650ce..eedbd2e011f1 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.14
+++ b/metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=ztv? ( sys-kernel/linux-headers ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=ztv? ( sys-kernel/linux-headers ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=AMD Geode GX2 and LX video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-2.11.14.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=f18f3b6a393665fb5a250fc86d9fe56b
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.7 b/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.7
index 8a9c57a3c9b1..3993a5a72388 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.7
+++ b/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/videoproto x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/videoproto x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=GLINT/Permedia video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-glint-1.2.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=1d7ceb1aac1c87c22f6988150e2066b5
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.8 b/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.8
index 782b2cd4ded0..69c7632e3f7b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.8
+++ b/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/videoproto x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/videoproto x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=GLINT/Permedia video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-glint-1.2.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=68605c09381beed846c36e06fcec3cd3
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.8-r1 b/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.8-r1
index 5cb213c5ceb6..905fff8d0a37 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.8-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/videoproto x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/videoproto x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=GLINT/Permedia video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-glint-1.2.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=0242315d087b85f605c60a3e07a18466
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.5 b/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.5
index b2d4fcfe7862..280b3b9944c2 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Number 9 I128 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i128-1.3.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=761fb6f25f1d0389a39caa6279237cae
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.6 b/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.6
index d4b2fcd61860..1dfd026faf60 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.6
+++ b/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Number 9 I128 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i128-1.3.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=3dc725bf529cf3a72b560ee8d3055471
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.6-r1 b/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.6-r1
index 96e07bd4cc35..78cec9cdd079 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.6-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Number 9 I128 video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i128-1.3.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=89d74ca6428e3e71c60a044f8dc9420d
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.3 b/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.3
index de0dbaad8019..f4f39bac977a 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Intel i740 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i740-1.3.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=b2aa743628afb64c1b873762c0fa3af4
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.4 b/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.4
index e265b718f855..ec5471084681 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Intel i740 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i740-1.3.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7cd567debc437ca13ca3a09cccc00bcc
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.4-r1 b/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.4-r1
index 7df67aa35c7d..4c25ffa129c4 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.4-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Intel i740 video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i740-1.3.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=0127eabeff876d3207bd077e48620f1d
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-impact-0.2.0 b/metadata/md5-cache/x11-drivers/xf86-video-impact-0.2.0
index 58fc87557e6a..13da59e93f6e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-impact-0.2.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-impact-0.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=Impact video driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-impact-0.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=7e9254041dd66ee0d571e9edfd2e33af
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.19.0 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.19.0
index 07cee8b3c7be..688ae0252023 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.19.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.19.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=<x11-base/xorg-server-1.13.49 x11-libs/libXext x11-libs/libXfixes x11-libs/libXvMC >=x11-libs/libxcb-1.5 >=x11-libs/pixman-0.24 x11-libs/xcb-util >=x11-libs/libdrm-2.4.29[video_cards_intel] glamor? ( x11-libs/glamor ) sna? ( >=x11-base/xorg-server-1.10 ) >=x11-proto/dri2proto-2.6 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=<x11-base/xorg-server-1.13.49 x11-libs/libXext x11-libs/libXfixes x11-libs/libXvMC >=x11-libs/libxcb-1.5 >=x11-libs/pixman-0.24 x11-libs/xcb-util >=x11-libs/libdrm-2.4.29[video_cards_intel] glamor? ( x11-libs/glamor ) sna? ( >=x11-base/xorg-server-1.10 ) >=x11-proto/dri2proto-2.6 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for Intel cards
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=<x11-base/xorg-server-1.13.49 x11-libs/libXext x11-libs/libXfixes x11-libs/libXvMC >=x11-libs/libxcb-1.5 >=x11-libs/pixman-0.24 x11-libs/xcb-util >=x11-libs/libdrm-2.4.29[video_cards_intel] glamor? ( x11-libs/glamor ) sna? ( >=x11-base/xorg-server-1.10 ) dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.19.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a52ed018fc638e8902c676a7bbcb97bc
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.20.13 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.20.13
index 13f2118d0fa9..1a7643ba6d71 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.20.13
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.20.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.29[video_cards_intel] glamor? ( x11-libs/glamor ) sna? ( >=x11-base/xorg-server-1.10 ) udev? ( virtual/udev ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) >=x11-proto/dri2proto-2.6 x11-proto/resourceproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.29[video_cards_intel] glamor? ( x11-libs/glamor ) sna? ( >=x11-base/xorg-server-1.10 ) udev? ( virtual/udev ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) >=x11-proto/dri2proto-2.6 x11-proto/resourceproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for Intel cards
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/
 REQUIRED_USE=|| ( glamor sna uxa )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.20.13.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5a15ec7c0a17ce99f11097d357c18d52
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.21.3 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.21.3
index fc426dba4524..ea1f56ff7938 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.21.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.21.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.29[video_cards_intel] glamor? ( x11-libs/glamor ) sna? ( >=x11-base/xorg-server-1.10 ) udev? ( virtual/udev ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) >=x11-proto/dri2proto-2.6 x11-proto/resourceproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.29[video_cards_intel] glamor? ( x11-libs/glamor ) sna? ( >=x11-base/xorg-server-1.10 ) udev? ( virtual/udev ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) >=x11-proto/dri2proto-2.6 x11-proto/resourceproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for Intel cards
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/
 REQUIRED_USE=|| ( glamor sna uxa )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.21.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=535ab6f5ed261dc89f3e77d3810bb13c
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.21.4 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.21.4
index 706cd50dea5c..bdd44eb9ada4 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.21.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.21.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.29[video_cards_intel] glamor? ( x11-libs/glamor ) sna? ( >=x11-base/xorg-server-1.10 ) udev? ( virtual/udev ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) >=x11-proto/dri2proto-2.6 x11-proto/resourceproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.29[video_cards_intel] glamor? ( x11-libs/glamor ) sna? ( >=x11-base/xorg-server-1.10 ) udev? ( virtual/udev ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) >=x11-proto/dri2proto-2.6 x11-proto/resourceproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for Intel cards
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/
 REQUIRED_USE=|| ( glamor sna uxa )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.21.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=ca5f3853118ee7e0e11dd3585a19e708
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.21.5 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.21.5
index 1d91ad51b49e..88b7c0841be7 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.21.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.21.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.29[video_cards_intel] glamor? ( x11-libs/glamor ) sna? ( >=x11-base/xorg-server-1.10 ) udev? ( virtual/udev ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) >=x11-proto/dri2proto-2.6 x11-proto/resourceproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.29[video_cards_intel] glamor? ( x11-libs/glamor ) sna? ( >=x11-base/xorg-server-1.10 ) udev? ( virtual/udev ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) >=x11-proto/dri2proto-2.6 x11-proto/resourceproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for Intel cards
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/
 REQUIRED_USE=|| ( glamor sna uxa )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.21.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a1efa97645ee4a13c6ec398aaa4b7562
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.21.6 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.21.6
index 4a5847a7cc18..f8a0fe2b0898 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.21.6
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.21.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.29[video_cards_intel] glamor? ( x11-libs/glamor ) sna? ( >=x11-base/xorg-server-1.10 ) udev? ( virtual/udev ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) >=x11-proto/dri2proto-2.6 x11-proto/resourceproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.29[video_cards_intel] glamor? ( x11-libs/glamor ) sna? ( >=x11-base/xorg-server-1.10 ) udev? ( virtual/udev ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) >=x11-proto/dri2proto-2.6 x11-proto/resourceproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for Intel cards
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/
 REQUIRED_USE=|| ( glamor sna uxa )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.21.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=3a5446ac814519bb19be9c09d8393651
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.9.1 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.9.1
index 24baa0f25479..5a262de957ef 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.9.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DEPEND=>=x11-base/xorg-server-1.6 <x11-libs/libdrm-2.4.21 x11-libs/libpciaccess x11-libs/libXext x11-libs/libXfixes x11-libs/libXvMC >=x11-proto/dri2proto-1.99.3 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xineramaproto x11-proto/xextproto x11-proto/xproto dri? ( x11-proto/xf86driproto x11-proto/glproto ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.6 <x11-libs/libdrm-2.4.21 x11-libs/libpciaccess x11-libs/libXext x11-libs/libXfixes x11-libs/libXvMC >=x11-proto/dri2proto-1.99.3 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xineramaproto x11-proto/xextproto x11-proto/xproto dri? ( x11-proto/xf86driproto x11-proto/glproto ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=X.Org driver for Intel cards
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dri debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 <x11-libs/libdrm-2.4.21 x11-libs/libpciaccess x11-libs/libXext x11-libs/libXfixes x11-libs/libXvMC !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.9.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=540889a0ac377c20747ea192b0dc3ae6
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ivtv-1.1.2 b/metadata/md5-cache/x11-drivers/xf86-video-ivtv-1.1.2
index 029bba40ecee..096da587e5f6 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ivtv-1.1.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ivtv-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for TV-out on ivtvdev cards
 EAPI=4
 HOMEPAGE=http://ivtvdriver.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://dl.ivtvdriver.org/xf86-video-ivtv/xf86-video-ivtv-1.1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=bcb7a83ac70721e2b27b6bac85f32b60
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ivtv-1.1.2-r1 b/metadata/md5-cache/x11-drivers/xf86-video-ivtv-1.1.2-r1
index cf751905198b..276d6b446949 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ivtv-1.1.2-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ivtv-1.1.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for TV-out on ivtvdev cards
 EAPI=4
 HOMEPAGE=http://ivtvdriver.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://dl.ivtvdriver.org/xf86-video-ivtv/xf86-video-ivtv-1.1.2.tar.gz mirror://gentoo/xf86-video-ivtv-1.1.2-r1.patch.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d3c3bdbcb56521a005672a6304d79921
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.8.2 b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.8.2
index 51f25e50bebd..8252f6451f1e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.8.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DEPEND=>=x11-base/xorg-server-1.2 !<x11-drivers/xf86-video-ati-6.9 x11-proto/fontsproto x11-proto/randrproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xf86miscproto x11-proto/xproto dri? ( x11-proto/glproto x11-proto/xf86driproto >=x11-libs/libdrm-2 ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.2 !<x11-drivers/xf86-video-ati-6.9 x11-proto/fontsproto x11-proto/randrproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xf86miscproto x11-proto/xproto dri? ( x11-proto/glproto x11-proto/xf86driproto >=x11-libs/libdrm-2 ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=ATI Mach64 video driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dri debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.2 !<x11-drivers/xf86-video-ati-6.9 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.8.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=fbfa429f9c112f9ea9e4cbebc12fcf84
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.0 b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.0
index a73abcf365f0..1390ce6cf527 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=ATI Mach64 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.10 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.9.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=416ec0a39c4f26f70a1ab5e58da5be60
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.1 b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.1
index 64d191232e58..d2e02c024b99 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.10 >=x11-libs/libpciaccess-0.12.901 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.10 >=x11-libs/libpciaccess-0.12.901 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=ATI Mach64 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.10 >=x11-libs/libpciaccess-0.12.901 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.9.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=2a7dc5424b564613d34181cf0a4cd6fd
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.2 b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.2
index 27f0e08c8efb..5132952f636d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.10 >=x11-libs/libpciaccess-0.12.901 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.10 >=x11-libs/libpciaccess-0.12.901 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=ATI Mach64 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.10 >=x11-libs/libpciaccess-0.12.901 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.9.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=de51484c7dd7edee7a7b32a082daec98
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.3 b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.3
index 484da0477e9c..b3f68f714109 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.10 >=x11-libs/libpciaccess-0.12.901 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.10 >=x11-libs/libpciaccess-0.12.901 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=ATI Mach64 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.10 >=x11-libs/libpciaccess-0.12.901 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.9.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=03d8796c76c040a22d4fe673965232c2
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.4 b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.4
index b88b54ffb842..9991bb306c84 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.10 >=x11-libs/libpciaccess-0.12.901 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.10 >=x11-libs/libpciaccess-0.12.901 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=ATI Mach64 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.10 >=x11-libs/libpciaccess-0.12.901 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.9.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=f70d7490feaca022e9dc27b3ce77075f
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.4.13 b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.4.13
index c6a04daddad3..cb02f0558a4d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.4.13
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.4.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=<x11-base/xorg-server-1.12.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xproto dri? ( x11-proto/xf86driproto x11-proto/glproto >=x11-libs/libdrm-2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=<x11-base/xorg-server-1.12.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xproto dri? ( x11-proto/xf86driproto x11-proto/glproto >=x11-libs/libdrm-2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Matrox video driver
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=<x11-base/xorg-server-1.12.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.4.13.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=165423031e778dbb29d68368905bc8be
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.5.0 b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.5.0
index 8a08f860d97b..f660932e7a7c 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.5.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=<x11-base/xorg-server-1.12.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=<x11-base/xorg-server-1.12.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Matrox video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=<x11-base/xorg-server-1.12.99 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=0f11b66473bed64db0b58a2d1a35c55c
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.0 b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.0
index dd08d2062a24..78ad89609d3c 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=<x11-base/xorg-server-1.12.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=<x11-base/xorg-server-1.12.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Matrox video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=<x11-base/xorg-server-1.12.99 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.6.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=bc8d166b540000e57157ede6a3133615
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.1 b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.1
index 4320c5e95044..2f7fb65ff468 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=<x11-base/xorg-server-1.12.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=<x11-base/xorg-server-1.12.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Matrox video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=<x11-base/xorg-server-1.12.99 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.6.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=bba25f852c1f31ec2006275f8a3d01ab
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.2 b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.2
index 201dd2754eb1..673565186646 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=<x11-base/xorg-server-1.13.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=<x11-base/xorg-server-1.13.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Matrox video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=<x11-base/xorg-server-1.13.99 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.6.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d609aa47bb6d3039bc15dfd7b3286993
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.5.0 b/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.5.0
index 3897492cceb7..e2149e2d84fa 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.5.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Unaccelerated generic driver for kernel modesetting
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-modesetting-0.5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=945e4e0d630842a360eed227f73c1c24
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.6.0 b/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.6.0
index 4cef0b305247..599cdb870de0 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.6.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Unaccelerated generic driver for kernel modesetting
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-modesetting-0.6.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4bc036f27dada3621b09570f35317a14
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.7.0 b/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.7.0
index 22e3195e62af..7019c4eb3c6a 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.7.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Unaccelerated generic driver for kernel modesetting
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-modesetting-0.7.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=521034f59716974ce8c171c90757f0e0
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.5 b/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.5
index cfd72e4722f6..4a5bee0e5dfa 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=<x11-base/xorg-server-1.12.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=<x11-base/xorg-server-1.12.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Neomagic video driver
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=<x11-base/xorg-server-1.12.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-1.2.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d756718c08a3ae467a814f59a1d5699b
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.6 b/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.6
index b964a801f133..b0fd6384b0ea 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.6
+++ b/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=<x11-base/xorg-server-1.12.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=<x11-base/xorg-server-1.12.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Neomagic video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=<x11-base/xorg-server-1.12.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-1.2.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4e8f18fd13453b67963eb45ed5cd212c
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.7 b/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.7
index ca2c6afbe6af..3603af405a27 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.7
+++ b/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=<x11-base/xorg-server-1.12.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=<x11-base/xorg-server-1.12.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Neomagic video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=<x11-base/xorg-server-1.12.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-1.2.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a840e634a4c532f7fa0093db8c0b6165
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.3 b/metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.3
index cd05d59fb8f9..ea7aca95f202 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Newport video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-newport-0.2.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=b944cfa4c2d6b29457bda3edffed1882
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.4 b/metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.4
index c3adf36800e6..1e63ee7eff14 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Newport video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-newport-0.2.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=f8884cbb6b84e1c59e9de9dcad6fc67d
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120322 b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120322
index 72ad3bc802cd..571e26564bea 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120322
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120322
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libdrm-2.4.24[video_cards_nouveau] <x11-libs/libdrm-2.4.34[video_cards_nouveau] x11-proto/glproto x11-proto/xf86driproto x11-proto/dri2proto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-libs/libdrm-2.4.24[video_cards_nouveau] <x11-libs/libdrm-2.4.34[video_cards_nouveau] x11-proto/glproto x11-proto/xf86driproto x11-proto/dri2proto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Accelerated Open Source driver for nVidia cards
 EAPI=4
 HOMEPAGE=http://nouveau.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.24[video_cards_nouveau] <x11-libs/libdrm-2.4.34[video_cards_nouveau] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=mirror://gentoo/xf86-video-nouveau-0.0.16_pre20120322.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=2b52c3584fcd4597d6020a4aa6a55f95
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.4 b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.4
index ac4a87494b1b..542fcee16bf2 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libdrm-2.4.34[video_cards_nouveau] x11-proto/glproto x11-proto/xf86driproto x11-proto/dri2proto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-libs/libdrm-2.4.34[video_cards_nouveau] x11-proto/glproto x11-proto/xf86driproto x11-proto/dri2proto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Accelerated Open Source driver for nVidia cards
 EAPI=4
 HOMEPAGE=http://nouveau.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.34[video_cards_nouveau] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nouveau-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=fd9606d474e0cc14cb570de8ea00506f
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.6 b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.6
index e7dc91931d2e..225e072b2cd3 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.6
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libdrm-2.4.34[video_cards_nouveau] x11-proto/glproto x11-proto/xf86driproto x11-proto/dri2proto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-libs/libdrm-2.4.34[video_cards_nouveau] x11-proto/glproto x11-proto/xf86driproto x11-proto/dri2proto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Accelerated Open Source driver for nVidia cards
 EAPI=4
 HOMEPAGE=http://nouveau.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.34[video_cards_nouveau] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nouveau-1.0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=02df32c0ce5b1b68a8753aa1025e48ad
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.7 b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.7
index 1fb84f69fb9c..9509e5c74050 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.7
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libdrm-2.4.34[video_cards_nouveau] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-libs/libdrm-2.4.34[video_cards_nouveau] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Accelerated Open Source driver for nVidia cards
 EAPI=5
 HOMEPAGE=http://nouveau.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.34[video_cards_nouveau] x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nouveau-1.0.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=50bfb8659b03f61e652b1201d692a148
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nsc-2.8.3 b/metadata/md5-cache/x11-drivers/xf86-video-nsc-2.8.3
index 3f8afd93cad3..ca7588c3face 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nsc-2.8.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nsc-2.8.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=Nsc video driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nsc-2.8.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=da6d6b6ed60a1ee7a30c66d6300353a9
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.18 b/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.18
index 0d6fadcb9d42..5bc55e8c825d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.18
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-server x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=x11-base/xorg-server x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Nvidia 2D only video driver
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.18.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=79580171c95b002743f8da54fcd06365
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.20 b/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.20
index 02b73365e1e3..9296200ca11b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.20
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-server >=x11-libs/libpciaccess-0.10.7 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=x11-base/xorg-server >=x11-libs/libpciaccess-0.10.7 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Nvidia 2D only video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server >=x11-libs/libpciaccess-0.10.7 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.20.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=aae30d03e401811b24d8b0efcf3003f2
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.20-r1 b/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.20-r1
index e744816019d7..37aa8d04f97e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.20-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.20-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-server >=x11-libs/libpciaccess-0.10.7 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=x11-base/xorg-server >=x11-libs/libpciaccess-0.10.7 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Nvidia 2D only video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server >=x11-libs/libpciaccess-0.10.7 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.20.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=56a3e0099c2fc01ecb4323ca8ada5861
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.2 b/metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.2
index 19df9f5467e9..ccbc5a708b39 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.3 >=x11-libs/libdrm-2.4.36[video_cards_omap] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.3 >=x11-libs/libdrm-2.4.36[video_cards_omap] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=OMAP video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.3 >=x11-libs/libdrm-2.4.36[video_cards_omap] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-omap-0.4.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5b2fce63c6db25a379935885fb92b6e5
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.3 b/metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.3
index 48cbdcb4d88b..bfe5268f48e5 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.3 >=x11-libs/libdrm-2.4.36[video_cards_omap] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.3 >=x11-libs/libdrm-2.4.36[video_cards_omap] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=OMAP video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.3 >=x11-libs/libdrm-2.4.36[video_cards_omap] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-omap-0.4.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5505b039f895034368cfe2ac9395af15
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-omapfb-0.1.1_p3 b/metadata/md5-cache/x11-drivers/xf86-video-omapfb-0.1.1_p3
index cea25b2253c9..d90296effdff 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-omapfb-0.1.1_p3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-omapfb-0.1.1_p3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.org driver for TI OMAP framebuffers
 EAPI=3
 HOMEPAGE=http://gitweb.pingu.fi/?p=xf86-video-omapfb.git;a=tree
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xf86-video-omapfb/xf86-video-omapfb_0.1.1-3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=76da7170401287404a57532b4d216ebb
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.3.1 b/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.3.1
index aab4dce23660..da9e1d306b90 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.3.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.9 x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-libs/libXvMC x11-libs/libdrm || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.9 x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-libs/libXvMC x11-libs/libdrm || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for VIA/S3G cards
 EAPI=4
 HOMEPAGE=http://www.openchrome.org
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.9 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://www.openchrome.org/releases/xf86-video-openchrome-0.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=197366b3baf4dd149951131c4102d658
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.3.2 b/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.3.2
index aff6152b1cbd..225dea0a5629 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.3.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.9 x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-libs/libXvMC x11-libs/libdrm || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.9 x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-libs/libXvMC x11-libs/libdrm || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for VIA/S3G cards
 EAPI=5
 HOMEPAGE=http://www.openchrome.org
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.9 x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://www.openchrome.org/releases/xf86-video-openchrome-0.3.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6136e37cf120b3167f64ce3e86af3e74
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.0 b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.0
index 0762a6d32a34..2e257297de10 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=xspice? ( app-emulation/spice ) x11-base/xorg-server[-minimal] x11-proto/xf86dgaproto >=app-emulation/spice-protocol-0.12.0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=xspice? ( app-emulation/spice ) x11-base/xorg-server[-minimal] x11-proto/xf86dgaproto >=app-emulation/spice-protocol-0.12.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=QEMU QXL paravirt video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=xspice? ( app-emulation/spice ) x11-base/xorg-server[-minimal] x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-qxl-0.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7ba95ee98fa3831136bbfe520dcdd4d1
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.0-r1 b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.0-r1
index c382dbbdf976..77af43bc116e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.0-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=xspice? ( app-emulation/spice ) x11-base/xorg-server[-minimal] x11-proto/xf86dgaproto >=app-emulation/spice-protocol-0.12.0 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=xspice? ( app-emulation/spice ) x11-base/xorg-server[-minimal] x11-proto/xf86dgaproto >=app-emulation/spice-protocol-0.12.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=QEMU QXL paravirt video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=xspice? ( app-emulation/spice ) x11-base/xorg-server[-minimal] x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-qxl-0.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=1a9696cb6015ad472800c5a8adb94d8d
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.1 b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.1
index 3a10da6b2621..60d6d3ff322d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DEPEND=>=x11-base/xorg-server-1.2 !<x11-drivers/xf86-video-ati-6.9 x11-proto/fontsproto x11-proto/randrproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xf86miscproto x11-proto/xproto dri? ( x11-proto/glproto x11-proto/xf86driproto >=x11-libs/libdrm-2 ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.2 !<x11-drivers/xf86-video-ati-6.9 x11-proto/fontsproto x11-proto/randrproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xf86miscproto x11-proto/xproto dri? ( x11-proto/glproto x11-proto/xf86driproto >=x11-libs/libdrm-2 ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=ATI Rage128 video driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dri debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.2 !<x11-drivers/xf86-video-ati-6.9 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.8.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=fb002c6c01db05a5e2094d990d15962c
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.2-r1 b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.2-r1
index c9911658b84e..6a0da41f04a4 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.2-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=ATI Rage128 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.2 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.8.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4990f9f01dc87b8703542aeaa46d703e
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.3 b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.3
index 4babb894c8f3..42cbc7f0a346 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=ATI Rage128 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.2 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.8.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=ee8be617c96ff226512fbeca4f6ed76f
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.4 b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.4
index 102cd5dff02b..5a95ed5fb4db 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=ATI Rage128 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.2 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.8.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=2e543a22ae0a0b53e8d53f30b5439bbd
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.9.1 b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.9.1
index 57963d84a938..498e9385492e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.9.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=ATI Rage128 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.2 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.9.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=cb981f82f905fb4d6549a4a87503f485
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.4 b/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.4
index aa4b20900653..5cf27cc99bda 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Rendition video driver
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-rendition-4.2.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=48f2b13c0f471caba0b385a00af85d4b
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.5 b/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.5
index 7c8127513d1c..797d14eb2500 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Rendition video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-rendition-4.2.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=c3eed9e2dfc21f9913b78dd526f4e7d0
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.5-r1 b/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.5-r1
index 47195ae05497..0b467f49c4dc 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.5-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Rendition video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-rendition-4.2.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=964cfedf0671c3304b6a4f2835cb4e80
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.3 b/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.3
index bcae8311a296..b9c303af1a02 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=X.Org driver for s3 cards
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3-0.6.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=8389fa70aab8e56d2d6de0361085ad82
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.4 b/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.4
index d59046911c25..57a2b2399019 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for s3 cards
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3-0.6.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=43f7430560e3e5b3476cbe99c613c7cf
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.5 b/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.5
index 26991555e847..4b388de440ca 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for s3 cards
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3-0.6.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=09e71925b85800001138ddf5986e6446
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.4 b/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.4
index bdc28d24c7c1..cbca740249eb 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=S3 ViRGE video driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3virge-1.10.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=3af88c5922ad5804106ede448c895879
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.5 b/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.5
index 77be0630dd6c..30de2d2ac8bb 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=S3 ViRGE video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3virge-1.10.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=07cd341c6affe3ca10351220d6468787
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.6 b/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.6
index 37b110be37a8..47bdff3b140b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.6
+++ b/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=S3 ViRGE video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3virge-1.10.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=601119da1daa8f6b2e849295b6d798ee
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.3-r1 b/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.3-r1
index 2c3669e8ac48..98c376a938a7 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.3-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-proto/xextproto-7.0.99.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-proto/xextproto-7.0.99.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=S3 Savage video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-savage-2.3.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=14d17c7cae359f75e197a6ac8dafcbc7
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.4-r1 b/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.4-r1
index f0b746b0e6e6..2e2cc9901a02 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.4-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-proto/xextproto-7.0.99.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-proto/xextproto-7.0.99.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=S3 Savage video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-savage-2.3.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=79ed6470059d6dea6883e5dc6492bf26
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.5 b/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.5
index 5c89ee1419ba..358d24c412f1 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-proto/xextproto-7.0.99.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-proto/xextproto-7.0.99.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=S3 Savage video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-savage-2.3.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=eaa96c636d9523f0e5d9690237a31fd7
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.6 b/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.6
index 669e58316407..3892102a7bde 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.6
+++ b/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-proto/xextproto-7.0.99.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-proto/xextproto-7.0.99.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=S3 Savage video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-savage-2.3.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=e53d68bebd4bd476d2d5f7ba69ad6272
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.5 b/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.5
index d341109afc65..6b298d73cfc5 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Silicon Motion video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-siliconmotion-1.7.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=b65ebc1d91827adc947f0c25c018436f
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.6 b/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.6
index d7d23fdf6401..e5f7ff2a6531 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.6
+++ b/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Silicon Motion video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-siliconmotion-1.7.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=fddcc3996dc837f08da74d127cb403a7
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.7 b/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.7
index 09d2e08e56c4..43cc6352571f 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.7
+++ b/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Silicon Motion video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-siliconmotion-1.7.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5170560e2119f471362795515f2ae9aa
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.3 b/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.3
index e6c9919d2994..36a86e32b07f 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dri? ( x11-base/xorg-server[-minimal] ) !dri? ( x11-base/xorg-server ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xf86miscproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-proto/xf86driproto >=x11-libs/libdrm-2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=dri? ( x11-base/xorg-server[-minimal] ) !dri? ( x11-base/xorg-server ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xf86miscproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-proto/xf86driproto >=x11-libs/libdrm-2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=SiS and XGI video driver
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dri? ( x11-base/xorg-server[-minimal] ) !dri? ( x11-base/xorg-server ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.10.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=070b91a9ce073034b83706d1291cba23
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.4-r1 b/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.4-r1
index 4d884248c1b4..12625e4c1f55 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.4-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-proto/xf86dgaproto-2.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-proto/xf86dgaproto-2.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=SiS and XGI video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.10.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=13c146b8ce11e228858f2fdf2925edc1
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.6 b/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.6
index 6e29a9a34e4e..c62a6f03fcad 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.6
+++ b/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-proto/xf86dgaproto-2.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-proto/xf86dgaproto-2.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=SiS and XGI video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.10.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=3ac7f56cb05ed01492a7718966e0222d
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.7 b/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.7
index 5496b7dd1939..ecb1bb0463e7 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.7
+++ b/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-proto/xf86dgaproto-2.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-proto/xf86dgaproto-2.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=SiS and XGI video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.10.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=224d7372b33bd166343d506dd5e93326
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.5 b/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.5
index a6d884b0db1d..6676c0f7f75e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.6 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.6 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=SiS USB video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sisusb-0.9.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=427a17cba731a7dedc814021c8de08fe
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.6 b/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.6
index 8a5a9ca6c4ea..ea25866f1ce1 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.6
+++ b/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.6 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.6 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=SiS USB video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sisusb-0.9.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=db61fe8cb8d978f72e24599f24f8b3a9
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.6-r1 b/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.6-r1
index b4d91c2b0af7..b00f099f44a7 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.6-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.6 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.6 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=SiS USB video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sisusb-0.9.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=9c3c5a58cb8fb81528e1a0a86dc48a59
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sunbw2-1.1.0 b/metadata/md5-cache/x11-drivers/xf86-video-sunbw2-1.1.0
index 78607e147196..6e8a37584f8c 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-sunbw2-1.1.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-sunbw2-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/randrproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/randrproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=BW2 video driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sunbw2-1.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=91f3ac49a25cc1d0e20549a4ffdcc712
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-suncg14-1.1.1 b/metadata/md5-cache/x11-drivers/xf86-video-suncg14-1.1.1
index 49922582f141..260252bbcf2d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-suncg14-1.1.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-suncg14-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=CG14 video driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg14-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=b1fcb78f2fb1c0c04c107e3fa1d41552
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-suncg14-1.1.2 b/metadata/md5-cache/x11-drivers/xf86-video-suncg14-1.1.2
index 1718a6da8ee4..22b5a3bb6f0f 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-suncg14-1.1.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-suncg14-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=CG14 video driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg14-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=fb683dd707bad38311e884c868bbc3b0
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-suncg3-1.1.1 b/metadata/md5-cache/x11-drivers/xf86-video-suncg3-1.1.1
index 2b8e2c0a84dd..00ce6a7c53ae 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-suncg3-1.1.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-suncg3-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=CG3 video driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg3-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=022f9031daf0c56fbf03dad62a0c64cb
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-suncg3-1.1.2 b/metadata/md5-cache/x11-drivers/xf86-video-suncg3-1.1.2
index f39f85370ced..6083d345a1eb 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-suncg3-1.1.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-suncg3-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=CG3 video driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg3-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=5afe5d5d1ea3535b67dc8d187059e584
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.1 b/metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.1
index 3427abae69cf..12413c095701 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=GX/Turbo GX video driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg6-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=e53637c27fa0226450be96ffa60586b0
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.2 b/metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.2
index c5cb0e8a0575..84206166e9f8 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=GX/Turbo GX video driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=e9ff6f2b7483d8a2c95d9884497630e2
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sunffb-1.2.1 b/metadata/md5-cache/x11-drivers/xf86-video-sunffb-1.2.1
index 04f6d3a1cd99..9104a099810d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-sunffb-1.2.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-sunffb-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=SUNFFB video driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sunffb-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=42fe6504878ee990ba6e3b1055cbcadd
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sunffb-1.2.2 b/metadata/md5-cache/x11-drivers/xf86-video-sunffb-1.2.2
index bd7e77f027da..10d0d097d48b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-sunffb-1.2.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-sunffb-1.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=SUNFFB video driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=54a401d93d03adf08cade646cac22afb
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.0 b/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.0
index 9736bdd0267d..60a9dde50098 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=Leo video driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sunleo-1.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=3d33731f270d44fff97ea198cede3f4d
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.1 b/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.1
index 2341aef909fd..4608057b695c 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=Leo video driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sunleo-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=88ce0203a8679ed38a784716c8f5c71a
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-suntcx-1.1.1 b/metadata/md5-cache/x11-drivers/xf86-video-suntcx-1.1.1
index 6a82b772ee23..94e98531e256 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-suntcx-1.1.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-suntcx-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=TCX video driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suntcx-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=6b867eb68573422354a149dca24b7bfa
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-suntcx-1.1.2 b/metadata/md5-cache/x11-drivers/xf86-video-suntcx-1.1.2
index e6316af63501..13c89dca383a 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-suntcx-1.1.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-suntcx-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=TCX video driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suntcx-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=c387b93d835ed564faddb2c370aa2747
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.4-r1 b/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.4-r1
index 8157cf317021..19146149980c 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.4-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=3Dfx video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tdfx-1.4.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=1bafc3c343b75f8c7a8c09dacca2df85
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.5 b/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.5
index 40d74e12fd20..830dd280a9eb 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=3Dfx video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tdfx-1.4.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=0acb2bcd69538fa9d94812b03500bd11
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.5-r1 b/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.5-r1
index 48edbbcb0e31..0a79d5ed6f69 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.5-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=3Dfx video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tdfx-1.4.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=fbfabee0008fc7df7ac7afefc211dee7
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.2 b/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.2
index ef29f1593506..4b9dde113682 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/xf86dgaproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/xf86dgaproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for tga cards
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tga-1.2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=00d9f92ed8cb55daddd6801ef4680e80
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.2-r1 b/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.2-r1
index df5ea1e4c732..2af014033ab1 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.2-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/xf86dgaproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/xf86dgaproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org driver for tga cards
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tga-1.2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6cf8f1ff0bf11ef5471a9dda55b14092
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.5 b/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.5
index 29d0124a3724..2c5b8009abdb 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Trident video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-1.3.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=b19d4b56825cc1295ea5ba705a94f270
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.6-r1 b/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.6-r1
index 4ca1156bbd28..026270d0e15a 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.6-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Trident video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-1.3.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=f3602187592b874b1749940686eead4e
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.6-r2 b/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.6-r2
index d52c10a2d951..34e1f5b1275b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.6-r2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.6-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Trident video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-1.3.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=ff5b3c0f6c8eb2857333ed07ab8aa11c
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.4 b/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.4
index 5e3d2586edb2..c1bb07683b1b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Tseng Labs video driver
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tseng-1.2.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=fcf7e0db13b8dfba2ecc706b13a53890
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.5 b/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.5
index 34f0347a59b4..507a05c95562 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Tseng Labs video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tseng-1.2.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5df699c09900105cdfc54e6109dd1986
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.5-r1 b/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.5-r1
index ebf123953d88..3979709b2993 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.5-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Tseng Labs video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tseng-1.2.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=c8e7403491ebd7e53a11d63374b434ed
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-v4l-0.2.0 b/metadata/md5-cache/x11-drivers/xf86-video-v4l-0.2.0
index e22fc3a1b0e6..d7332b32b7fb 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-v4l-0.2.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-v4l-0.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/randrproto x11-proto/videoproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/randrproto x11-proto/videoproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=video4linux driver
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-v4l-0.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=9e851eb694278182e1fc85bcc4ba1095
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.2 b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.2
index 8acb83dce329..4c069c1a7114 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-libs/libpciaccess-0.12.901 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-libs/libpciaccess-0.12.901 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Generic VESA video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 >=x11-libs/libpciaccess-0.12.901 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.3.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=58883d2e594d3adf00e918bbbe75b361
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.2-r1 b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.2-r1
index 911f5767b067..8233e3d120b7 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.2-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-libs/libpciaccess-0.12.901 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-libs/libpciaccess-0.12.901 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Generic VESA video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 >=x11-libs/libpciaccess-0.12.901 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.3.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=b6e6a89bd7abcdef1b6ac01fb65f8b28
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vmware-12.0.2-r1 b/metadata/md5-cache/x11-drivers/xf86-video-vmware-12.0.2-r1
index b670bde7e09a..257bebb1a455 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vmware-12.0.2-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vmware-12.0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=VMware SVGA video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-12.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4ae954baa7af6ee02b3ea2c39a1b7631
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.0.0 b/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.0.0
index fe5d31aa0b85..23a2ad5c0208 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.0.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=VMware SVGA video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-13.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=65ab818fedc4a2febea43d5fa9912802
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.0.0-r1 b/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.0.0-r1
index cb1f8d9093f0..9dbb954d9917 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.0.0-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.0.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=VMware SVGA video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-13.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=ec0c079e6e996afe85a99cd90064b10f
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.0.1 b/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.0.1
index 70c552b46048..7ea620efb88f 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.0.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=VMware SVGA video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-13.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d170bcd663473314690b40372c9ac744
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-voodoo-1.2.4 b/metadata/md5-cache/x11-drivers/xf86-video-voodoo-1.2.4
index 04bc95ffb3d3..d1bf4a07d233 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-voodoo-1.2.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-voodoo-1.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Voodoo video driver
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-voodoo-1.2.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=94687618a91be456c5efaa1192911789
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-voodoo-1.2.5 b/metadata/md5-cache/x11-drivers/xf86-video-voodoo-1.2.5
index 05fe17da21dd..a0049c8bc099 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-voodoo-1.2.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-voodoo-1.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/xf86dgaproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/xf86dgaproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=Voodoo video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=70536f9faf9710bdb9b9607088673d06
diff --git a/metadata/md5-cache/x11-libs/agg-2.5 b/metadata/md5-cache/x11-libs/agg-2.5
index 303f1d371161..2b2e1418d1a3 100644
--- a/metadata/md5-cache/x11-libs/agg-2.5
+++ b/metadata/md5-cache/x11-libs/agg-2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=media-libs/libsdl virtual/pkgconfig sdl? ( >=media-libs/libsdl-1.2.0 ) X? ( x11-libs/libX11 ) truetype? ( >=media-libs/freetype-2 ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl virtual/pkgconfig sdl? ( >=media-libs/libsdl-1.2.0 ) X? ( x11-libs/libX11 ) truetype? ( >=media-libs/freetype-2 ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Anti-Grain Geometry - A High Quality Rendering Engine for C++
 HOMEPAGE=http://antigrain.com/
 IUSE=sdl truetype X
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sdl? ( >=media-libs/libsdl-1.2.0 ) X? ( x11-libs/libX11 ) truetype? ( >=media-libs/freetype-2 )
 SLOT=0
 SRC_URI=http://antigrain.com/agg-2.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2142c409ac6d1c65cc229eaa63c950d5
diff --git a/metadata/md5-cache/x11-libs/agg-2.5-r2 b/metadata/md5-cache/x11-libs/agg-2.5-r2
index 059bf69754d2..6e97d476521b 100644
--- a/metadata/md5-cache/x11-libs/agg-2.5-r2
+++ b/metadata/md5-cache/x11-libs/agg-2.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Anti-Grain Geometry - A High Quality Rendering Engine for C++
 EAPI=2
 HOMEPAGE=http://antigrain.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://antigrain.com/agg-2.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a71b040c1b746ec4e7ac7f33c53fee9b
diff --git a/metadata/md5-cache/x11-libs/cairo-1.10.2-r3 b/metadata/md5-cache/x11-libs/cairo-1.10.2-r3
index 176d3b908044..d322cb4d60e5 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.10.2-r3
+++ b/metadata/md5-cache/x11-libs/cairo-1.10.2-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libX11 drm? ( >=virtual/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libX11 drm? ( >=virtual/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A vector graphics library with cross-device output support
 EAPI=3
 HOMEPAGE=http://cairographics.org/
@@ -10,5 +10,5 @@ RDEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cairographics.org/releases/cairo-1.10.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b2d3b79e7f5ee692e1135b34248878c
diff --git a/metadata/md5-cache/x11-libs/cairo-1.12.10-r2 b/metadata/md5-cache/x11-libs/cairo-1.12.10-r2
index 2971f6f567bb..5a87d69d2b64 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.12.10-r2
+++ b/metadata/md5-cache/x11-libs/cairo-1.12.10-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= sys-libs/zlib >=x11-libs/pixman-0.22.0 directfb? ( dev-libs/DirectFB ) glib? ( >=dev-libs/glib-2.28.6:2 ) opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 drm? ( >=virtual/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= sys-libs/zlib >=x11-libs/pixman-0.22.0 directfb? ( dev-libs/DirectFB ) glib? ( >=dev-libs/glib-2.28.6:2 ) opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 drm? ( >=virtual/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A vector graphics library with cross-device output support
 EAPI=5
 HOMEPAGE=http://cairographics.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=drm? ( X ) gallium? ( drm )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cairographics.org/releases/cairo-1.12.10.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=23d6e0f96651689ec0ed18817d7faadf
diff --git a/metadata/md5-cache/x11-libs/cairo-1.12.12 b/metadata/md5-cache/x11-libs/cairo-1.12.12
index 50007fa5e915..e0e1ebd1b06a 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.12.12
+++ b/metadata/md5-cache/x11-libs/cairo-1.12.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= sys-libs/zlib >=x11-libs/pixman-0.28.0 directfb? ( dev-libs/DirectFB ) glib? ( >=dev-libs/glib-2.28.6:2 ) opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 drm? ( >=virtual/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= sys-libs/zlib >=x11-libs/pixman-0.28.0 directfb? ( dev-libs/DirectFB ) glib? ( >=dev-libs/glib-2.28.6:2 ) opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 drm? ( >=virtual/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A vector graphics library with cross-device output support
 EAPI=5
 HOMEPAGE=http://cairographics.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=drm? ( X ) gallium? ( drm )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cairographics.org/releases/cairo-1.12.12.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=01c82a6cf819f74cbf71b0f8188c684e
diff --git a/metadata/md5-cache/x11-libs/cairo-1.12.12-r1 b/metadata/md5-cache/x11-libs/cairo-1.12.12-r1
index 168cd80f8f11..efb23c253966 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.12.12-r1
+++ b/metadata/md5-cache/x11-libs/cairo-1.12.12-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= sys-libs/zlib >=x11-libs/pixman-0.28.0 directfb? ( dev-libs/DirectFB ) glib? ( >=dev-libs/glib-2.28.6:2 ) opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 drm? ( >=virtual/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= sys-libs/zlib >=x11-libs/pixman-0.28.0 directfb? ( dev-libs/DirectFB ) glib? ( >=dev-libs/glib-2.28.6:2 ) opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 drm? ( >=virtual/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A vector graphics library with cross-device output support
 EAPI=5
 HOMEPAGE=http://cairographics.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=drm? ( X ) gallium? ( drm )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cairographics.org/releases/cairo-1.12.12.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2508e9b6cca03a671c01479c906a7bff
diff --git a/metadata/md5-cache/x11-libs/cairo-1.12.14 b/metadata/md5-cache/x11-libs/cairo-1.12.14
index afb67658a660..24265805d43a 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.12.14
+++ b/metadata/md5-cache/x11-libs/cairo-1.12.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= sys-libs/zlib >=x11-libs/pixman-0.28.0 directfb? ( dev-libs/DirectFB ) glib? ( >=dev-libs/glib-2.28.6:2 ) opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 drm? ( >=virtual/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= sys-libs/zlib >=x11-libs/pixman-0.28.0 directfb? ( dev-libs/DirectFB ) glib? ( >=dev-libs/glib-2.28.6:2 ) opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 drm? ( >=virtual/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A vector graphics library with cross-device output support
 EAPI=5
 HOMEPAGE=http://cairographics.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=drm? ( X ) gallium? ( drm )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cairographics.org/releases/cairo-1.12.14.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=72d60167dc27f68d0f1ff435ab410171
diff --git a/metadata/md5-cache/x11-libs/cairo-1.12.8 b/metadata/md5-cache/x11-libs/cairo-1.12.8
index a852fc138af4..eca8b562f2fa 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.12.8
+++ b/metadata/md5-cache/x11-libs/cairo-1.12.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib >=x11-libs/pixman-0.22.0 directfb? ( dev-libs/DirectFB ) glib? ( >=dev-libs/glib-2.28.6:2 ) opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 drm? ( >=virtual/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib >=x11-libs/pixman-0.22.0 directfb? ( dev-libs/DirectFB ) glib? ( >=dev-libs/glib-2.28.6:2 ) opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 drm? ( >=virtual/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A vector graphics library with cross-device output support
 EAPI=4
 HOMEPAGE=http://cairographics.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=drm? ( X ) gallium? ( drm )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cairographics.org/releases/cairo-1.12.8.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6b1d62f19b671ec0bf4e0ec198e42de3
diff --git a/metadata/md5-cache/x11-libs/cairo-9999 b/metadata/md5-cache/x11-libs/cairo-9999
index 97b733c0add5..cf88e4f6b666 100644
--- a/metadata/md5-cache/x11-libs/cairo-9999
+++ b/metadata/md5-cache/x11-libs/cairo-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= sys-libs/zlib >=x11-libs/pixman-0.22.0 directfb? ( dev-libs/DirectFB ) glib? ( >=dev-libs/glib-2.28.6:2 ) opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 drm? ( >=virtual/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= sys-libs/zlib >=x11-libs/pixman-0.22.0 directfb? ( dev-libs/DirectFB ) glib? ( >=dev-libs/glib-2.28.6:2 ) opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 drm? ( >=virtual/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=A vector graphics library with cross-device output support
 EAPI=5
 HOMEPAGE=http://cairographics.org/
@@ -9,5 +9,5 @@ RDEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= sys-lib
 REQUIRED_USE=drm? ( X ) gallium? ( drm )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6322b41c24be83273291796d4ddaf4fb
diff --git a/metadata/md5-cache/x11-libs/fltk-1.3.0-r1 b/metadata/md5-cache/x11-libs/fltk-1.3.0-r1
index dfe499aea8fa..25d9df96ff34 100644
--- a/metadata/md5-cache/x11-libs/fltk-1.3.0-r1
+++ b/metadata/md5-cache/x11-libs/fltk-1.3.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C++ user interface toolkit for X and OpenGL
 EAPI=3
 HOMEPAGE=http://www.fltk.org/
@@ -9,5 +9,5 @@ LICENSE=FLTK LGPL-2
 RDEPEND=>=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 )
 SLOT=1
 SRC_URI=mirror://easysw/fltk/1.3.0/fltk-1.3.0-source.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a168c7ac5eeb92b9e7ca9a055255caf2
diff --git a/metadata/md5-cache/x11-libs/fltk-1.3.1 b/metadata/md5-cache/x11-libs/fltk-1.3.1
index 55b8b29aca5c..ba57a7c33a7f 100644
--- a/metadata/md5-cache/x11-libs/fltk-1.3.1
+++ b/metadata/md5-cache/x11-libs/fltk-1.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C++ user interface toolkit for X and OpenGL
 EAPI=3
 HOMEPAGE=http://www.fltk.org/
@@ -9,5 +9,5 @@ LICENSE=FLTK LGPL-2
 RDEPEND=>=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 )
 SLOT=1
 SRC_URI=mirror://easysw/fltk/1.3.1/fltk-1.3.1-source.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c065238aeb2cd1c442c88a72e4853755
diff --git a/metadata/md5-cache/x11-libs/fltk-1.3.2 b/metadata/md5-cache/x11-libs/fltk-1.3.2
index 2fa20c0af407..ff34829c248d 100644
--- a/metadata/md5-cache/x11-libs/fltk-1.3.2
+++ b/metadata/md5-cache/x11-libs/fltk-1.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C++ user interface toolkit for X and OpenGL
 EAPI=4
 HOMEPAGE=http://www.fltk.org/
@@ -9,5 +9,5 @@ LICENSE=FLTK LGPL-2
 RDEPEND=>=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 )
 SLOT=1
 SRC_URI=mirror://easysw/fltk/1.3.2/fltk-1.3.2-source.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ed321173633c1a821b052a0fd1f9fbf7
diff --git a/metadata/md5-cache/x11-libs/fox-1.6.40 b/metadata/md5-cache/x11-libs/fox-1.6.40
index aafa338eeb35..348a7b0d96c8 100644
--- a/metadata/md5-cache/x11-libs/fox-1.6.40
+++ b/metadata/md5-cache/x11-libs/fox-1.6.40
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper bzip2? ( >=app-arch/bzip2-1.0.2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/glu 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen ) dev-util/reswrap >=sys-apps/sed-4
+DEPEND=x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper bzip2? ( >=app-arch/bzip2-1.0.2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/glu 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen ) dev-util/reswrap >=sys-apps/sed-4
 DESCRIPTION=C++ based Toolkit for developing Graphical User Interfaces easily and effectively
 EAPI=2
 HOMEPAGE=http://www.fox-toolkit.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper bzip2? ( >=app-arch/bzip2-1.0.2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/glu 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 )
 SLOT=1.6
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.6.40.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ac7472b6440bc705a64591b64029ced7
diff --git a/metadata/md5-cache/x11-libs/fox-1.6.45 b/metadata/md5-cache/x11-libs/fox-1.6.45
index 211ade332fed..417adc155972 100644
--- a/metadata/md5-cache/x11-libs/fox-1.6.45
+++ b/metadata/md5-cache/x11-libs/fox-1.6.45
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper bzip2? ( >=app-arch/bzip2-1.0.2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/glu 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen ) dev-util/reswrap >=sys-apps/sed-4
+DEPEND=x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper bzip2? ( >=app-arch/bzip2-1.0.2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/glu 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen ) dev-util/reswrap >=sys-apps/sed-4
 DESCRIPTION=C++ based Toolkit for developing Graphical User Interfaces easily and effectively
 EAPI=4
 HOMEPAGE=http://www.fox-toolkit.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper bzip2? ( >=app-arch/bzip2-1.0.2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/glu 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 )
 SLOT=1.6
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.6.45.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4191cb0c0f317aa3f56bf4368bf427c8
diff --git a/metadata/md5-cache/x11-libs/fox-1.7.32 b/metadata/md5-cache/x11-libs/fox-1.7.32
index c9fd7d328606..02910256b0f1 100644
--- a/metadata/md5-cache/x11-libs/fox-1.7.32
+++ b/metadata/md5-cache/x11-libs/fox-1.7.32
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper >=sys-devel/autoconf-2.67 bzip2? ( app-arch/bzip2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/glu 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen ) dev-util/reswrap >=sys-apps/sed-4
+DEPEND=x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper >=sys-devel/autoconf-2.67 bzip2? ( app-arch/bzip2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/glu 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen ) dev-util/reswrap >=sys-apps/sed-4
 DESCRIPTION=C++ based Toolkit for developing Graphical User Interfaces easily and effectively
 EAPI=4
 HOMEPAGE=http://www.fox-toolkit.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper >=sys-devel/autoconf-2.67 bzip2? ( app-arch/bzip2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 x11-libs/libXft ) zlib? ( sys-libs/zlib )
 SLOT=1.7
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.32.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d789992e4ccd5cb1423d7ffe03ea39f9
diff --git a/metadata/md5-cache/x11-libs/fox-1.7.33 b/metadata/md5-cache/x11-libs/fox-1.7.33
index 39f5e3e776ff..3429b3c92a76 100644
--- a/metadata/md5-cache/x11-libs/fox-1.7.33
+++ b/metadata/md5-cache/x11-libs/fox-1.7.33
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper >=sys-devel/autoconf-2.67 bzip2? ( app-arch/bzip2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/glu 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen ) dev-util/reswrap >=sys-apps/sed-4
+DEPEND=x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper >=sys-devel/autoconf-2.67 bzip2? ( app-arch/bzip2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/glu 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen ) dev-util/reswrap >=sys-apps/sed-4
 DESCRIPTION=C++ based Toolkit for developing Graphical User Interfaces easily and effectively
 EAPI=4
 HOMEPAGE=http://www.fox-toolkit.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper >=sys-devel/autoconf-2.67 bzip2? ( app-arch/bzip2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 x11-libs/libXft ) zlib? ( sys-libs/zlib )
 SLOT=1.7
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.33.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=130eeb3ab9b93b03c89372cc6a7469bf
diff --git a/metadata/md5-cache/x11-libs/fox-1.7.37 b/metadata/md5-cache/x11-libs/fox-1.7.37
index 7475b2c2d790..d6b471c2632b 100644
--- a/metadata/md5-cache/x11-libs/fox-1.7.37
+++ b/metadata/md5-cache/x11-libs/fox-1.7.37
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper >=sys-devel/autoconf-2.67 bzip2? ( app-arch/bzip2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/glu 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen ) dev-util/reswrap >=sys-apps/sed-4
+DEPEND=x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper >=sys-devel/autoconf-2.67 bzip2? ( app-arch/bzip2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/glu 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen ) dev-util/reswrap >=sys-apps/sed-4
 DESCRIPTION=C++ based Toolkit for developing Graphical User Interfaces easily and effectively
 EAPI=4
 HOMEPAGE=http://www.fox-toolkit.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper >=sys-devel/autoconf-2.67 bzip2? ( app-arch/bzip2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 x11-libs/libXft ) zlib? ( sys-libs/zlib )
 SLOT=1.7
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.37.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bf50fe14300f2e7295ce1682ae2697d5
diff --git a/metadata/md5-cache/x11-libs/fxscintilla-1.71-r2 b/metadata/md5-cache/x11-libs/fxscintilla-1.71-r2
index 357bce3cdc49..bc07a7adf114 100644
--- a/metadata/md5-cache/x11-libs/fxscintilla-1.71-r2
+++ b/metadata/md5-cache/x11-libs/fxscintilla-1.71-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND==x11-libs/fox-1.6* || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==x11-libs/fox-1.6* || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free source code editing component for the FOX-Toolkit
 HOMEPAGE=http://www.nongnu.org/fxscintilla/
 IUSE=doc
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND==x11-libs/fox-1.6*
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/fxscintilla/fxscintilla-1.71.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ba797850daae02616428211bf77d8ee7
diff --git a/metadata/md5-cache/x11-libs/fxscintilla-2.28.0 b/metadata/md5-cache/x11-libs/fxscintilla-2.28.0
index 1099823011e1..9b638783d24a 100644
--- a/metadata/md5-cache/x11-libs/fxscintilla-2.28.0
+++ b/metadata/md5-cache/x11-libs/fxscintilla-2.28.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=|| ( x11-libs/fox:1.6 x11-libs/fox:1.7 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( x11-libs/fox:1.6 x11-libs/fox:1.7 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A free source code editing component for the FOX-Toolkit
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/fxscintilla/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=|| ( x11-libs/fox:1.6 x11-libs/fox:1.7 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/fxscintilla/fxscintilla-2.28.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a344da189c10287177a788a838a61fb1
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.24.1-r1 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.24.1-r1
index 398c79fdbd75..1e122ee64407 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.24.1-r1
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.24.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=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/gtk-doc-am-1.11 >=sys-devel/gettext-0.17 virtual/pkgconfig app-arch/xz-utils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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/gtk-doc-am-1.11 >=sys-devel/gettext-0.17 virtual/pkgconfig app-arch/xz-utils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Image loading library for GTK+
 EAPI=4
 HOMEPAGE=http://www.gtk.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=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
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.24/gdk-pixbuf-2.24.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=068ed7438e752811ed5a2cf6982a1f98
diff --git a/metadata/md5-cache/x11-libs/gksu-2.0.2-r1 b/metadata/md5-cache/x11-libs/gksu-2.0.2-r1
index ee7b18544c71..8cdbad54c5fa 100644
--- a/metadata/md5-cache/x11-libs/gksu-2.0.2-r1
+++ b/metadata/md5-cache/x11-libs/gksu-2.0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=x11-libs/libgksu-2.0.8 >=x11-libs/gtk+-2.4:2 >=gnome-base/gconf-2 gnome? ( >=gnome-base/nautilus-2 x11-terms/gnome-terminal ) dev-util/intltool virtual/pkgconfig doc? ( dev-util/gtk-doc ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=sys-apps/sed-4
+DEPEND=>=x11-libs/libgksu-2.0.8 >=x11-libs/gtk+-2.4:2 >=gnome-base/gconf-2 gnome? ( >=gnome-base/nautilus-2 x11-terms/gnome-terminal ) dev-util/intltool virtual/pkgconfig doc? ( dev-util/gtk-doc ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=sys-apps/sed-4
 DESCRIPTION=A gtk+ frontend for libgksu
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/gksu/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/libgksu-2.0.8 >=x11-libs/gtk+-2.4:2 >=gnome-base/gconf-2 gnome? ( >=gnome-base/nautilus-2 x11-terms/gnome-terminal )
 SLOT=0
 SRC_URI=http://people.debian.org/~kov/gksu/gksu-2.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=467f85271ecbe0128b5907646cb3b3a4
diff --git a/metadata/md5-cache/x11-libs/glamor-0.5 b/metadata/md5-cache/x11-libs/glamor-0.5
index f2397a1d42ab..7b462f0191aa 100644
--- a/metadata/md5-cache/x11-libs/glamor-0.5
+++ b/metadata/md5-cache/x11-libs/glamor-0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.10 media-libs/mesa[egl,gbm] gles? ( || ( media-libs/mesa[gles2] media-libs/mesa[gles] ) ) >=x11-libs/pixman-0.21.8 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-base/xorg-server[-minimal] x11-libs/libdrm
+DEPEND=>=x11-base/xorg-server-1.10 media-libs/mesa[egl,gbm] gles? ( || ( media-libs/mesa[gles2] media-libs/mesa[gles] ) ) >=x11-libs/pixman-0.21.8 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-base/xorg-server[-minimal] x11-libs/libdrm
 DESCRIPTION=OpenGL based 2D rendering acceleration library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.10 media-libs/mesa[egl,gbm] gles? ( || ( media-libs/mesa[gles2] media-libs/mesa[gles] ) ) >=x11-libs/pixman-0.21.8 x11-base/xorg-server[-minimal] x11-libs/libdrm
 SLOT=0
 SRC_URI=mirror://gentoo/glamor-0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6907b61888255e4ef1ad41587bde1930
diff --git a/metadata/md5-cache/x11-libs/glamor-0.5-r1 b/metadata/md5-cache/x11-libs/glamor-0.5-r1
index b153a9ef19c1..f4b0b320d1ca 100644
--- a/metadata/md5-cache/x11-libs/glamor-0.5-r1
+++ b/metadata/md5-cache/x11-libs/glamor-0.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.10 media-libs/mesa[egl,gbm] gles? ( || ( media-libs/mesa[gles2] media-libs/mesa[gles] ) ) >=x11-libs/pixman-0.21.8 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-base/xorg-server[-minimal] x11-libs/libdrm
+DEPEND=>=x11-base/xorg-server-1.10 media-libs/mesa[egl,gbm] gles? ( || ( media-libs/mesa[gles2] media-libs/mesa[gles] ) ) >=x11-libs/pixman-0.21.8 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-base/xorg-server[-minimal] x11-libs/libdrm
 DESCRIPTION=OpenGL based 2D rendering acceleration library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.10 media-libs/mesa[egl,gbm] gles? ( || ( media-libs/mesa[gles2] media-libs/mesa[gles] ) ) >=x11-libs/pixman-0.21.8 x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm
 SLOT=0
 SRC_URI=mirror://gentoo/glamor-0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=3611836cb9f101075e08e2a6b9594844
diff --git a/metadata/md5-cache/x11-libs/goffice-0.8.17-r1 b/metadata/md5-cache/x11-libs/goffice-0.8.17-r1
index b6862cc0e21b..0162769c7df2 100644
--- a/metadata/md5-cache/x11-libs/goffice-0.8.17-r1
+++ b/metadata/md5-cache/x11-libs/goffice-0.8.17-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.16:2 >=gnome-extra/libgsf-1.14.9 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.8.1 >=x11-libs/cairo-1.2[svg] x11-libs/libXext x11-libs/libXrender >=x11-libs/gtk+-2.16:2 gnome? ( >=gnome-base/gconf-2:2 ) virtual/pkgconfig >=dev-util/intltool-0.35 doc? ( >=dev-util/gtk-doc-1.11 ) dev-util/gtk-doc-am gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.16:2 >=gnome-extra/libgsf-1.14.9 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.8.1 >=x11-libs/cairo-1.2[svg] x11-libs/libXext x11-libs/libXrender >=x11-libs/gtk+-2.16:2 gnome? ( >=gnome-base/gconf-2:2 ) virtual/pkgconfig >=dev-util/intltool-0.35 doc? ( >=dev-util/gtk-doc-1.11 ) dev-util/gtk-doc-am gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A library of document-centric objects and utilities
 EAPI=4
 HOMEPAGE=http://git.gnome.org/browse/goffice/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16:2 >=gnome-extra/libgsf-1.14.9 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.8.1 >=x11-libs/cairo-1.2[svg] x11-libs/libXext x11-libs/libXrender >=x11-libs/gtk+-2.16:2 gnome? ( >=gnome-base/gconf-2:2 )
 SLOT=0.8
 SRC_URI=mirror://gnome/sources/goffice/0.8/goffice-0.8.17.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=12a1b05bd5c8c21c4deefcec6e0ed48f
diff --git a/metadata/md5-cache/x11-libs/gtk+-1.2.10-r12 b/metadata/md5-cache/x11-libs/gtk+-1.2.10-r12
index 2aed43bc34af..5c4ae4405b72 100644
--- a/metadata/md5-cache/x11-libs/gtk+-1.2.10-r12
+++ b/metadata/md5-cache/x11-libs/gtk+-1.2.10-r12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND==dev-libs/glib-1.2* x11-libs/libXi x11-libs/libXt x11-proto/inputproto x11-proto/xextproto nls? ( sys-devel/gettext dev-util/intltool ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-libs/glib-1.2* x11-libs/libXi x11-libs/libXt x11-proto/inputproto x11-proto/xextproto nls? ( sys-devel/gettext dev-util/intltool ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The GIMP Toolkit
 HOMEPAGE=http://www.gtk.org/
 IUSE=nls debug linguas_az linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_nl linguas_nn linguas_no linguas_pl linguas_pt_BR linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_tr linguas_uk linguas_vi
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1+
 RDEPEND==dev-libs/glib-1.2* x11-libs/libXi x11-libs/libXt
 SLOT=1
 SRC_URI=mirror://gnome/sources/gtk+/1.2/gtk+-1.2.10.tar.gz http://www.ibiblio.org/gentoo/distfiles/gtk+-1.2.10-r8-gentoo.diff.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9bd5b00f2019dd7cb55a5f5e23e290c6
diff --git a/metadata/md5-cache/x11-libs/gtk+-2.24.12 b/metadata/md5-cache/x11-libs/gtk+-2.24.12
index 6cb0b29c3361..4e5bda5e53c5 100644
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.12
+++ b/metadata/md5-cache/x11-libs/gtk+-2.24.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare test
-DEPEND=!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.30: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 virtual/pkgconfig !aqua? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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.30: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 virtual/pkgconfig !aqua? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Gimp ToolKit +
 EAPI=4
 HOMEPAGE=http://www.gtk.org/
@@ -10,5 +10,5 @@ PDEPEND=vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=!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.30: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
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.12.tar.xz mirror://gentoo/introspection.m4.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=04367dab5994709511f1eb086f13b8dc
diff --git a/metadata/md5-cache/x11-libs/gtk+-2.24.16 b/metadata/md5-cache/x11-libs/gtk+-2.24.16
index 90598b6aff72..4f59b18798dc 100644
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.16
+++ b/metadata/md5-cache/x11-libs/gtk+-2.24.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare test
-DEPEND=!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.30: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 virtual/pkgconfig !aqua? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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.30: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 virtual/pkgconfig !aqua? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Gimp ToolKit +
 EAPI=5
 HOMEPAGE=http://www.gtk.org/
@@ -10,5 +10,5 @@ PDEPEND=vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=!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.30: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
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.16.tar.xz mirror://gentoo/introspection.m4.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=bb509db58f90e9a9f5a6fbe0a552e433
diff --git a/metadata/md5-cache/x11-libs/gtk+-2.24.17 b/metadata/md5-cache/x11-libs/gtk+-2.24.17
index d1b6c7f50324..74f1e9036470 100644
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.17
+++ b/metadata/md5-cache/x11-libs/gtk+-2.24.17
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst prepare test
-DEPEND=!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.30: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 virtual/pkgconfig !aqua? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 test? ( x11-themes/hicolor-icon-theme 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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!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.30: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 virtual/pkgconfig !aqua? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 test? ( x11-themes/hicolor-icon-theme 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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Gimp ToolKit +
 EAPI=5
 HOMEPAGE=http://www.gtk.org/
 IUSE=aqua cups debug examples +introspection test vim-syntax xinerama test
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 PDEPEND=vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=!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.30: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
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.17.tar.xz mirror://gentoo/introspection.m4.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0a4f5c09d046f958e6e795a5bce1c793
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=0294b2d998b7ac332ebb3e4c8a96bd0c
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.4.4 b/metadata/md5-cache/x11-libs/gtk+-3.4.4
index 695f03c8fccf..83ce8beaf66a 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.4.4
+++ b/metadata/md5-cache/x11-libs/gtk+-3.4.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare test
-DEPEND=X? ( x11-libs/libXrender x11-libs/libX11 >=x11-libs/libXi-1.3 x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage xinerama? ( x11-libs/libXinerama ) ) wayland? ( dev-libs/wayland media-libs/mesa[egl,wayland] x11-libs/cairo[opengl] x11-libs/libxkbcommon ) >=dev-libs/glib-2.32 >=x11-libs/pango-1.30[introspection?] >=dev-libs/atk-2.2[introspection?] >=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?] >=x11-libs/gtk+-2.24:2 media-libs/fontconfig x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9 ) cups? ( >=net-print/cups-1.2 ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) virtual/pkgconfig X? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto xinerama? ( x11-proto/xineramaproto ) ) >=dev-libs/gobject-introspection-common-1.32 >=dev-util/gtk-doc-am-1.11 test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXrender x11-libs/libX11 >=x11-libs/libXi-1.3 x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage xinerama? ( x11-libs/libXinerama ) ) wayland? ( dev-libs/wayland media-libs/mesa[egl,wayland] x11-libs/cairo[opengl] x11-libs/libxkbcommon ) >=dev-libs/glib-2.32 >=x11-libs/pango-1.30[introspection?] >=dev-libs/atk-2.2[introspection?] >=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?] >=x11-libs/gtk+-2.24:2 media-libs/fontconfig x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9 ) cups? ( >=net-print/cups-1.2 ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) virtual/pkgconfig X? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto xinerama? ( x11-proto/xineramaproto ) ) >=dev-libs/gobject-introspection-common-1.32 >=dev-util/gtk-doc-am-1.11 test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Gimp ToolKit +
 EAPI=4
 HOMEPAGE=http://www.gtk.org/
@@ -11,5 +11,5 @@ RDEPEND=X? ( x11-libs/libXrender x11-libs/libX11 >=x11-libs/libXi-1.3 x11-libs/l
 REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.4/gtk+-3.4.4.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=281199f8272ccf196dfc8c9e32793967
diff --git a/metadata/md5-cache/x11-libs/gtk+extra-3.0.1 b/metadata/md5-cache/x11-libs/gtk+extra-3.0.1
index 42236c550c0a..d8f837d6e3cc 100644
--- a/metadata/md5-cache/x11-libs/gtk+extra-3.0.1
+++ b/metadata/md5-cache/x11-libs/gtk+extra-3.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/gtk+-2.12.0:2 dev-libs/glib:2 introspection? ( >=dev-libs/gobject-introspection-0.6.14 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.12.0:2 dev-libs/glib:2 introspection? ( >=dev-libs/gobject-introspection-0.6.14 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Useful Additional GTK+ widgets
 EAPI=4
 HOMEPAGE=http://gtkextra.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=FDL-1.1 LGPL-2
 RDEPEND=>=x11-libs/gtk+-2.12.0:2 dev-libs/glib:2 introspection? ( >=dev-libs/gobject-introspection-0.6.14 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtkextra/gtk+extra-3.0.1.tar.gz mirror://gentoo/introspection.m4.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=66386a68bdd5dd10719a5a1684195ea9
diff --git a/metadata/md5-cache/x11-libs/gtkglarea-1.2.3-r1 b/metadata/md5-cache/x11-libs/gtkglarea-1.2.3-r1
index 1d16a5956002..fb02b13d35dd 100644
--- a/metadata/md5-cache/x11-libs/gtkglarea-1.2.3-r1
+++ b/metadata/md5-cache/x11-libs/gtkglarea-1.2.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND==x11-libs/gtk+-1.2* virtual/glu virtual/opengl || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==x11-libs/gtk+-1.2* virtual/glu virtual/opengl || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenGL canvas and context provider for GTK+
 HOMEPAGE=http://www.mono-project.com/GtkGLArea
 KEYWORDS=alpha amd64 arm hppa ia64 ppc sh sparc x86
@@ -7,5 +7,5 @@ LICENSE=LGPL-2+ GPL-2+
 RDEPEND==x11-libs/gtk+-1.2* virtual/glu virtual/opengl
 SLOT=1
 SRC_URI=mirror://gentoo/gtkglarea-1.2.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7159f4ac5728724c25c8eda8204478b0
diff --git a/metadata/md5-cache/x11-libs/gtkmathview-0.8.0-r2 b/metadata/md5-cache/x11-libs/gtkmathview-0.8.0-r2
index 8e169da2319b..a51a7d3986b9 100644
--- a/metadata/md5-cache/x11-libs/gtkmathview-0.8.0-r2
+++ b/metadata/md5-cache/x11-libs/gtkmathview-0.8.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=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 x11-libs/pango || ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] ) ) mathml? ( media-fonts/texcm-ttf ) t1lib? ( >=media-libs/t1lib-5:5 ) dev-libs/libxslt virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 x11-libs/pango || ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] ) ) mathml? ( media-fonts/texcm-ttf ) t1lib? ( >=media-libs/t1lib-5:5 ) dev-libs/libxslt virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Rendering engine for MathML documents
 EAPI=4
 HOMEPAGE=http://helm.cs.unibo.it/mml-widget/
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=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 x11-libs/pango || ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] ) ) mathml? ( media-fonts/texcm-ttf ) t1lib? ( >=media-libs/t1lib-5:5 )
 SLOT=0
 SRC_URI=http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-0.8.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=840331b90a918426db4e04b657019c72
diff --git a/metadata/md5-cache/x11-libs/guile-gtk-2.1 b/metadata/md5-cache/x11-libs/guile-gtk-2.1
index 0fc6f309374a..dc1d660aa1b3 100644
--- a/metadata/md5-cache/x11-libs/guile-gtk-2.1
+++ b/metadata/md5-cache/x11-libs/guile-gtk-2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare setup test
-DEPEND=dev-scheme/guile x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtkglarea-1.90:2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-scheme/guile x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtkglarea-1.90:2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GTK+ bindings for guile
 EAPI=2
 HOMEPAGE=http://www.gnu.org/software/guile-gtk/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-scheme/guile x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtkglarea-1.90:2
 SLOT=0
 SRC_URI=ftp://ftp.gnu.org/gnu/guile-gtk/guile-gtk-2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=8d92bfe0a81e165d32649e675cc94eaa
diff --git a/metadata/md5-cache/x11-libs/guile-gtk-2.1-r1 b/metadata/md5-cache/x11-libs/guile-gtk-2.1-r1
index 033e738fe22f..629c3f956e4a 100644
--- a/metadata/md5-cache/x11-libs/guile-gtk-2.1-r1
+++ b/metadata/md5-cache/x11-libs/guile-gtk-2.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare test
-DEPEND=dev-scheme/guile[deprecated(+)] x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtkglarea-1.90:2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-scheme/guile[deprecated(+)] x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtkglarea-1.90:2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GTK+ bindings for guile
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/guile-gtk/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-scheme/guile[deprecated(+)] x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtkglarea-1.90:2
 SLOT=0
 SRC_URI=ftp://ftp.gnu.org/gnu/guile-gtk/guile-gtk-2.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=37d1342bb7988aef5833794541dac214
diff --git a/metadata/md5-cache/x11-libs/ige-mac-integration-9999 b/metadata/md5-cache/x11-libs/ige-mac-integration-9999
index 29cc16530106..7e5796b03869 100644
--- a/metadata/md5-cache/x11-libs/ige-mac-integration-9999
+++ b/metadata/md5-cache/x11-libs/ige-mac-integration-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=x11-libs/gtk+:2 dev-python/pygtk:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=x11-libs/gtk+:2 dev-python/pygtk:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=GTK+ bindings for Mac OS X specific tasks
 EAPI=3
 HOMEPAGE=http://live.gnome.org/GTK+/OSX/Integration
 LICENSE=LGPL-2
 RDEPEND=x11-libs/gtk+:2 dev-python/pygtk:2
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=67cea87e0c77cfd8036041cf701ee66b
diff --git a/metadata/md5-cache/x11-libs/libFS-1.0.3 b/metadata/md5-cache/x11-libs/libFS-1.0.3
index 322c50f052be..26c2f7ab2dc5 100644
--- a/metadata/md5-cache/x11-libs/libFS-1.0.3
+++ b/metadata/md5-cache/x11-libs/libFS-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/xtrans x11-proto/xproto x11-proto/fontsproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/xtrans x11-proto/xproto x11-proto/fontsproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org FS library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/xtrans x11-proto/xproto x11-proto/fontsproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libFS-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a1f172e9007664ab7805712b0369375d
diff --git a/metadata/md5-cache/x11-libs/libFS-1.0.4 b/metadata/md5-cache/x11-libs/libFS-1.0.4
index 1717b44e7a44..9b2193c5f3fb 100644
--- a/metadata/md5-cache/x11-libs/libFS-1.0.4
+++ b/metadata/md5-cache/x11-libs/libFS-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/xtrans x11-proto/xproto x11-proto/fontsproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/xtrans x11-proto/xproto x11-proto/fontsproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org FS library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/xtrans x11-proto/xproto x11-proto/fontsproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libFS-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4b60b7b09b3a79607b9acc9fe999f4b9
diff --git a/metadata/md5-cache/x11-libs/libGLw-8.0.0 b/metadata/md5-cache/x11-libs/libGLw-8.0.0
index 311097637600..4cd7d57c263b 100644
--- a/metadata/md5-cache/x11-libs/libGLw-8.0.0
+++ b/metadata/md5-cache/x11-libs/libGLw-8.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!media-libs/mesa[motif] x11-libs/libX11 x11-libs/libXt x11-libs/motif virtual/opengl
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/glw/glw-8.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7fedcf386e985590c50cef3bc7ec9d94
diff --git a/metadata/md5-cache/x11-libs/libICE-1.0.7 b/metadata/md5-cache/x11-libs/libICE-1.0.7
index 2dff6fc1479d..bb155ae3356e 100644
--- a/metadata/md5-cache/x11-libs/libICE-1.0.7
+++ b/metadata/md5-cache/x11-libs/libICE-1.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/xtrans x11-proto/xproto doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/xtrans x11-proto/xproto doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org ICE library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/xtrans x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=8deca2fe3d2137c9b30b7df999c7bc18
diff --git a/metadata/md5-cache/x11-libs/libICE-1.0.8 b/metadata/md5-cache/x11-libs/libICE-1.0.8
index 836b95f0fcbc..2e8833f8da1b 100644
--- a/metadata/md5-cache/x11-libs/libICE-1.0.8
+++ b/metadata/md5-cache/x11-libs/libICE-1.0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/xtrans x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=x11-libs/xtrans x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org ICE library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/xtrans x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=f4692b75bb60c16fbdff5365aebc8315
diff --git a/metadata/md5-cache/x11-libs/libICE-1.0.8-r1 b/metadata/md5-cache/x11-libs/libICE-1.0.8-r1
index 1e12d19769bd..bcddc13c69b8 100644
--- a/metadata/md5-cache/x11-libs/libICE-1.0.8-r1
+++ b/metadata/md5-cache/x11-libs/libICE-1.0.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/xtrans x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=x11-libs/xtrans x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org ICE library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/xtrans x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4d48d8207568608e1c76d89cc0e37bf1
diff --git a/metadata/md5-cache/x11-libs/libSM-1.2.0 b/metadata/md5-cache/x11-libs/libSM-1.2.0
index 9013c6e42e2e..3f00d0b12c70 100644
--- a/metadata/md5-cache/x11-libs/libSM-1.2.0
+++ b/metadata/md5-cache/x11-libs/libSM-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libICE-1.0.5 x11-libs/xtrans x11-proto/xproto !elibc_FreeBSD? ( !elibc_SunOS? ( uuid? ( >=sys-apps/util-linux-2.16 ) ) ) doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libICE-1.0.5 x11-libs/xtrans x11-proto/xproto !elibc_FreeBSD? ( !elibc_SunOS? ( uuid? ( >=sys-apps/util-linux-2.16 ) ) ) doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org SM library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libICE-1.0.5 x11-libs/xtrans x11-proto/xproto !elibc_FreeBSD? ( !elibc_SunOS? ( uuid? ( >=sys-apps/util-linux-2.16 ) ) )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libSM-1.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=f5ebf13298cca31242216692ae4e8f63
diff --git a/metadata/md5-cache/x11-libs/libSM-1.2.1 b/metadata/md5-cache/x11-libs/libSM-1.2.1
index 6ffed7558622..035bc5fbfddc 100644
--- a/metadata/md5-cache/x11-libs/libSM-1.2.1
+++ b/metadata/md5-cache/x11-libs/libSM-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libICE-1.0.5 x11-libs/xtrans x11-proto/xproto !elibc_FreeBSD? ( !elibc_SunOS? ( uuid? ( >=sys-apps/util-linux-2.16 ) ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/libICE-1.0.5 x11-libs/xtrans x11-proto/xproto !elibc_FreeBSD? ( !elibc_SunOS? ( uuid? ( >=sys-apps/util-linux-2.16 ) ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org SM library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libICE-1.0.5 x11-libs/xtrans x11-proto/xproto !elibc_FreeBSD? ( !elibc_SunOS? ( uuid? ( >=sys-apps/util-linux-2.16 ) ) )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libSM-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=345c0e36cc7f8862466f00544e390fb3
diff --git a/metadata/md5-cache/x11-libs/libSM-1.2.1-r1 b/metadata/md5-cache/x11-libs/libSM-1.2.1-r1
index 7ca74d87d907..6524819bba4c 100644
--- a/metadata/md5-cache/x11-libs/libSM-1.2.1-r1
+++ b/metadata/md5-cache/x11-libs/libSM-1.2.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libICE-1.0.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/xtrans x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] !elibc_FreeBSD? ( !elibc_SunOS? ( uuid? ( >=sys-apps/util-linux-2.16 amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs[development] ) ) ) ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/libICE-1.0.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/xtrans x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] !elibc_FreeBSD? ( !elibc_SunOS? ( uuid? ( >=sys-apps/util-linux-2.16 amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs[development] ) ) ) ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org SM library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libICE-1.0.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/xtrans x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] !elibc_FreeBSD? ( !elibc_SunOS? ( uuid? ( >=sys-apps/util-linux-2.16 amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs[development] ) ) ) ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libSM-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=c27f575d22603fe774e9fbbf36b6aaf6
diff --git a/metadata/md5-cache/x11-libs/libX11-1.4.1 b/metadata/md5-cache/x11-libs/libX11-1.4.1
index 543542a835e8..43236f0845b5 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.4.1
+++ b/metadata/md5-cache/x11-libs/libX11-1.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libxcb-1.1.92 x11-libs/xtrans x11-proto/xf86bigfontproto x11-proto/inputproto x11-proto/kbproto x11-proto/xextproto >=x11-proto/xproto-7.0.13 doc? ( app-text/xmlto ) test? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libxcb-1.1.92 x11-libs/xtrans x11-proto/xf86bigfontproto x11-proto/inputproto x11-proto/kbproto x11-proto/xextproto >=x11-proto/xproto-7.0.13 doc? ( app-text/xmlto ) test? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org X11 library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.1.92 x11-libs/xtrans x11-proto/xf86bigfontproto x11-proto/inputproto x11-proto/kbproto x11-proto/xextproto >=x11-proto/xproto-7.0.13
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libX11-1.4.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=1681a99e054f88f9dbb10fea7a0dec82
diff --git a/metadata/md5-cache/x11-libs/libX11-1.4.3 b/metadata/md5-cache/x11-libs/libX11-1.4.3
index d25c12d85f1b..d180d2637a13 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.4.3
+++ b/metadata/md5-cache/x11-libs/libX11-1.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libxcb-1.1.92 x11-libs/xtrans >=x11-proto/xproto-7.0.13 x11-proto/xf86bigfontproto x11-proto/inputproto x11-proto/kbproto x11-proto/xextproto test? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/libxcb-1.1.92 x11-libs/xtrans >=x11-proto/xproto-7.0.13 x11-proto/xf86bigfontproto x11-proto/inputproto x11-proto/kbproto x11-proto/xextproto test? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org X11 library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.1.92 x11-libs/xtrans >=x11-proto/xproto-7.0.13 x11-proto/xf86bigfontproto x11-proto/inputproto x11-proto/kbproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libX11-1.4.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=854fa82eb38ead3b559abe253c7e39c6
diff --git a/metadata/md5-cache/x11-libs/libX11-1.4.4 b/metadata/md5-cache/x11-libs/libX11-1.4.4
index 3d399e12db8a..1def87be35de 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.4.4
+++ b/metadata/md5-cache/x11-libs/libX11-1.4.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libxcb-1.1.92 x11-libs/xtrans >=x11-proto/xproto-7.0.17 x11-proto/xf86bigfontproto x11-proto/inputproto x11-proto/kbproto x11-proto/xextproto test? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/libxcb-1.1.92 x11-libs/xtrans >=x11-proto/xproto-7.0.17 x11-proto/xf86bigfontproto x11-proto/inputproto x11-proto/kbproto x11-proto/xextproto test? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org X11 library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.1.92 x11-libs/xtrans >=x11-proto/xproto-7.0.17 x11-proto/xf86bigfontproto x11-proto/inputproto x11-proto/kbproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libX11-1.4.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5d50b7c5312ab01fa971c8ff25a29b1d
diff --git a/metadata/md5-cache/x11-libs/libX11-1.5.0 b/metadata/md5-cache/x11-libs/libX11-1.5.0
index 1ddb8099a9fa..8ad237c9ccf8 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.5.0
+++ b/metadata/md5-cache/x11-libs/libX11-1.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libxcb-1.8.1 x11-libs/xtrans >=x11-proto/xproto-7.0.17 x11-proto/xf86bigfontproto x11-proto/inputproto x11-proto/kbproto x11-proto/xextproto test? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/libxcb-1.8.1 x11-libs/xtrans >=x11-proto/xproto-7.0.17 x11-proto/xf86bigfontproto x11-proto/inputproto x11-proto/kbproto x11-proto/xextproto test? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org X11 library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.8.1 x11-libs/xtrans >=x11-proto/xproto-7.0.17 x11-proto/xf86bigfontproto x11-proto/inputproto x11-proto/kbproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libX11-1.5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=e349285ba63bc62e52065d9078b7a884
diff --git a/metadata/md5-cache/x11-libs/libX11-1.5.0-r1 b/metadata/md5-cache/x11-libs/libX11-1.5.0-r1
index 8b1a5e608ed8..358e0eaf0da9 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.5.0-r1
+++ b/metadata/md5-cache/x11-libs/libX11-1.5.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libxcb-1.8.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/xtrans >=x11-proto/xproto-7.0.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xf86bigfontproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/inputproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/kbproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] test? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/libxcb-1.8.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/xtrans >=x11-proto/xproto-7.0.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xf86bigfontproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/inputproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/kbproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] test? ( dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org X11 library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.8.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/xtrans >=x11-proto/xproto-7.0.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xf86bigfontproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/inputproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/kbproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libX11-1.5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=c3bbf8717c54af6c8e2122e3e91bbb1e
diff --git a/metadata/md5-cache/x11-libs/libXCalibrate-0.1_pre20081207-r1 b/metadata/md5-cache/x11-libs/libXCalibrate-0.1_pre20081207-r1
index a88e5bdc392b..fcde7f527462 100644
--- a/metadata/md5-cache/x11-libs/libXCalibrate-0.1_pre20081207-r1
+++ b/metadata/md5-cache/x11-libs/libXCalibrate-0.1_pre20081207-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext virtual/pkgconfig x11-proto/xcalibrateproto x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext virtual/pkgconfig x11-proto/xcalibrateproto x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Calibrate client-side protocol library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://gentoo/libXCalibrate-20081207.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=3c776067f8bb6f8a1223cb70e2ff03c8
diff --git a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.1 b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.1
index 79f3ff5b42c7..05433b051b8d 100644
--- a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.1
+++ b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/scrnsaverproto-1.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/scrnsaverproto-1.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org XScrnSaver library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/scrnsaverproto-1.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=3adc0bcce26824512d68653a49888e05
diff --git a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2 b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2
index 8e36500e32b2..2a95fefb7735 100644
--- a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2
+++ b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/scrnsaverproto-1.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/scrnsaverproto-1.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org XScrnSaver library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/scrnsaverproto-1.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-1.2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=e216edac1ff417df5a3e8723751b9633
diff --git a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2-r1 b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2-r1
index 3cb2b0bb5323..3b59c6ef9c11 100644
--- a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2-r1
+++ b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/scrnsaverproto-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/scrnsaverproto-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org XScrnSaver library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/scrnsaverproto-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-1.2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=ed7d19bbe428f03e6e13c460413914bb
diff --git a/metadata/md5-cache/x11-libs/libXTrap-1.0.0 b/metadata/md5-cache/x11-libs/libXTrap-1.0.0
index bcf1ad0607ed..0507c30d380f 100644
--- a/metadata/md5-cache/x11-libs/libXTrap-1.0.0
+++ b/metadata/md5-cache/x11-libs/libXTrap-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-proto/trapproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-proto/trapproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=X.Org XTrap library
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXTrap-1.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=15e8979161d2b9ed11299822553a4da9
diff --git a/metadata/md5-cache/x11-libs/libXTrap-1.0.0-r1 b/metadata/md5-cache/x11-libs/libXTrap-1.0.0-r1
index c3d8905b14fb..4d123262ed54 100644
--- a/metadata/md5-cache/x11-libs/libXTrap-1.0.0-r1
+++ b/metadata/md5-cache/x11-libs/libXTrap-1.0.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-proto/trapproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-proto/trapproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org XTrap library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-proto/trapproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXTrap-1.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d16c0c96fcaf8acd955ac031d853c6ce
diff --git a/metadata/md5-cache/x11-libs/libXTrap-1.0.1 b/metadata/md5-cache/x11-libs/libXTrap-1.0.1
index ada0a4a5af30..633f5bced989 100644
--- a/metadata/md5-cache/x11-libs/libXTrap-1.0.1
+++ b/metadata/md5-cache/x11-libs/libXTrap-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-proto/trapproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-proto/trapproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org XTrap library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-proto/trapproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXTrap-1.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=3480431b4c5604f375daefb176630c12
diff --git a/metadata/md5-cache/x11-libs/libXau-1.0.6 b/metadata/md5-cache/x11-libs/libXau-1.0.6
index 658e8c3b712f..8272e92c2e2d 100644
--- a/metadata/md5-cache/x11-libs/libXau-1.0.6
+++ b/metadata/md5-cache/x11-libs/libXau-1.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xau library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=9fb05282fdf0245aad39d0801a8589fe
diff --git a/metadata/md5-cache/x11-libs/libXau-1.0.7 b/metadata/md5-cache/x11-libs/libXau-1.0.7
index fd91affcb886..bf920921a9cd 100644
--- a/metadata/md5-cache/x11-libs/libXau-1.0.7
+++ b/metadata/md5-cache/x11-libs/libXau-1.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xau library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=fa04592f7e8f9c1decaaa4a6116b0568
diff --git a/metadata/md5-cache/x11-libs/libXau-1.0.7-r1 b/metadata/md5-cache/x11-libs/libXau-1.0.7-r1
index b9ebd02254fc..d4193420fb2c 100644
--- a/metadata/md5-cache/x11-libs/libXau-1.0.7-r1
+++ b/metadata/md5-cache/x11-libs/libXau-1.0.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xau library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a35ccd5376c2b2838f1cfbad9eda4415
diff --git a/metadata/md5-cache/x11-libs/libXaw-1.0.10 b/metadata/md5-cache/x11-libs/libXaw-1.0.10
index 72bdf211061e..67217e2486be 100644
--- a/metadata/md5-cache/x11-libs/libXaw-1.0.10
+++ b/metadata/md5-cache/x11-libs/libXaw-1.0.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-proto/xproto x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-proto/xproto x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xaw library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-proto/xproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=9fe4edaf818bf0db9d16b07c8f5f346b
diff --git a/metadata/md5-cache/x11-libs/libXaw-1.0.11 b/metadata/md5-cache/x11-libs/libXaw-1.0.11
index 8dd714ef7259..49b5e614e2fc 100644
--- a/metadata/md5-cache/x11-libs/libXaw-1.0.11
+++ b/metadata/md5-cache/x11-libs/libXaw-1.0.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-proto/xproto x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-proto/xproto x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xaw library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-proto/xproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.11.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=1ab626258293b051ca7509b783f9c4a9
diff --git a/metadata/md5-cache/x11-libs/libXaw-1.0.11-r1 b/metadata/md5-cache/x11-libs/libXaw-1.0.11-r1
index 09d91004437a..ef74a302cad8 100644
--- a/metadata/md5-cache/x11-libs/libXaw-1.0.11-r1
+++ b/metadata/md5-cache/x11-libs/libXaw-1.0.11-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-proto/xproto x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-proto/xproto x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xaw library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-proto/xproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.11.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=29aae0f2f9593d43122ab0dc80685fda
diff --git a/metadata/md5-cache/x11-libs/libXaw-1.0.11-r2 b/metadata/md5-cache/x11-libs/libXaw-1.0.11-r2
index e6084cd2c6c0..461017b00434 100644
--- a/metadata/md5-cache/x11-libs/libXaw-1.0.11-r2
+++ b/metadata/md5-cache/x11-libs/libXaw-1.0.11-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xaw library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.11.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d1cb6b264ca549bb587ce86cefbb80bc
diff --git a/metadata/md5-cache/x11-libs/libXaw-1.0.9 b/metadata/md5-cache/x11-libs/libXaw-1.0.9
index d01a712fc562..a8d2afc87c3a 100644
--- a/metadata/md5-cache/x11-libs/libXaw-1.0.9
+++ b/metadata/md5-cache/x11-libs/libXaw-1.0.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-proto/xproto x11-proto/xextproto doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-proto/xproto x11-proto/xextproto doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xaw library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-proto/xproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=f342ff9a9b8c1b1cd2d6b4ad5ff2426b
diff --git a/metadata/md5-cache/x11-libs/libXaw3d-1.6.2 b/metadata/md5-cache/x11-libs/libXaw3d-1.6.2
index fa99e6764b69..57064a193f78 100644
--- a/metadata/md5-cache/x11-libs/libXaw3d-1.6.2
+++ b/metadata/md5-cache/x11-libs/libXaw3d-1.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt sys-devel/flex virtual/yacc x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt sys-devel/flex virtual/yacc x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xaw3d library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXaw3d-1.6.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=728e2b628da0d1f8184ae9fe34e91662
diff --git a/metadata/md5-cache/x11-libs/libXcomposite-0.4.3 b/metadata/md5-cache/x11-libs/libXcomposite-0.4.3
index b4b717f9380f..be348a081e11 100644
--- a/metadata/md5-cache/x11-libs/libXcomposite-0.4.3
+++ b/metadata/md5-cache/x11-libs/libXcomposite-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXfixes x11-libs/libXext >=x11-proto/compositeproto-0.4 x11-proto/xproto doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXfixes x11-libs/libXext >=x11-proto/compositeproto-0.4 x11-proto/xproto doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xcomposite library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXfixes x11-libs/libXext >=x11-proto/compositeproto-0.4 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXcomposite-0.4.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=add67440f52a6166b4903d797514b0cb
diff --git a/metadata/md5-cache/x11-libs/libXcomposite-0.4.3-r1 b/metadata/md5-cache/x11-libs/libXcomposite-0.4.3-r1
index d0fad9aeebef..541501b3ed1d 100644
--- a/metadata/md5-cache/x11-libs/libXcomposite-0.4.3-r1
+++ b/metadata/md5-cache/x11-libs/libXcomposite-0.4.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXfixes >=x11-proto/compositeproto-0.4 x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=x11-libs/libX11 x11-libs/libXfixes >=x11-proto/compositeproto-0.4 x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xcomposite library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXfixes >=x11-proto/compositeproto-0.4 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXcomposite-0.4.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=63019184895a82c7b9521dc3c8ec8884
diff --git a/metadata/md5-cache/x11-libs/libXcomposite-0.4.4 b/metadata/md5-cache/x11-libs/libXcomposite-0.4.4
index f58b5d5618db..b8b9521ea115 100644
--- a/metadata/md5-cache/x11-libs/libXcomposite-0.4.4
+++ b/metadata/md5-cache/x11-libs/libXcomposite-0.4.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXfixes >=x11-proto/compositeproto-0.4 x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=x11-libs/libX11 x11-libs/libXfixes >=x11-proto/compositeproto-0.4 x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xcomposite library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXfixes >=x11-proto/compositeproto-0.4 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXcomposite-0.4.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=b3b78736f8d92adee06d7f350e908b72
diff --git a/metadata/md5-cache/x11-libs/libXcomposite-0.4.4-r1 b/metadata/md5-cache/x11-libs/libXcomposite-0.4.4-r1
index 83859f7e8028..ae5333a93ee3 100644
--- a/metadata/md5-cache/x11-libs/libXcomposite-0.4.4-r1
+++ b/metadata/md5-cache/x11-libs/libXcomposite-0.4.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/compositeproto-0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/compositeproto-0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xcomposite library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/compositeproto-0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXcomposite-0.4.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=90f4a495fb2670e37438fa31f5f6c55a
diff --git a/metadata/md5-cache/x11-libs/libXcursor-1.1.11 b/metadata/md5-cache/x11-libs/libXcursor-1.1.11
index 9c1759fa3f67..8a6ac07704f0 100644
--- a/metadata/md5-cache/x11-libs/libXcursor-1.1.11
+++ b/metadata/md5-cache/x11-libs/libXcursor-1.1.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libXfixes x11-libs/libX11 x11-proto/fixesproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libXfixes x11-libs/libX11 x11-proto/fixesproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xcursor library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libXfixes x11-libs/libX11 x11-proto/fixesproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.11.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=e2692191ccdc682e1452f2082dc4de37
diff --git a/metadata/md5-cache/x11-libs/libXcursor-1.1.12 b/metadata/md5-cache/x11-libs/libXcursor-1.1.12
index 07879670d933..701aafd47845 100644
--- a/metadata/md5-cache/x11-libs/libXcursor-1.1.12
+++ b/metadata/md5-cache/x11-libs/libXcursor-1.1.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libXfixes x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libXfixes x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xcursor library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libXfixes x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.12.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a6cdcaedcaa4fabd0ca329dd34a8f39c
diff --git a/metadata/md5-cache/x11-libs/libXcursor-1.1.13 b/metadata/md5-cache/x11-libs/libXcursor-1.1.13
index 0c6edbe5dcd5..2c6e9eff979d 100644
--- a/metadata/md5-cache/x11-libs/libXcursor-1.1.13
+++ b/metadata/md5-cache/x11-libs/libXcursor-1.1.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libXfixes x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libXfixes x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xcursor library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libXfixes x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.13.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=c2e4f679c3e0b8fd853eaafcb44222cf
diff --git a/metadata/md5-cache/x11-libs/libXcursor-1.1.13-r1 b/metadata/md5-cache/x11-libs/libXcursor-1.1.13-r1
index 12e6ec01d9ea..267271471a8d 100644
--- a/metadata/md5-cache/x11-libs/libXcursor-1.1.13-r1
+++ b/metadata/md5-cache/x11-libs/libXcursor-1.1.13-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libXrender-0.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libXrender-0.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xcursor library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.13.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5dd06b20e13f32a25736b3d700048657
diff --git a/metadata/md5-cache/x11-libs/libXdamage-1.1.3 b/metadata/md5-cache/x11-libs/libXdamage-1.1.3
index 13df68ce21cf..ed677e6399a8 100644
--- a/metadata/md5-cache/x11-libs/libXdamage-1.1.3
+++ b/metadata/md5-cache/x11-libs/libXdamage-1.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXfixes >=x11-proto/damageproto-1.1 x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXfixes >=x11-proto/damageproto-1.1 x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xdamage library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXfixes >=x11-proto/damageproto-1.1 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXdamage-1.1.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=0cda8bdfac9aec7fb0c71ee9d74493f2
diff --git a/metadata/md5-cache/x11-libs/libXdamage-1.1.4 b/metadata/md5-cache/x11-libs/libXdamage-1.1.4
index 8b9562675fbb..b0dd8fec7778 100644
--- a/metadata/md5-cache/x11-libs/libXdamage-1.1.4
+++ b/metadata/md5-cache/x11-libs/libXdamage-1.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXfixes >=x11-proto/damageproto-1.1 x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXfixes >=x11-proto/damageproto-1.1 x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xdamage library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXfixes >=x11-proto/damageproto-1.1 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXdamage-1.1.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=128cdf096e123766acfc47d475a8c8ec
diff --git a/metadata/md5-cache/x11-libs/libXdamage-1.1.4-r1 b/metadata/md5-cache/x11-libs/libXdamage-1.1.4-r1
index 34ead48c6ece..2b3b21463a60 100644
--- a/metadata/md5-cache/x11-libs/libXdamage-1.1.4-r1
+++ b/metadata/md5-cache/x11-libs/libXdamage-1.1.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/damageproto-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/damageproto-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xdamage library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/damageproto-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXdamage-1.1.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=8c45946dc3484df7060e9d96a505c629
diff --git a/metadata/md5-cache/x11-libs/libXdmcp-1.1.0 b/metadata/md5-cache/x11-libs/libXdmcp-1.1.0
index ef297060e884..cc7d54eade3c 100644
--- a/metadata/md5-cache/x11-libs/libXdmcp-1.1.0
+++ b/metadata/md5-cache/x11-libs/libXdmcp-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-proto/xproto doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-proto/xproto doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xdmcp library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-1.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=1e9940b102689d4e135888c24132c3bc
diff --git a/metadata/md5-cache/x11-libs/libXdmcp-1.1.1 b/metadata/md5-cache/x11-libs/libXdmcp-1.1.1
index dc44d3541d25..841ecb321bb6 100644
--- a/metadata/md5-cache/x11-libs/libXdmcp-1.1.1
+++ b/metadata/md5-cache/x11-libs/libXdmcp-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xdmcp library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=29e4240c7f3c088aa731b99fa010454b
diff --git a/metadata/md5-cache/x11-libs/libXdmcp-1.1.1-r1 b/metadata/md5-cache/x11-libs/libXdmcp-1.1.1-r1
index 3467934241c1..1e4af588a233 100644
--- a/metadata/md5-cache/x11-libs/libXdmcp-1.1.1-r1
+++ b/metadata/md5-cache/x11-libs/libXdmcp-1.1.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xdmcp library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-proto/xproto abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4afb2d25bf94b56beb3a43a8c196e131
diff --git a/metadata/md5-cache/x11-libs/libXevie-1.0.3 b/metadata/md5-cache/x11-libs/libXevie-1.0.3
index 34e75f288806..b57883053744 100644
--- a/metadata/md5-cache/x11-libs/libXevie-1.0.3
+++ b/metadata/md5-cache/x11-libs/libXevie-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/xproto x11-proto/evieext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/xproto x11-proto/evieext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xevie library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/xproto x11-proto/evieext
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXevie-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=48e2d02e2076562fc9a2866562c47746
diff --git a/metadata/md5-cache/x11-libs/libXext-1.2.0 b/metadata/md5-cache/x11-libs/libXext-1.2.0
index c65bfd3e046f..05cf28557aa8 100644
--- a/metadata/md5-cache/x11-libs/libXext-1.2.0
+++ b/metadata/md5-cache/x11-libs/libXext-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libX11-1.2 >=x11-proto/xextproto-7.1 >=x11-proto/xproto-7.0.13 doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libX11-1.2 >=x11-proto/xextproto-7.1 >=x11-proto/xproto-7.0.13 doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xext library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.2 >=x11-proto/xextproto-7.1 >=x11-proto/xproto-7.0.13
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXext-1.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=cb33d1a21f6603002f3f746c6ec4c813
diff --git a/metadata/md5-cache/x11-libs/libXext-1.3.0 b/metadata/md5-cache/x11-libs/libXext-1.3.0
index 875d2caa751a..06cccc48fb41 100644
--- a/metadata/md5-cache/x11-libs/libXext-1.3.0
+++ b/metadata/md5-cache/x11-libs/libXext-1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libX11-1.2 >=x11-proto/xextproto-7.1.99 x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/libX11-1.2 >=x11-proto/xextproto-7.1.99 x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xext library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.2 >=x11-proto/xextproto-7.1.99
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXext-1.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=3d196a204cae8a657945df19dbcd491e
diff --git a/metadata/md5-cache/x11-libs/libXext-1.3.1 b/metadata/md5-cache/x11-libs/libXext-1.3.1
index a6fcca57057e..899a2109c7c7 100644
--- a/metadata/md5-cache/x11-libs/libXext-1.3.1
+++ b/metadata/md5-cache/x11-libs/libXext-1.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libX11-1.2 >=x11-proto/xextproto-7.1.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/libX11-1.2 >=x11-proto/xextproto-7.1.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xext library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.2 >=x11-proto/xextproto-7.1.99
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXext-1.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=087b21ced19cf4c31c75897f578abe7c
diff --git a/metadata/md5-cache/x11-libs/libXext-1.3.1-r1 b/metadata/md5-cache/x11-libs/libXext-1.3.1-r1
index 3643b4facca5..4cd8e409e4ce 100644
--- a/metadata/md5-cache/x11-libs/libXext-1.3.1-r1
+++ b/metadata/md5-cache/x11-libs/libXext-1.3.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libX11-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xextproto-7.1.99[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/libX11-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xextproto-7.1.99[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xext library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xextproto-7.1.99[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXext-1.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=e25b362fb23c6330fbc64dd218ff5311
diff --git a/metadata/md5-cache/x11-libs/libXfixes-5.0 b/metadata/md5-cache/x11-libs/libXfixes-5.0
index 9147b6b01760..4686c34656fc 100644
--- a/metadata/md5-cache/x11-libs/libXfixes-5.0
+++ b/metadata/md5-cache/x11-libs/libXfixes-5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 >=x11-proto/fixesproto-5 x11-proto/xproto x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 >=x11-proto/fixesproto-5 x11-proto/xproto x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xfixes library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 >=x11-proto/fixesproto-5 x11-proto/xproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfixes-5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=17782c993b51df0622453c7787169428
diff --git a/metadata/md5-cache/x11-libs/libXfixes-5.0-r1 b/metadata/md5-cache/x11-libs/libXfixes-5.0-r1
index a1d9f7c21acd..92488acf1849 100644
--- a/metadata/md5-cache/x11-libs/libXfixes-5.0-r1
+++ b/metadata/md5-cache/x11-libs/libXfixes-5.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/fixesproto-5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/fixesproto-5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xfixes library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/fixesproto-5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfixes-5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d691968878927b81745e16c3f7af600f
diff --git a/metadata/md5-cache/x11-libs/libXfont-1.4.4 b/metadata/md5-cache/x11-libs/libXfont-1.4.4
index 9df16f561a06..16c69124189e 100644
--- a/metadata/md5-cache/x11-libs/libXfont-1.4.4
+++ b/metadata/md5-cache/x11-libs/libXfont-1.4.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xfont library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=831850b010dc3d88f1476e2365942978
diff --git a/metadata/md5-cache/x11-libs/libXfont-1.4.5 b/metadata/md5-cache/x11-libs/libXfont-1.4.5
index f7fa21326de6..73e1d60351ed 100644
--- a/metadata/md5-cache/x11-libs/libXfont-1.4.5
+++ b/metadata/md5-cache/x11-libs/libXfont-1.4.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xfont library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=eb2a0ee7d1806fcb44e891d085aaecdd
diff --git a/metadata/md5-cache/x11-libs/libXfont-1.4.5-r1 b/metadata/md5-cache/x11-libs/libXfont-1.4.5-r1
index 1f2fdde369ee..c45087d58d21 100644
--- a/metadata/md5-cache/x11-libs/libXfont-1.4.5-r1
+++ b/metadata/md5-cache/x11-libs/libXfont-1.4.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/xtrans x11-libs/libfontenc truetype? ( >=media-libs/freetype-2 ) bzip2? ( app-arch/bzip2 ) x11-proto/xproto x11-proto/fontsproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=x11-libs/xtrans x11-libs/libfontenc truetype? ( >=media-libs/freetype-2 ) bzip2? ( app-arch/bzip2 ) x11-proto/xproto x11-proto/fontsproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xfont library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/xtrans x11-libs/libfontenc truetype? ( >=media-libs/freetype-2 ) bzip2? ( app-arch/bzip2 ) x11-proto/xproto x11-proto/fontsproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=e2fd10f7dee08802b8447db25f132ec4
diff --git a/metadata/md5-cache/x11-libs/libXfontcache-1.0.5 b/metadata/md5-cache/x11-libs/libXfontcache-1.0.5
index 6da77564181a..27bcc056bff9 100644
--- a/metadata/md5-cache/x11-libs/libXfontcache-1.0.5
+++ b/metadata/md5-cache/x11-libs/libXfontcache-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/fontcacheproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/fontcacheproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=X.Org Xfontcache library
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfontcache-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=e5c88fbf03520b68d4fb063971f79531
diff --git a/metadata/md5-cache/x11-libs/libXfontcache-1.0.5-r1 b/metadata/md5-cache/x11-libs/libXfontcache-1.0.5-r1
index eeb38c78f7df..66fb5e6e303a 100644
--- a/metadata/md5-cache/x11-libs/libXfontcache-1.0.5-r1
+++ b/metadata/md5-cache/x11-libs/libXfontcache-1.0.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/fontcacheproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/fontcacheproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xfontcache library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/fontcacheproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfontcache-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=ac6c04d0082e026e4ec1b63280d954f1
diff --git a/metadata/md5-cache/x11-libs/libXft-2.2.0 b/metadata/md5-cache/x11-libs/libXft-2.2.0
index cf6aff73358f..5ea85e445fb2 100644
--- a/metadata/md5-cache/x11-libs/libXft-2.2.0
+++ b/metadata/md5-cache/x11-libs/libXft-2.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto virtual/ttf-fonts || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto virtual/ttf-fonts || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xft library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto virtual/ttf-fonts
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXft-2.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=0c20e5bd8a0b4eb68ebccfd428e2455b
diff --git a/metadata/md5-cache/x11-libs/libXft-2.3.0 b/metadata/md5-cache/x11-libs/libXft-2.3.0
index 5e9c7ecec567..9e1dcfdc168f 100644
--- a/metadata/md5-cache/x11-libs/libXft-2.3.0
+++ b/metadata/md5-cache/x11-libs/libXft-2.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto virtual/ttf-fonts || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto virtual/ttf-fonts || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xft library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto virtual/ttf-fonts
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXft-2.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=37889830878cfa790ce4b64d51b16307
diff --git a/metadata/md5-cache/x11-libs/libXft-2.3.0-r1 b/metadata/md5-cache/x11-libs/libXft-2.3.0-r1
index 2ab37fb49f6f..8f48a7dc93f1 100644
--- a/metadata/md5-cache/x11-libs/libXft-2.3.0-r1
+++ b/metadata/md5-cache/x11-libs/libXft-2.3.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto virtual/ttf-fonts || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto virtual/ttf-fonts || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xft library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto virtual/ttf-fonts
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXft-2.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=021cb477e36408168bd7b8b37578acde
diff --git a/metadata/md5-cache/x11-libs/libXft-2.3.1 b/metadata/md5-cache/x11-libs/libXft-2.3.1
index 772b805e2d0f..54d266142149 100644
--- a/metadata/md5-cache/x11-libs/libXft-2.3.1
+++ b/metadata/md5-cache/x11-libs/libXft-2.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto virtual/ttf-fonts || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto virtual/ttf-fonts || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xft library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto virtual/ttf-fonts
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXft-2.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=3b60c3071e4d8bbaa260edcee97d3877
diff --git a/metadata/md5-cache/x11-libs/libXft-2.3.1-r1 b/metadata/md5-cache/x11-libs/libXft-2.3.1-r1
index d5357b4bd067..80d76cd881fb 100644
--- a/metadata/md5-cache/x11-libs/libXft-2.3.1-r1
+++ b/metadata/md5-cache/x11-libs/libXft-2.3.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libXrender-0.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] virtual/ttf-fonts || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libXrender-0.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] virtual/ttf-fonts || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xft library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] virtual/ttf-fonts abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXft-2.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=cf85a8bd0eb07d189ca78bcb3adf8be1
diff --git a/metadata/md5-cache/x11-libs/libXi-1.6.1 b/metadata/md5-cache/x11-libs/libXi-1.6.1
index 734fa557e57c..d5f8a2008129 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.6.1
+++ b/metadata/md5-cache/x11-libs/libXi-1.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libX11-1.4.99.1 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.1.99.6 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/libX11-1.4.99.1 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.1.99.6 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xi library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.4.99.1 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.1.99.6 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.6.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=46d3b41815fed2240d8648fd8723866f
diff --git a/metadata/md5-cache/x11-libs/libXi-1.6.2 b/metadata/md5-cache/x11-libs/libXi-1.6.2
index 847750a0ef7e..6791c2bd928e 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.6.2
+++ b/metadata/md5-cache/x11-libs/libXi-1.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libX11-1.4.99.1 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.1.99.6 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/libX11-1.4.99.1 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.1.99.6 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xi library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.4.99.1 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.1.99.6 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.6.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=cef5ad409160d0c542dbb75f77538cff
diff --git a/metadata/md5-cache/x11-libs/libXi-1.6.2-r1 b/metadata/md5-cache/x11-libs/libXi-1.6.2-r1
index b3f14fdb981a..733529c8b72a 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.6.2-r1
+++ b/metadata/md5-cache/x11-libs/libXi-1.6.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libX11-1.4.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-libs/libXext-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/inputproto-2.1.99.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xproto-7.0.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xextproto-7.0.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/libX11-1.4.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-libs/libXext-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/inputproto-2.1.99.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xproto-7.0.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xextproto-7.0.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xi library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.4.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-libs/libXext-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/inputproto-2.1.99.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xproto-7.0.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xextproto-7.0.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.6.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=640f3b059defe906d153505caaa87928
diff --git a/metadata/md5-cache/x11-libs/libXi-1.7 b/metadata/md5-cache/x11-libs/libXi-1.7
index 47234ffe88d1..8a76ade216eb 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.7
+++ b/metadata/md5-cache/x11-libs/libXi-1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libX11-1.4.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-libs/libXext-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/inputproto-2.2.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xproto-7.0.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xextproto-7.0.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/libX11-1.4.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-libs/libXext-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/inputproto-2.2.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xproto-7.0.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xextproto-7.0.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xi library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.4.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-libs/libXext-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/inputproto-2.2.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xproto-7.0.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xextproto-7.0.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=b9927032cc8219e3fd41ed8a13156fc3
diff --git a/metadata/md5-cache/x11-libs/libXi-1.7.1 b/metadata/md5-cache/x11-libs/libXi-1.7.1
index ae53ef6f619f..c67a6d662615 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.7.1
+++ b/metadata/md5-cache/x11-libs/libXi-1.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libX11-1.4.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-libs/libXext-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-libs/libXfixes-5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/inputproto-2.2.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xproto-7.0.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xextproto-7.0.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/libX11-1.4.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-libs/libXext-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-libs/libXfixes-5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/inputproto-2.2.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xproto-7.0.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xextproto-7.0.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xi library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.4.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-libs/libXext-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-libs/libXfixes-5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/inputproto-2.2.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xproto-7.0.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xextproto-7.0.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.7.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=86c790f30a648f990a278bfe49d226a9
diff --git a/metadata/md5-cache/x11-libs/libXinerama-1.1.1 b/metadata/md5-cache/x11-libs/libXinerama-1.1.1
index 5044c3be6b18..69f0ce005b19 100644
--- a/metadata/md5-cache/x11-libs/libXinerama-1.1.1
+++ b/metadata/md5-cache/x11-libs/libXinerama-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto >=x11-proto/xineramaproto-1.2 x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto >=x11-proto/xineramaproto-1.2 x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xinerama library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto >=x11-proto/xineramaproto-1.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXinerama-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=47b839909633ebb5417e1f470ca5c9e8
diff --git a/metadata/md5-cache/x11-libs/libXinerama-1.1.2 b/metadata/md5-cache/x11-libs/libXinerama-1.1.2
index c3cc60d655c2..78806c993052 100644
--- a/metadata/md5-cache/x11-libs/libXinerama-1.1.2
+++ b/metadata/md5-cache/x11-libs/libXinerama-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto >=x11-proto/xineramaproto-1.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto >=x11-proto/xineramaproto-1.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xinerama library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto >=x11-proto/xineramaproto-1.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXinerama-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=05be12621714281b6bcc2fae5e4c2773
diff --git a/metadata/md5-cache/x11-libs/libXinerama-1.1.2-r1 b/metadata/md5-cache/x11-libs/libXinerama-1.1.2-r1
index 69781e9e3a8d..77092a38626b 100644
--- a/metadata/md5-cache/x11-libs/libXinerama-1.1.2-r1
+++ b/metadata/md5-cache/x11-libs/libXinerama-1.1.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xineramaproto-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xineramaproto-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xinerama library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xineramaproto-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXinerama-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=9c32e3d3487470f188529541cfd35c23
diff --git a/metadata/md5-cache/x11-libs/libXmu-1.1.0 b/metadata/md5-cache/x11-libs/libXmu-1.1.0
index d7a867fa8b62..add9311efd21 100644
--- a/metadata/md5-cache/x11-libs/libXmu-1.1.0
+++ b/metadata/md5-cache/x11-libs/libXmu-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libXt x11-libs/libXext x11-libs/libX11 x11-proto/xextproto doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXt x11-libs/libXext x11-libs/libX11 x11-proto/xextproto doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xmu library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXt x11-libs/libXext x11-libs/libX11 x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXmu-1.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=0af04ec0528c0e44ccd22aac8efe71f7
diff --git a/metadata/md5-cache/x11-libs/libXmu-1.1.1 b/metadata/md5-cache/x11-libs/libXmu-1.1.1
index 3fe9e99a1327..0d22ed7ed3a9 100644
--- a/metadata/md5-cache/x11-libs/libXmu-1.1.1
+++ b/metadata/md5-cache/x11-libs/libXmu-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libXt x11-libs/libXext x11-libs/libX11 x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=x11-libs/libXt x11-libs/libXext x11-libs/libX11 x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xmu library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXt x11-libs/libXext x11-libs/libX11 x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXmu-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=2bd68ef559e254ee9d85eb6f38909bc2
diff --git a/metadata/md5-cache/x11-libs/libXmu-1.1.1-r1 b/metadata/md5-cache/x11-libs/libXmu-1.1.1-r1
index 1b35577c0474..6b1a06663906 100644
--- a/metadata/md5-cache/x11-libs/libXmu-1.1.1-r1
+++ b/metadata/md5-cache/x11-libs/libXmu-1.1.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xmu library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXmu-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=b7c148ebb928f9e865e07c1de216b566
diff --git a/metadata/md5-cache/x11-libs/libXp-1.0.1 b/metadata/md5-cache/x11-libs/libXp-1.0.1
index 01e56e9d224b..4ba33829f318 100644
--- a/metadata/md5-cache/x11-libs/libXp-1.0.1
+++ b/metadata/md5-cache/x11-libs/libXp-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-proto/xextproto x11-proto/printproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-proto/xextproto x11-proto/printproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xp library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-proto/xextproto x11-proto/printproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXp-1.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d2c1acc0d69a92816244de6ef16dacf6
diff --git a/metadata/md5-cache/x11-libs/libXp-1.0.1-r1 b/metadata/md5-cache/x11-libs/libXp-1.0.1-r1
index f32336d82030..f848efe7900a 100644
--- a/metadata/md5-cache/x11-libs/libXp-1.0.1-r1
+++ b/metadata/md5-cache/x11-libs/libXp-1.0.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXau[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/printproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXau[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/printproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xp library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXau[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/printproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXp-1.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=fd111cb6e72d01e6bedd2523cfb569d7
diff --git a/metadata/md5-cache/x11-libs/libXpm-3.5.10 b/metadata/md5-cache/x11-libs/libXpm-3.5.10
index 491ee9bf3ac1..0c2fbaa23de8 100644
--- a/metadata/md5-cache/x11-libs/libXpm-3.5.10
+++ b/metadata/md5-cache/x11-libs/libXpm-3.5.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-proto/xextproto x11-proto/xproto sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-proto/xextproto x11-proto/xproto sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xpm library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-proto/xextproto x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXpm-3.5.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=102c324df635632bce2c03ee074395ea
diff --git a/metadata/md5-cache/x11-libs/libXpm-3.5.10-r1 b/metadata/md5-cache/x11-libs/libXpm-3.5.10-r1
index d742cd672f4f..f7bb841d494f 100644
--- a/metadata/md5-cache/x11-libs/libXpm-3.5.10-r1
+++ b/metadata/md5-cache/x11-libs/libXpm-3.5.10-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xpm library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXpm-3.5.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=c7fc1ff7f9b5444cf04bb1432c5f26a0
diff --git a/metadata/md5-cache/x11-libs/libXpm-3.5.9 b/metadata/md5-cache/x11-libs/libXpm-3.5.9
index f20e606ab182..dd550b3f92b4 100644
--- a/metadata/md5-cache/x11-libs/libXpm-3.5.9
+++ b/metadata/md5-cache/x11-libs/libXpm-3.5.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-proto/xextproto x11-proto/xproto sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-proto/xextproto x11-proto/xproto sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xpm library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-proto/xextproto x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXpm-3.5.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=1ecaf7d6f8709046d32e7f1504278228
diff --git a/metadata/md5-cache/x11-libs/libXrandr-1.3.1 b/metadata/md5-cache/x11-libs/libXrandr-1.3.1
index f7e2633c6c53..14160a389f15 100644
--- a/metadata/md5-cache/x11-libs/libXrandr-1.3.1
+++ b/metadata/md5-cache/x11-libs/libXrandr-1.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-proto/randrproto-1.3.1 x11-proto/renderproto x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-proto/randrproto-1.3.1 x11-proto/renderproto x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xrandr library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-proto/randrproto-1.3.1 x11-proto/renderproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6c20678340fb900238cd1740ef8a2294
diff --git a/metadata/md5-cache/x11-libs/libXrandr-1.3.2 b/metadata/md5-cache/x11-libs/libXrandr-1.3.2
index 0c024455fc46..4a8f24327ac4 100644
--- a/metadata/md5-cache/x11-libs/libXrandr-1.3.2
+++ b/metadata/md5-cache/x11-libs/libXrandr-1.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-proto/randrproto-1.3.2 x11-proto/renderproto x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-proto/randrproto-1.3.2 x11-proto/renderproto x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xrandr library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-proto/randrproto-1.3.2 x11-proto/renderproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.3.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d2f44ac962c0f7b253fe1e649aa91d0d
diff --git a/metadata/md5-cache/x11-libs/libXrandr-1.4.0 b/metadata/md5-cache/x11-libs/libXrandr-1.4.0
index 34062d157012..41e129594fe2 100644
--- a/metadata/md5-cache/x11-libs/libXrandr-1.4.0
+++ b/metadata/md5-cache/x11-libs/libXrandr-1.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xrandr library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.4.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4763ac5dcfc9f9604d314e462c3f8788
diff --git a/metadata/md5-cache/x11-libs/libXrandr-1.4.0-r1 b/metadata/md5-cache/x11-libs/libXrandr-1.4.0-r1
index db4cc9a07182..6005ef2eb4e1 100644
--- a/metadata/md5-cache/x11-libs/libXrandr-1.4.0-r1
+++ b/metadata/md5-cache/x11-libs/libXrandr-1.4.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/randrproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/renderproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/randrproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/renderproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xrandr library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/randrproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/renderproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.4.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=082b91c1d7a5d2d7bfc64d4f30e9c4fe
diff --git a/metadata/md5-cache/x11-libs/libXrender-0.9.6 b/metadata/md5-cache/x11-libs/libXrender-0.9.6
index df6205a7d0f0..b3f0d339aa5f 100644
--- a/metadata/md5-cache/x11-libs/libXrender-0.9.6
+++ b/metadata/md5-cache/x11-libs/libXrender-0.9.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 >=x11-proto/renderproto-0.9.3 x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 >=x11-proto/renderproto-0.9.3 x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xrender library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 >=x11-proto/renderproto-0.9.3 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXrender-0.9.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=91bb62872a1a7d81b919701b915303d2
diff --git a/metadata/md5-cache/x11-libs/libXrender-0.9.7 b/metadata/md5-cache/x11-libs/libXrender-0.9.7
index f73fe2dc5f5e..17a3c3d30975 100644
--- a/metadata/md5-cache/x11-libs/libXrender-0.9.7
+++ b/metadata/md5-cache/x11-libs/libXrender-0.9.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 >=x11-proto/renderproto-0.9.3 x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 >=x11-proto/renderproto-0.9.3 x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xrender library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 >=x11-proto/renderproto-0.9.3 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXrender-0.9.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=2ba19ab5c3e4d9d26e3eb86146d02514
diff --git a/metadata/md5-cache/x11-libs/libXrender-0.9.7-r1 b/metadata/md5-cache/x11-libs/libXrender-0.9.7-r1
index 4d3850f6fff1..67f8429db79e 100644
--- a/metadata/md5-cache/x11-libs/libXrender-0.9.7-r1
+++ b/metadata/md5-cache/x11-libs/libXrender-0.9.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/renderproto-0.9.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/renderproto-0.9.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xrender library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/renderproto-0.9.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXrender-0.9.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a3c3fd095ba292f88a6a24a0a292f714
diff --git a/metadata/md5-cache/x11-libs/libXres-1.0.5 b/metadata/md5-cache/x11-libs/libXres-1.0.5
index b9f41a1b73bf..00e939987ff6 100644
--- a/metadata/md5-cache/x11-libs/libXres-1.0.5
+++ b/metadata/md5-cache/x11-libs/libXres-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/resourceproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/resourceproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org XRes library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/resourceproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXres-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=339954a3ade3142ff641fda906082861
diff --git a/metadata/md5-cache/x11-libs/libXres-1.0.6 b/metadata/md5-cache/x11-libs/libXres-1.0.6
index 4cdf1f33879f..e1b91db15c5e 100644
--- a/metadata/md5-cache/x11-libs/libXres-1.0.6
+++ b/metadata/md5-cache/x11-libs/libXres-1.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/resourceproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/resourceproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org XRes library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/resourceproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXres-1.0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=974ea46e721e9211ee028d9133fd34d0
diff --git a/metadata/md5-cache/x11-libs/libXt-1.1.1 b/metadata/md5-cache/x11-libs/libXt-1.1.1
index 7a416a15fab4..1324f26294f2 100644
--- a/metadata/md5-cache/x11-libs/libXt-1.1.1
+++ b/metadata/md5-cache/x11-libs/libXt-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-proto/xproto x11-proto/kbproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-proto/xproto x11-proto/kbproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xt library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-proto/xproto x11-proto/kbproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXt-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d1509ea9b8f7477a9dc6b6732d9de40d
diff --git a/metadata/md5-cache/x11-libs/libXt-1.1.3 b/metadata/md5-cache/x11-libs/libXt-1.1.3
index c1bd572b1494..cf15f3baa8a3 100644
--- a/metadata/md5-cache/x11-libs/libXt-1.1.3
+++ b/metadata/md5-cache/x11-libs/libXt-1.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-proto/xproto x11-proto/kbproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-proto/xproto x11-proto/kbproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xt library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-proto/xproto x11-proto/kbproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXt-1.1.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=35802510a2e1171e18aa2dc4aee0d806
diff --git a/metadata/md5-cache/x11-libs/libXt-1.1.3-r1 b/metadata/md5-cache/x11-libs/libXt-1.1.3-r1
index feb77b94a3f9..aed914aafb65 100644
--- a/metadata/md5-cache/x11-libs/libXt-1.1.3-r1
+++ b/metadata/md5-cache/x11-libs/libXt-1.1.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libICE[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/kbproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libICE[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/kbproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xt library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libICE[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/kbproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXt-1.1.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7a9289a5211f0677c546dfaa9c4fa578
diff --git a/metadata/md5-cache/x11-libs/libXtst-1.2.0 b/metadata/md5-cache/x11-libs/libXtst-1.2.0
index 1fc9b5f200e6..fee48dae28bd 100644
--- a/metadata/md5-cache/x11-libs/libXtst-1.2.0
+++ b/metadata/md5-cache/x11-libs/libXtst-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 >=x11-libs/libXext-1.0.99.4 x11-libs/libXi x11-proto/inputproto >=x11-proto/recordproto-1.13.99.1 >=x11-proto/xextproto-7.0.99.3 doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 >=x11-libs/libXext-1.0.99.4 x11-libs/libXi x11-proto/inputproto >=x11-proto/recordproto-1.13.99.1 >=x11-proto/xextproto-7.0.99.3 doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xtst library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 >=x11-libs/libXext-1.0.99.4 x11-libs/libXi x11-proto/inputproto >=x11-proto/recordproto-1.13.99.1 >=x11-proto/xextproto-7.0.99.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXtst-1.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a600198db5ffc168fe971448945e6d98
diff --git a/metadata/md5-cache/x11-libs/libXtst-1.2.1 b/metadata/md5-cache/x11-libs/libXtst-1.2.1
index ff0faec7f3a0..afae1f1cce18 100644
--- a/metadata/md5-cache/x11-libs/libXtst-1.2.1
+++ b/metadata/md5-cache/x11-libs/libXtst-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 >=x11-libs/libXext-1.0.99.4 x11-libs/libXi >=x11-proto/recordproto-1.13.99.1 >=x11-proto/xextproto-7.0.99.3 x11-proto/inputproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=x11-libs/libX11 >=x11-libs/libXext-1.0.99.4 x11-libs/libXi >=x11-proto/recordproto-1.13.99.1 >=x11-proto/xextproto-7.0.99.3 x11-proto/inputproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xtst library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 >=x11-libs/libXext-1.0.99.4 x11-libs/libXi >=x11-proto/recordproto-1.13.99.1 >=x11-proto/xextproto-7.0.99.3 x11-proto/inputproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXtst-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=461f55c198ebfa89982bd9d587e3fa53
diff --git a/metadata/md5-cache/x11-libs/libXtst-1.2.1-r1 b/metadata/md5-cache/x11-libs/libXtst-1.2.1-r1
index 53da1a04d709..1128b1f44a67 100644
--- a/metadata/md5-cache/x11-libs/libXtst-1.2.1-r1
+++ b/metadata/md5-cache/x11-libs/libXtst-1.2.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-libs/libXext-1.0.99.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/recordproto-1.13.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xextproto-7.0.99.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/inputproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-libs/libXext-1.0.99.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/recordproto-1.13.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xextproto-7.0.99.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/inputproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xtst library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-libs/libXext-1.0.99.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/recordproto-1.13.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xextproto-7.0.99.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/inputproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXtst-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=363dd4bc9a7362b51c2b3c678a259197
diff --git a/metadata/md5-cache/x11-libs/libXv-1.0.6 b/metadata/md5-cache/x11-libs/libXv-1.0.6
index b704e2d36320..15a6034eddaa 100644
--- a/metadata/md5-cache/x11-libs/libXv-1.0.6
+++ b/metadata/md5-cache/x11-libs/libXv-1.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/videoproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/videoproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xv library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/videoproto x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXv-1.0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7141561df062300c4d6e4d81ff2111d6
diff --git a/metadata/md5-cache/x11-libs/libXv-1.0.7 b/metadata/md5-cache/x11-libs/libXv-1.0.7
index 9340c5494473..8de5b8bf6954 100644
--- a/metadata/md5-cache/x11-libs/libXv-1.0.7
+++ b/metadata/md5-cache/x11-libs/libXv-1.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/videoproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/videoproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xv library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/videoproto x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXv-1.0.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=3510250102506408b6e04484dae96670
diff --git a/metadata/md5-cache/x11-libs/libXv-1.0.7-r1 b/metadata/md5-cache/x11-libs/libXv-1.0.7-r1
index cec5f2b6133a..b830395b4229 100644
--- a/metadata/md5-cache/x11-libs/libXv-1.0.7-r1
+++ b/metadata/md5-cache/x11-libs/libXv-1.0.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/videoproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/videoproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xv library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/videoproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXv-1.0.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=9aaa793e4e2938dd426a06fae82d4300
diff --git a/metadata/md5-cache/x11-libs/libXvMC-1.0.6 b/metadata/md5-cache/x11-libs/libXvMC-1.0.6
index 1d77954599c3..30ed1138085a 100644
--- a/metadata/md5-cache/x11-libs/libXvMC-1.0.6
+++ b/metadata/md5-cache/x11-libs/libXvMC-1.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-proto/videoproto x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-proto/videoproto x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org XvMC library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=app-admin/eselect-xvmc
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-proto/videoproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXvMC-1.0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a822fe1ce6ab598f1d6edd2539d3a5d5
diff --git a/metadata/md5-cache/x11-libs/libXvMC-1.0.7 b/metadata/md5-cache/x11-libs/libXvMC-1.0.7
index 88f8fdcea50f..a21adf94000f 100644
--- a/metadata/md5-cache/x11-libs/libXvMC-1.0.7
+++ b/metadata/md5-cache/x11-libs/libXvMC-1.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-proto/videoproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-proto/videoproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org XvMC library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=app-admin/eselect-xvmc
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-proto/videoproto x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXvMC-1.0.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=91f8c33ec809c8f051a959d5cef98958
diff --git a/metadata/md5-cache/x11-libs/libXvMC-1.0.7-r1 b/metadata/md5-cache/x11-libs/libXvMC-1.0.7-r1
index e6bf724d2abb..415afa79a7d4 100644
--- a/metadata/md5-cache/x11-libs/libXvMC-1.0.7-r1
+++ b/metadata/md5-cache/x11-libs/libXvMC-1.0.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/videoproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/videoproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org XvMC library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=app-admin/eselect-xvmc
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/videoproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXvMC-1.0.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5eb53b984b5251ef36c1cdb365ab5c95
diff --git a/metadata/md5-cache/x11-libs/libXxf86dga-1.1.2 b/metadata/md5-cache/x11-libs/libXxf86dga-1.1.2
index 755676aa251e..8fefc72e0f01 100644
--- a/metadata/md5-cache/x11-libs/libXxf86dga-1.1.2
+++ b/metadata/md5-cache/x11-libs/libXxf86dga-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/xproto >=x11-proto/xf86dgaproto-2.0.99.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/xproto >=x11-proto/xf86dgaproto-2.0.99.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xxf86dga library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/xproto >=x11-proto/xf86dgaproto-2.0.99.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=499b674d1ed547d1a5bff92e4de061e2
diff --git a/metadata/md5-cache/x11-libs/libXxf86dga-1.1.3 b/metadata/md5-cache/x11-libs/libXxf86dga-1.1.3
index e2c290ec1d1c..1a1b292259fa 100644
--- a/metadata/md5-cache/x11-libs/libXxf86dga-1.1.3
+++ b/metadata/md5-cache/x11-libs/libXxf86dga-1.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/xproto >=x11-proto/xf86dgaproto-2.0.99.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/xproto >=x11-proto/xf86dgaproto-2.0.99.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xxf86dga library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/xproto >=x11-proto/xf86dgaproto-2.0.99.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-1.1.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=ebe14bb33c5879ef138976536ee481dc
diff --git a/metadata/md5-cache/x11-libs/libXxf86dga-1.1.3-r1 b/metadata/md5-cache/x11-libs/libXxf86dga-1.1.3-r1
index 726d2a51cebd..d2db904ce013 100644
--- a/metadata/md5-cache/x11-libs/libXxf86dga-1.1.3-r1
+++ b/metadata/md5-cache/x11-libs/libXxf86dga-1.1.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xf86dgaproto-2.0.99.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xf86dgaproto-2.0.99.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xxf86dga library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xf86dgaproto-2.0.99.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-1.1.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=0b7e54b21eb50d47201cb626bd8ce714
diff --git a/metadata/md5-cache/x11-libs/libXxf86misc-1.0.3 b/metadata/md5-cache/x11-libs/libXxf86misc-1.0.3
index aa495a7012e1..0c9148bff21a 100644
--- a/metadata/md5-cache/x11-libs/libXxf86misc-1.0.3
+++ b/metadata/md5-cache/x11-libs/libXxf86misc-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xproto x11-proto/xextproto x11-proto/xf86miscproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xproto x11-proto/xextproto x11-proto/xf86miscproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xxf86misc library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xproto x11-proto/xextproto x11-proto/xf86miscproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXxf86misc-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=07549209c3e95af3362eb430d3e96dcd
diff --git a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.1 b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.1
index 3863252cfc78..b09ca268df5b 100644
--- a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.1
+++ b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/xf86vidmodeproto-2.3 x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/xf86vidmodeproto-2.3 x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xxf86vm library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/xf86vidmodeproto-2.3 x11-proto/xextproto x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=9b6200db28facd69cf1702c4118ac7dd
diff --git a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.2 b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.2
index d875dd86470f..775a13134e19 100644
--- a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.2
+++ b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/xf86vidmodeproto-2.3 x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/xf86vidmodeproto-2.3 x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xxf86vm library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/xf86vidmodeproto-2.3 x11-proto/xextproto x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a7bfed98768ef4f5b83dfaf284174615
diff --git a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.2-r1 b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.2-r1
index 76e790bafad3..c9360217fffb 100644
--- a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.2-r1
+++ b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xf86vidmodeproto-2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xf86vidmodeproto-2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xxf86vm library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xf86vidmodeproto-2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=790edd9a3dff2b81148a4d480d72c5c7
diff --git a/metadata/md5-cache/x11-libs/libaosd-0.2.7 b/metadata/md5-cache/x11-libs/libaosd-0.2.7
index fe3956830e89..d61a490b6009 100644
--- a/metadata/md5-cache/x11-libs/libaosd-0.2.7
+++ b/metadata/md5-cache/x11-libs/libaosd-0.2.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/cairo x11-libs/libX11 x11-libs/libXrender pango? ( x11-libs/pango ) tools? ( dev-libs/glib:2 ) xcomposite? ( x11-libs/libXcomposite )
 SLOT=0
 SRC_URI=http://distfiles.atheme.org/libaosd-0.2.7.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c9bd5cba99a53e53de9a2e0c790dff4f
diff --git a/metadata/md5-cache/x11-libs/libast-9999 b/metadata/md5-cache/x11-libs/libast-9999
index d573af84b388..3ac13c61b97e 100644
--- a/metadata/md5-cache/x11-libs/libast-9999
+++ b/metadata/md5-cache/x11-libs/libast-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=!sci-astronomy/ast x11-libs/libXt x11-proto/xproto x11-libs/libICE x11-libs/libSM x11-libs/libX11 =media-libs/freetype-2* imlib? ( media-libs/imlib2 ) pcre? ( dev-libs/libpcre ) dev-vcs/cvs || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!sci-astronomy/ast x11-libs/libXt x11-proto/xproto x11-libs/libICE x11-libs/libSM x11-libs/libX11 =media-libs/freetype-2* imlib? ( media-libs/imlib2 ) pcre? ( dev-libs/libpcre ) dev-vcs/cvs || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=LIBrary of Assorted Spiffy Things
 HOMEPAGE=http://www.eterm.org/download/
 IUSE=imlib mmx pcre
 LICENSE=GPL-2
 RDEPEND=!sci-astronomy/ast x11-libs/libXt x11-proto/xproto x11-libs/libICE x11-libs/libSM x11-libs/libX11 =media-libs/freetype-2* imlib? ( media-libs/imlib2 ) pcre? ( dev-libs/libpcre )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	cvs	39a3c20f6f84050321495248c23e26c4	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	cvs	39a3c20f6f84050321495248c23e26c4	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=370af1b149d5e01d444c8d03b27fda6e
diff --git a/metadata/md5-cache/x11-libs/libdmx-1.1.1 b/metadata/md5-cache/x11-libs/libdmx-1.1.1
index 11ff6441c923..113cf771d323 100644
--- a/metadata/md5-cache/x11-libs/libdmx-1.1.1
+++ b/metadata/md5-cache/x11-libs/libdmx-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto >=x11-proto/dmxproto-2.3 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto >=x11-proto/dmxproto-2.3 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org dmx library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto >=x11-proto/dmxproto-2.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libdmx-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=75d91ea32aeca082320cd6d15b44e9db
diff --git a/metadata/md5-cache/x11-libs/libdmx-1.1.2 b/metadata/md5-cache/x11-libs/libdmx-1.1.2
index 069aacae485c..3cf07bf93978 100644
--- a/metadata/md5-cache/x11-libs/libdmx-1.1.2
+++ b/metadata/md5-cache/x11-libs/libdmx-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/dmxproto-2.3 x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/dmxproto-2.3 x11-proto/xextproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org dmx library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/dmxproto-2.3 x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libdmx-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6c13956163111bf35012bd676062bbe0
diff --git a/metadata/md5-cache/x11-libs/libdockapp-0.6.1 b/metadata/md5-cache/x11-libs/libdockapp-0.6.1
index 30106c82d2c4..f2dee4f9ee20 100644
--- a/metadata/md5-cache/x11-libs/libdockapp-0.6.1
+++ b/metadata/md5-cache/x11-libs/libdockapp-0.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXpm x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXpm x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Window Maker Dock Applet Library
 HOMEPAGE=http://solfertje.student.utwente.nl/~dalroi/libdockapp/
 KEYWORDS=amd64 ppc ppc64 sparc x86
@@ -7,5 +7,5 @@ LICENSE=MIT public-domain
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=http://solfertje.student.utwente.nl/~dalroi/libdockapp/files/libdockapp-0.6.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fb8228d3a92241f2ea0fa08d6ba7ab72
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.20-r1 b/metadata/md5-cache/x11-libs/libdrm-2.4.20-r1
index effa57a29db5..5b518aaa4fe5 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.20-r1
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.20-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libpthread-stubs || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=dev-libs/libpthread-stubs || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org libdrm library
 EAPI=3
 HOMEPAGE=http://dri.freedesktop.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpthread-stubs
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.20.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5ab66ecf08d839756979daf27fce2b1f
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.33 b/metadata/md5-cache/x11-libs/libdrm-2.4.33
index 4ec65a768b82..15760fb9939e 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.33
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.33
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org libdrm library
 EAPI=4
 HOMEPAGE=http://dri.freedesktop.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.33.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=ffb13df387620dbda418a0a7ab0df43c
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.40 b/metadata/md5-cache/x11-libs/libdrm-2.4.40
index 9cde72b62f2e..e81a09e6d202 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.40
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.40
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org libdrm library
 EAPI=4
 HOMEPAGE=http://dri.freedesktop.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.40.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=fd530ba3690eb1086282548f4a019826
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.42 b/metadata/md5-cache/x11-libs/libdrm-2.4.42
index 008a55d1ca2c..f168a29dd173 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.42
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.42
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org libdrm library
 EAPI=5
 HOMEPAGE=http://dri.freedesktop.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.42.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=74cbb15d7a21f171f98a1dfd50d1aa2d
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.43 b/metadata/md5-cache/x11-libs/libdrm-2.4.43
index 4488b0919238..9430e3dd5dd8 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.43
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.43
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org libdrm library
 EAPI=5
 HOMEPAGE=http://dri.freedesktop.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.43.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=8ebc95b4c4cddb8f26242b91fadbdc2e
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.44 b/metadata/md5-cache/x11-libs/libdrm-2.4.44
index 84f19a92253a..a45dcb4971bb 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.44
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.44
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org libdrm library
 EAPI=5
 HOMEPAGE=http://dri.freedesktop.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=video_cards_exynos? ( libkms )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.44.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=c5a3a04a5b3481d22b071bd441070fcc
diff --git a/metadata/md5-cache/x11-libs/libdrm-poulsbo-2.3.0_p9 b/metadata/md5-cache/x11-libs/libdrm-poulsbo-2.3.0_p9
index 620ee14f879e..d50b5a2e7959 100644
--- a/metadata/md5-cache/x11-libs/libdrm-poulsbo-2.3.0_p9
+++ b/metadata/md5-cache/x11-libs/libdrm-poulsbo-2.3.0_p9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/libdrm-2.3
 SLOT=0
 SRC_URI=http://adamwill.fedorapeople.org/poulsbo/src/libdrm-poulsbo-2.3.0-9.fc11.src.rpm
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=168317343698386d722ceab63a32972c
diff --git a/metadata/md5-cache/x11-libs/libdrm-poulsbo-2.3.0_p9-r1 b/metadata/md5-cache/x11-libs/libdrm-poulsbo-2.3.0_p9-r1
index 2939749134d9..aa757c255db4 100644
--- a/metadata/md5-cache/x11-libs/libdrm-poulsbo-2.3.0_p9-r1
+++ b/metadata/md5-cache/x11-libs/libdrm-poulsbo-2.3.0_p9-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/libdrm-2.3
 SLOT=0
 SRC_URI=http://adamwill.fedorapeople.org/poulsbo/src/libdrm-poulsbo-2.3.0-9.fc11.src.rpm
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d3f10519646f3851abf61ea1c21107fb
diff --git a/metadata/md5-cache/x11-libs/libfakekey-0.1-r1 b/metadata/md5-cache/x11-libs/libfakekey-0.1-r1
index 14ddab0aa886..755f6b67717b 100644
--- a/metadata/md5-cache/x11-libs/libfakekey-0.1-r1
+++ b/metadata/md5-cache/x11-libs/libfakekey-0.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/libXtst doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libXtst doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Helper library for the x11-misc/matchbox-keyboard package.
 EAPI=2
 HOMEPAGE=http://matchbox-project.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXtst
 SLOT=0
 SRC_URI=http://matchbox-project.org/sources/libfakekey/0.1/libfakekey-0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=776c20ff1c03530ac44029a59c6224b1
diff --git a/metadata/md5-cache/x11-libs/libfm-0.1.17-r1 b/metadata/md5-cache/x11-libs/libfm-0.1.17-r1
index 8206261171c4..43f90cec054e 100644
--- a/metadata/md5-cache/x11-libs/libfm-0.1.17-r1
+++ b/metadata/md5-cache/x11-libs/libfm-0.1.17-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=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 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for file management
 EAPI=4
 HOMEPAGE=http://pcmanfm.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/libfm-0.1.17.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=115865682ccbd254bce2f7102dc9f291
diff --git a/metadata/md5-cache/x11-libs/libfm-1.0 b/metadata/md5-cache/x11-libs/libfm-1.0
index abb8926ae5ba..5feed61922a5 100644
--- a/metadata/md5-cache/x11-libs/libfm-1.0
+++ b/metadata/md5-cache/x11-libs/libfm-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 dev-util/gtk-doc-am >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 dev-util/gtk-doc-am >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for file management
 EAPI=4
 HOMEPAGE=http://pcmanfm.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info || ( gnome-base/gvfs[udev,udisks] gnome-base/gvfs[udev,gdu] )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/libfm-1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=d1c0b02517dfd01d62433928c84ec4ea
diff --git a/metadata/md5-cache/x11-libs/libfm-1.0.1 b/metadata/md5-cache/x11-libs/libfm-1.0.1
index d7c1d7727641..3b185640bed1 100644
--- a/metadata/md5-cache/x11-libs/libfm-1.0.1
+++ b/metadata/md5-cache/x11-libs/libfm-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 vala? ( || ( dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 vala? ( || ( dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for file management
 EAPI=4
 HOMEPAGE=http://pcmanfm.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info || ( gnome-base/gvfs[udev,udisks] gnome-base/gvfs[udev,gdu] )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/libfm-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
 _md5_=9962eeeb4073a1133fa035e4a5747962
diff --git a/metadata/md5-cache/x11-libs/libfm-1.0.2 b/metadata/md5-cache/x11-libs/libfm-1.0.2
index 602236db6f27..ff3fb52df81a 100644
--- a/metadata/md5-cache/x11-libs/libfm-1.0.2
+++ b/metadata/md5-cache/x11-libs/libfm-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 vala? ( || ( dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 vala? ( || ( dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for file management
 EAPI=4
 HOMEPAGE=http://pcmanfm.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info || ( gnome-base/gvfs[udev,udisks] gnome-base/gvfs[udev,gdu] )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/libfm-1.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
 _md5_=70e2ce32b458413c79d02f89f15d1288
diff --git a/metadata/md5-cache/x11-libs/libfm-1.1.0 b/metadata/md5-cache/x11-libs/libfm-1.1.0
index c54575b6d865..84619d14c71c 100644
--- a/metadata/md5-cache/x11-libs/libfm-1.1.0
+++ b/metadata/md5-cache/x11-libs/libfm-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 vala? ( || ( dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 vala? ( || ( dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A library for file management
 EAPI=4
 HOMEPAGE=http://pcmanfm.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info || ( gnome-base/gvfs[udev,udisks] gnome-base/gvfs[udev,gdu] )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/libfm-1.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
 _md5_=771627a11ab00ab116cc5c5a43a7093e
diff --git a/metadata/md5-cache/x11-libs/libfm-9999 b/metadata/md5-cache/x11-libs/libfm-9999
index 9834ad72dacb..9f765d3587c1 100644
--- a/metadata/md5-cache/x11-libs/libfm-9999
+++ b/metadata/md5-cache/x11-libs/libfm-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=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 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=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 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=A library for file management
 EAPI=5
 HOMEPAGE=http://pcmanfm.sourceforge.net/
@@ -7,5 +7,5 @@ IUSE=debug doc examples vala
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2:= x11-misc/shared-mime-info || ( gnome-base/gvfs[udev,udisks] gnome-base/gvfs[udev,gdu] )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
 _md5_=5e3365efe74287b7c36923c10db171e6
diff --git a/metadata/md5-cache/x11-libs/libfontenc-1.1.0 b/metadata/md5-cache/x11-libs/libfontenc-1.1.0
index 6d886c783c44..33162186db5f 100644
--- a/metadata/md5-cache/x11-libs/libfontenc-1.1.0
+++ b/metadata/md5-cache/x11-libs/libfontenc-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=sys-libs/zlib x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=sys-libs/zlib x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org fontenc library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libfontenc-1.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=0a976b838101054d8443ae33f09d1474
diff --git a/metadata/md5-cache/x11-libs/libfontenc-1.1.1 b/metadata/md5-cache/x11-libs/libfontenc-1.1.1
index 4d31826bc0e5..dba2933f9902 100644
--- a/metadata/md5-cache/x11-libs/libfontenc-1.1.1
+++ b/metadata/md5-cache/x11-libs/libfontenc-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=sys-libs/zlib x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=sys-libs/zlib x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org fontenc library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libfontenc-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6a8cf0ccf17dff48cf3ce891406b4d14
diff --git a/metadata/md5-cache/x11-libs/libgksu-2.0.12-r1 b/metadata/md5-cache/x11-libs/libgksu-2.0.12-r1
index feb9f36454ab..c21e23565ff6 100644
--- a/metadata/md5-cache/x11-libs/libgksu-2.0.12-r1
+++ b/metadata/md5-cache/x11-libs/libgksu-2.0.12-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A library for integration of su into applications
 EAPI=3
 HOMEPAGE=http://www.nongnu.org/gksu/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=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
 SLOT=2
 SRC_URI=http://people.debian.org/~kov/gksu/libgksu-2.0.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7c82eae625a90caf7e6e3025b0ad9899
diff --git a/metadata/md5-cache/x11-libs/libnotify-0.7.5 b/metadata/md5-cache/x11-libs/libnotify-0.7.5
index 8275cb66c9e2..97e28325932e 100644
--- a/metadata/md5-cache/x11-libs/libnotify-0.7.5
+++ b/metadata/md5-cache/x11-libs/libnotify-0.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.26 x11-libs/gdk-pixbuf:2 introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) dev-util/gtk-doc-am virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.14 ) symlink? ( !x11-misc/tinynotify-send[symlink] ) test? ( x11-libs/gtk+:3 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
+DEPEND=>=dev-libs/glib-2.26 x11-libs/gdk-pixbuf:2 introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) dev-util/gtk-doc-am virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.14 ) symlink? ( !x11-misc/tinynotify-send[symlink] ) test? ( x11-libs/gtk+:3 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
 DESCRIPTION=A library for sending desktop notifications
 EAPI=5
 HOMEPAGE=http://git.gnome.org/browse/libnotify
@@ -10,5 +10,5 @@ PDEPEND=virtual/notification-daemon
 RDEPEND=>=dev-libs/glib-2.26 x11-libs/gdk-pixbuf:2 introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libnotify/0.7/libnotify-0.7.5.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=18c0bf6a489ea4e7f6bfd47bc284aae5
diff --git a/metadata/md5-cache/x11-libs/libnotify-0.7.5-r1 b/metadata/md5-cache/x11-libs/libnotify-0.7.5-r1
index a48685b9508e..ac15c884494d 100644
--- a/metadata/md5-cache/x11-libs/libnotify-0.7.5-r1
+++ b/metadata/md5-cache/x11-libs/libnotify-0.7.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=app-admin/eselect-notify-send >=dev-libs/glib-2.26 x11-libs/gdk-pixbuf:2 introspection? ( >=dev-libs/gobject-introspection-1.32 ) >=dev-libs/gobject-introspection-common-1.32 dev-util/gtk-doc-am virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.14 ) test? ( x11-libs/gtk+:3 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
+DEPEND=app-admin/eselect-notify-send >=dev-libs/glib-2.26 x11-libs/gdk-pixbuf:2 introspection? ( >=dev-libs/gobject-introspection-1.32 ) >=dev-libs/gobject-introspection-common-1.32 dev-util/gtk-doc-am virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.14 ) test? ( x11-libs/gtk+:3 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
 DESCRIPTION=A library for sending desktop notifications
 EAPI=5
 HOMEPAGE=http://git.gnome.org/browse/libnotify
@@ -10,5 +10,5 @@ PDEPEND=virtual/notification-daemon
 RDEPEND=app-admin/eselect-notify-send >=dev-libs/glib-2.26 x11-libs/gdk-pixbuf:2 introspection? ( >=dev-libs/gobject-introspection-1.32 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libnotify/0.7/libnotify-0.7.5.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d570f983df495e4736674d3dab62a07b
diff --git a/metadata/md5-cache/x11-libs/libpciaccess-0.12.1 b/metadata/md5-cache/x11-libs/libpciaccess-0.12.1
index 0df5a24ff8c3..567809d1da2e 100644
--- a/metadata/md5-cache/x11-libs/libpciaccess-0.12.1
+++ b/metadata/md5-cache/x11-libs/libpciaccess-0.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!<x11-base/xorg-server-1.5 zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-base/xorg-server-1.5 zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Library providing generic access to the PCI bus and devices
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-base/xorg-server-1.5 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.12.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=8b38a696ef6b3b0058c6eaed210714c9
diff --git a/metadata/md5-cache/x11-libs/libpciaccess-0.13 b/metadata/md5-cache/x11-libs/libpciaccess-0.13
index 571489401852..f2e0c4cb6924 100644
--- a/metadata/md5-cache/x11-libs/libpciaccess-0.13
+++ b/metadata/md5-cache/x11-libs/libpciaccess-0.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!<x11-base/xorg-server-1.5 zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-base/xorg-server-1.5 zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Library providing generic access to the PCI bus and devices
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-base/xorg-server-1.5 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.13.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=2efbbd53d238fc507982978bcc0fdca6
diff --git a/metadata/md5-cache/x11-libs/libpciaccess-0.13.1 b/metadata/md5-cache/x11-libs/libpciaccess-0.13.1
index b6d77df3a797..995ddb10a101 100644
--- a/metadata/md5-cache/x11-libs/libpciaccess-0.13.1
+++ b/metadata/md5-cache/x11-libs/libpciaccess-0.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!<x11-base/xorg-server-1.5 zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-base/xorg-server-1.5 zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Library providing generic access to the PCI bus and devices
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-base/xorg-server-1.5 zlib? ( sys-libs/zlib ) sys-apps/hwids
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.13.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4e33834372d4be9b032c0891e89a1316
diff --git a/metadata/md5-cache/x11-libs/libpciaccess-0.13.1-r1 b/metadata/md5-cache/x11-libs/libpciaccess-0.13.1-r1
index 08ca0bc532f8..848c0f837fd7 100644
--- a/metadata/md5-cache/x11-libs/libpciaccess-0.13.1-r1
+++ b/metadata/md5-cache/x11-libs/libpciaccess-0.13.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!<x11-base/xorg-server-1.5 zlib? ( sys-libs/zlib amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs[development] ) ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-base/xorg-server-1.5 zlib? ( sys-libs/zlib amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs[development] ) ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Library providing generic access to the PCI bus and devices
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-base/xorg-server-1.5 zlib? ( sys-libs/zlib amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs[development] ) ) ) sys-apps/hwids abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.13.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=84d5ecb7e188f13c518dbfca46fa07c9
diff --git a/metadata/md5-cache/x11-libs/libproplist-0.10.1-r4 b/metadata/md5-cache/x11-libs/libproplist-0.10.1-r4
index f885d78599c0..81828e24ff4d 100644
--- a/metadata/md5-cache/x11-libs/libproplist-0.10.1-r4
+++ b/metadata/md5-cache/x11-libs/libproplist-0.10.1-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An library to mimic property list functionality from the GNUstep environment
 EAPI=4
 HOMEPAGE=http://windowmaker.org/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/libPropList-0.10.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=96dfa957cc74e887d4236c985bf8db38
diff --git a/metadata/md5-cache/x11-libs/libsexy-0.1.11-r3 b/metadata/md5-cache/x11-libs/libsexy-0.1.11-r3
index d3488a9b8ada..002ef29dfb1f 100644
--- a/metadata/md5-cache/x11-libs/libsexy-0.1.11-r3
+++ b/metadata/md5-cache/x11-libs/libsexy-0.1.11-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2 >=x11-libs/gtk+-2.20:2 dev-libs/libxml2 >=x11-libs/pango-1.4 >=app-text/iso-codes-0.49 >=dev-lang/perl-5 virtual/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2 >=x11-libs/gtk+-2.20:2 dev-libs/libxml2 >=x11-libs/pango-1.4 >=app-text/iso-codes-0.49 >=dev-lang/perl-5 virtual/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Sexy GTK+ Widgets
 EAPI=4
 HOMEPAGE=http://www.chipx86.com/wiki/Libsexy
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2 >=x11-libs/gtk+-2.20:2 dev-libs/libxml2 >=x11-libs/pango-1.4 >=app-text/iso-codes-0.49
 SLOT=0
 SRC_URI=http://releases.chipx86.com/libsexy/libsexy/libsexy-0.1.11.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=552da3ced7006544410aee6ae69dd1f9
diff --git a/metadata/md5-cache/x11-libs/libtinynotify-0.2.1 b/metadata/md5-cache/x11-libs/libtinynotify-0.2.1
index 4198f1caf3e2..760db1c7a6e9 100644
--- a/metadata/md5-cache/x11-libs/libtinynotify-0.2.1
+++ b/metadata/md5-cache/x11-libs/libtinynotify-0.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sys-apps/dbus
 SLOT=0
 SRC_URI=mirror://github/mgorny/libtinynotify/libtinynotify-0.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2f61722d5e1184ef098a5cefd7766e22
diff --git a/metadata/md5-cache/x11-libs/libtinynotify-9999 b/metadata/md5-cache/x11-libs/libtinynotify-9999
index 9ec2ae9a441a..77d6bcd68759 100644
--- a/metadata/md5-cache/x11-libs/libtinynotify-9999
+++ b/metadata/md5-cache/x11-libs/libtinynotify-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-apps/dbus virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) >=dev-util/gtk-doc-1.18 dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/dbus virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) >=dev-util/gtk-doc-1.18 dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A lightweight implementation of Desktop Notification Spec
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/libtinynotify/
@@ -7,5 +7,5 @@ IUSE=debug doc static-libs
 LICENSE=BSD
 RDEPEND=sys-apps/dbus
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=270809a7b0857087fe3a1db4b9db7ed0
diff --git a/metadata/md5-cache/x11-libs/libtinynotify-cli-1.2.1 b/metadata/md5-cache/x11-libs/libtinynotify-cli-1.2.1
index 70ad3218e7ef..c139cd0d0aef 100644
--- a/metadata/md5-cache/x11-libs/libtinynotify-cli-1.2.1
+++ b/metadata/md5-cache/x11-libs/libtinynotify-cli-1.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=x11-libs/libtinynotify
 SLOT=0
 SRC_URI=mirror://github/mgorny/tinynotify-send/tinynotify-send-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ef36b709d0c7dd7f1c1d68105f4e33b5
diff --git a/metadata/md5-cache/x11-libs/libtinynotify-cli-9999 b/metadata/md5-cache/x11-libs/libtinynotify-cli-9999
index a02b7f8f6790..7da36f7f2582 100644
--- a/metadata/md5-cache/x11-libs/libtinynotify-cli-9999
+++ b/metadata/md5-cache/x11-libs/libtinynotify-cli-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=x11-libs/libtinynotify virtual/pkgconfig doc? ( dev-util/gtk-doc ) >=dev-util/gtk-doc-1.18 dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libtinynotify virtual/pkgconfig doc? ( dev-util/gtk-doc ) >=dev-util/gtk-doc-1.18 dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Common CLI routines for tinynotify-send & sw-notify-send
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/tinynotify-send/
@@ -7,5 +7,5 @@ IUSE=doc static-libs
 LICENSE=BSD
 RDEPEND=x11-libs/libtinynotify
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=76bde7e074a58ddb04c8c8cee8c6a5c9
diff --git a/metadata/md5-cache/x11-libs/libtinynotify-systemwide-0.0.2 b/metadata/md5-cache/x11-libs/libtinynotify-systemwide-0.0.2
index ad54b42c51a0..a7a0d98cf96b 100644
--- a/metadata/md5-cache/x11-libs/libtinynotify-systemwide-0.0.2
+++ b/metadata/md5-cache/x11-libs/libtinynotify-systemwide-0.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sys-process/procps x11-libs/libtinynotify
 SLOT=0
 SRC_URI=mirror://github/mgorny/libtinynotify-systemwide/libtinynotify-systemwide-0.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4918d9bbac8cbc07007783c176265a80
diff --git a/metadata/md5-cache/x11-libs/libtinynotify-systemwide-0.1 b/metadata/md5-cache/x11-libs/libtinynotify-systemwide-0.1
index 930d435a20bd..dbee1515a0bd 100644
--- a/metadata/md5-cache/x11-libs/libtinynotify-systemwide-0.1
+++ b/metadata/md5-cache/x11-libs/libtinynotify-systemwide-0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sys-process/procps x11-libs/libtinynotify
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/libtinynotify-systemwide/downloads/libtinynotify-systemwide-0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f94f0af909dfdb59263dca49cb4bffbe
diff --git a/metadata/md5-cache/x11-libs/libtinynotify-systemwide-9999 b/metadata/md5-cache/x11-libs/libtinynotify-systemwide-9999
index ba34f687df75..6cf55a62e083 100644
--- a/metadata/md5-cache/x11-libs/libtinynotify-systemwide-9999
+++ b/metadata/md5-cache/x11-libs/libtinynotify-systemwide-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-process/procps x11-libs/libtinynotify virtual/pkgconfig doc? ( dev-util/gtk-doc ) >=dev-util/gtk-doc-1.18 dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-process/procps x11-libs/libtinynotify virtual/pkgconfig doc? ( dev-util/gtk-doc ) >=dev-util/gtk-doc-1.18 dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A system-wide notifications module for libtinynotify
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/libtinynotify-systemwide/
@@ -7,5 +7,5 @@ IUSE=doc static-libs
 LICENSE=BSD
 RDEPEND=sys-process/procps x11-libs/libtinynotify
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=de451f0f8ea9004fef102c47183d63bb
diff --git a/metadata/md5-cache/x11-libs/libva-1.0.15 b/metadata/md5-cache/x11-libs/libva-1.0.15
index 99ac853e5cf8..58ec1ea9a650 100644
--- a/metadata/md5-cache/x11-libs/libva-1.0.15
+++ b/metadata/md5-cache/x11-libs/libva-1.0.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/libdrm-2.4 video_cards_dummy? ( virtual/udev ) x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes opengl? ( virtual/opengl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/libdrm-2.4 video_cards_dummy? ( virtual/udev ) x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes opengl? ( virtual/opengl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Video Acceleration (VA) API for Linux
 EAPI=3
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
@@ -10,5 +10,5 @@ PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? (
 RDEPEND=>=x11-libs/libdrm-2.4 video_cards_dummy? ( virtual/udev ) x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes opengl? ( virtual/opengl )
 SLOT=0
 SRC_URI=http://cgit.freedesktop.org/vaapi/libva/snapshot/libva-1.0.15.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=ba137c8ae7da86b47f6e76cee4a4f82a
diff --git a/metadata/md5-cache/x11-libs/libva-1.0.16 b/metadata/md5-cache/x11-libs/libva-1.0.16
index c77b3c24c25a..ede5243b8e17 100644
--- a/metadata/md5-cache/x11-libs/libva-1.0.16
+++ b/metadata/md5-cache/x11-libs/libva-1.0.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/libdrm-2.4 video_cards_dummy? ( virtual/udev ) x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes opengl? ( virtual/opengl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/libdrm-2.4 video_cards_dummy? ( virtual/udev ) x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes opengl? ( virtual/opengl ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Video Acceleration (VA) API for Linux
 EAPI=3
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
@@ -10,5 +10,5 @@ PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? (
 RDEPEND=>=x11-libs/libdrm-2.4 video_cards_dummy? ( virtual/udev ) x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes opengl? ( virtual/opengl )
 SLOT=0
 SRC_URI=http://cgit.freedesktop.org/vaapi/libva/snapshot/libva-1.0.16.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=8a9969c5e91281b9676e3557d7deb13e
diff --git a/metadata/md5-cache/x11-libs/libva-1.1.0 b/metadata/md5-cache/x11-libs/libva-1.1.0
index 0a0a15579e19..fdf9310181af 100644
--- a/metadata/md5-cache/x11-libs/libva-1.1.0
+++ b/metadata/md5-cache/x11-libs/libva-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-0.95.0 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-0.95.0 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Video Acceleration (VA) API for Linux
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
@@ -11,5 +11,5 @@ RDEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/lib
 REQUIRED_USE=opengl? ( X )
 SLOT=0
 SRC_URI=http://cgit.freedesktop.org/vaapi/libva/snapshot/libva-1.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a1597ab591a26b46bcd53c56b2e1a3d0
diff --git a/metadata/md5-cache/x11-libs/libva-1.1.1 b/metadata/md5-cache/x11-libs/libva-1.1.1
index 977ef44fa297..9516b4f210cb 100644
--- a/metadata/md5-cache/x11-libs/libva-1.1.1
+++ b/metadata/md5-cache/x11-libs/libva-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-1 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-1 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Video Acceleration (VA) API for Linux
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
@@ -11,5 +11,5 @@ RDEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/lib
 REQUIRED_USE=opengl? ( X )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=7fb522a962527cde0c943fb29d81673a
diff --git a/metadata/md5-cache/x11-libs/libva-9999 b/metadata/md5-cache/x11-libs/libva-9999
index 7d53382e8a17..fdbcd283148b 100644
--- a/metadata/md5-cache/x11-libs/libva-9999
+++ b/metadata/md5-cache/x11-libs/libva-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-1 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-1 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Video Acceleration (VA) API for Linux
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
@@ -9,5 +9,5 @@ PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? (
 RDEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-1 )
 REQUIRED_USE=opengl? ( X )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=f12c9fd2014abda5622c0bb2cecfb703
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.17 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.17
index 84aba239362b..5a8e73249e91 100644
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.17
+++ b/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=x11-libs/libva-1.0.14 !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/libva-1.0.14 !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HW video decode support for Intel integrated graphics
 EAPI=3
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libva-1.0.14 !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel]
 SLOT=0
 SRC_URI=http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-1.0.17.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=cc73f4ceabdf88ed66b6ed6649bd864a
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.19 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.19
index 3c81a37a3f79..b60d90c4ea97 100644
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.19
+++ b/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.19
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/libva-1.1.0[X?,wayland?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/libva-1.1.0[X?,wayland?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HW video decode support for Intel integrated graphics
 EAPI=3
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libva-1.1.0[X?,wayland?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-1.0.19.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e54ec4267a4a9e177b6f9ca51f512b34
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.20 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.20
index 81efea8f54a0..26921cc77538 100644
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.20
+++ b/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/libva-1.1.0[X?,wayland?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/libva-1.1.0[X?,wayland?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=HW video decode support for Intel integrated graphics
 EAPI=3
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libva-1.1.0[X?,wayland?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-1.0.20.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=0aadf8b3978a8d9f2175c5760c42cb00
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-9999 b/metadata/md5-cache/x11-libs/libva-intel-driver-9999
index 78e7784727ad..c4c03e4befff 100644
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-9999
+++ b/metadata/md5-cache/x11-libs/libva-intel-driver-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=x11-libs/libva-1.1.0[X?,wayland?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=x11-libs/libva-1.1.0[X?,wayland?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=HW video decode support for Intel integrated graphics
 EAPI=3
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
@@ -7,5 +7,5 @@ IUSE=wayland X
 LICENSE=MIT
 RDEPEND=>=x11-libs/libva-1.1.0[X?,wayland?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=611b05d36da986df5541c8a01c10b324
diff --git a/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.3 b/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.3
index 5b935870336a..180bcb90bf87 100644
--- a/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.3
+++ b/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=VDPAU Backend for Video Acceleration (VA) API
 EAPI=2
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libva[opengl?] opengl? ( virtual/opengl ) x11-libs/libvdpau !x11-libs/vdpau-video
 SLOT=0
 SRC_URI=http://www.splitted-desktop.com/~gbeauchesne/vdpau-video/vdpau-video-0.7.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4fc49cff4b3d31c23d7b07a3de09d019
diff --git a/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.4 b/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.4
index 9003c573b0a0..3061fd9f2b9b 100644
--- a/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.4
+++ b/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=VDPAU Backend for Video Acceleration (VA) API
 EAPI=2
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/libva-1.1.0[X,opengl?] opengl? ( virtual/opengl ) x11-libs/libvdpau !x11-libs/vdpau-video
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/libva-vdpau-driver-0.7.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ae479d252bc910bdb1d4dffeaa023730
diff --git a/metadata/md5-cache/x11-libs/libva-vdpau-driver-9999 b/metadata/md5-cache/x11-libs/libva-vdpau-driver-9999
index bef9898204a3..1249ea77cbe2 100644
--- a/metadata/md5-cache/x11-libs/libva-vdpau-driver-9999
+++ b/metadata/md5-cache/x11-libs/libva-vdpau-driver-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=VDPAU Backend for Video Acceleration (VA) API
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
@@ -7,5 +7,5 @@ IUSE=debug opengl
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libva-1.1.0[X,opengl?] opengl? ( virtual/opengl ) x11-libs/libvdpau !x11-libs/vdpau-video
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=e4de43912032d02bac4b6225b43284da
diff --git a/metadata/md5-cache/x11-libs/libvdpau-0.5-r1 b/metadata/md5-cache/x11-libs/libvdpau-0.5-r1
index 61033476587e..6cd16d1245d9 100644
--- a/metadata/md5-cache/x11-libs/libvdpau-0.5-r1
+++ b/metadata/md5-cache/x11-libs/libvdpau-0.5-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] dri? ( x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] ) !=x11-drivers/nvidia-drivers-180* !=x11-drivers/nvidia-drivers-185* !=x11-drivers/nvidia-drivers-190* abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://people.freedesktop.org/~aplattner/vdpau/libvdpau-0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=284dc5928c59c89aba878e6404c534f7
diff --git a/metadata/md5-cache/x11-libs/libview-0.6.6-r2 b/metadata/md5-cache/x11-libs/libview-0.6.6-r2
index 8f0676f6225d..b378a9899a15 100644
--- a/metadata/md5-cache/x11-libs/libview-0.6.6-r2
+++ b/metadata/md5-cache/x11-libs/libview-0.6.6-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-libs/gtk+-2.4.0:2 dev-cpp/gtkmm:2.4 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=x11-libs/gtk+-2.4.0:2 dev-cpp/gtkmm:2.4 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=VMware's Incredibly Exciting Widgets
 EAPI=3
 HOMEPAGE=http://view.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/gtk+-2.4.0:2 dev-cpp/gtkmm:2.4
 SLOT=0
 SRC_URI=mirror://sourceforge/view/libview-0.6.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=235963b7f7ce3feaa508ffb0f6580ea7
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.7 b/metadata/md5-cache/x11-libs/libxcb-1.7
index 9581a9a4d292..028ff5612f24 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.7
+++ b/metadata/md5-cache/x11-libs/libxcb-1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libXau x11-libs/libXdmcp dev-libs/libpthread-stubs doc? ( app-doc/doxygen ) dev-libs/libxslt =dev-lang/python-2*[xml] >=x11-proto/xcb-proto-1.6 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-libs/libXau x11-libs/libXdmcp dev-libs/libpthread-stubs doc? ( app-doc/doxygen ) dev-libs/libxslt =dev-lang/python-2*[xml] >=x11-proto/xcb-proto-1.6 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X C-language Bindings library
 EAPI=3
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXau x11-libs/libXdmcp dev-libs/libpthread-stubs
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=8139541b2b0e8a81454a37c16de3189f
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.8 b/metadata/md5-cache/x11-libs/libxcb-1.8
index d745ea530a93..f1db2c8342fd 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.8
+++ b/metadata/md5-cache/x11-libs/libxcb-1.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libXau x11-libs/libXdmcp dev-libs/libpthread-stubs doc? ( app-doc/doxygen ) dev-libs/libxslt =dev-lang/python-2*[xml] >=x11-proto/xcb-proto-1.7 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXau x11-libs/libXdmcp dev-libs/libpthread-stubs doc? ( app-doc/doxygen ) dev-libs/libxslt =dev-lang/python-2*[xml] >=x11-proto/xcb-proto-1.7 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X C-language Bindings library
 EAPI=3
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXau x11-libs/libXdmcp dev-libs/libpthread-stubs
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=36be67fa1b052930ddb246e1e039a90b
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.8-r1 b/metadata/md5-cache/x11-libs/libxcb-1.8-r1
index c517737abd43..c5d503abde26 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.8-r1
+++ b/metadata/md5-cache/x11-libs/libxcb-1.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libXau x11-libs/libXdmcp dev-libs/libpthread-stubs doc? ( app-doc/doxygen ) dev-libs/libxslt =dev-lang/python-2*[xml] >=x11-proto/xcb-proto-1.7 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXau x11-libs/libXdmcp dev-libs/libpthread-stubs doc? ( app-doc/doxygen ) dev-libs/libxslt =dev-lang/python-2*[xml] >=x11-proto/xcb-proto-1.7 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X C-language Bindings library
 EAPI=3
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXau x11-libs/libXdmcp dev-libs/libpthread-stubs
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=9e5220900fa63845e6c5c23eaeab8a08
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.8.1 b/metadata/md5-cache/x11-libs/libxcb-1.8.1
index 6afc7fb82ad5..c91c235e1873 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.8.1
+++ b/metadata/md5-cache/x11-libs/libxcb-1.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libpthread-stubs x11-libs/libXau x11-libs/libXdmcp dev-lang/python[xml] dev-libs/libxslt >=x11-proto/xcb-proto-1.7-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=dev-libs/libpthread-stubs x11-libs/libXau x11-libs/libXdmcp dev-lang/python[xml] dev-libs/libxslt >=x11-proto/xcb-proto-1.7-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X C-language Bindings library
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libpthread-stubs x11-libs/libXau x11-libs/libXdmcp
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.8.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a9ca33bff515c8c1c96201f5e25a93a3
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.8.1-r1 b/metadata/md5-cache/x11-libs/libxcb-1.8.1-r1
index 65ddc5e53eb4..e9b9bac5baca 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.8.1-r1
+++ b/metadata/md5-cache/x11-libs/libxcb-1.8.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libpthread-stubs x11-libs/libXau x11-libs/libXdmcp dev-lang/python[xml] dev-libs/libxslt >=x11-proto/xcb-proto-1.7-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=dev-libs/libpthread-stubs x11-libs/libXau x11-libs/libXdmcp dev-lang/python[xml] dev-libs/libxslt >=x11-proto/xcb-proto-1.7-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X C-language Bindings library
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libpthread-stubs x11-libs/libXau x11-libs/libXdmcp
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.8.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a12c541b404b1255c41c47b1d25dee95
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.9 b/metadata/md5-cache/x11-libs/libxcb-1.9
index 5649fc95d2e8..c835614c7921 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.9
+++ b/metadata/md5-cache/x11-libs/libxcb-1.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libpthread-stubs x11-libs/libXau x11-libs/libXdmcp dev-lang/python[xml] dev-libs/libxslt >=x11-proto/xcb-proto-1.7-r1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=dev-libs/libpthread-stubs x11-libs/libXau x11-libs/libXdmcp dev-lang/python[xml] dev-libs/libxslt >=x11-proto/xcb-proto-1.7-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X C-language Bindings library
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libpthread-stubs x11-libs/libXau x11-libs/libXdmcp
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=1e0b4ea34dec9874c859b2d0556c9edc
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.9-r1 b/metadata/md5-cache/x11-libs/libxcb-1.9-r1
index 297792549334..c49186e67b8e 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.9-r1
+++ b/metadata/md5-cache/x11-libs/libxcb-1.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libpthread-stubs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXau[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXdmcp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] dev-lang/python[xml] dev-libs/libxslt >=x11-proto/xcb-proto-1.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] python_single_target_python2_6? ( dev-lang/python:2.6[xml] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml] ) python_single_target_python3_1? ( dev-lang/python:3.1[xml] ) python_single_target_python3_2? ( dev-lang/python:3.2[xml] ) python_single_target_python3_3? ( dev-lang/python:3.3[xml] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=dev-libs/libpthread-stubs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXau[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXdmcp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] dev-lang/python[xml] dev-libs/libxslt >=x11-proto/xcb-proto-1.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] python_single_target_python2_6? ( dev-lang/python:2.6[xml] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml] ) python_single_target_python3_1? ( dev-lang/python:3.1[xml] ) python_single_target_python3_2? ( dev-lang/python:3.2[xml] ) python_single_target_python3_3? ( dev-lang/python:3.3[xml] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X C-language Bindings library
 EAPI=5
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libpthread-stubs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXau[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXdmcp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=8f35a9760e891239e1a1313757b84e5d
diff --git a/metadata/md5-cache/x11-libs/libxdl_view-4.2-r2 b/metadata/md5-cache/x11-libs/libxdl_view-4.2-r2
index 53fae4a25f16..75599006b4cc 100644
--- a/metadata/md5-cache/x11-libs/libxdl_view-4.2-r2
+++ b/metadata/md5-cache/x11-libs/libxdl_view-4.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libjwc_c x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/libjwc_c x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An X-Windows Based Toolkit
 EAPI=4
 HOMEPAGE=http://www.ccp4.ac.uk/dist/x-windows/xdl_view/doc/xdl_view_top.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libjwc_c x11-libs/libXt
 SLOT=0
 SRC_URI=ftp://ftp.ccp4.ac.uk/jwc/libxdl_view-4.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f8c48d63ffe49d1f8a7557f5f0ff3e81
diff --git a/metadata/md5-cache/x11-libs/libxkbcommon-0.2.0 b/metadata/md5-cache/x11-libs/libxkbcommon-0.2.0
index cb5b6b3a107b..0a789e0eefd5 100644
--- a/metadata/md5-cache/x11-libs/libxkbcommon-0.2.0
+++ b/metadata/md5-cache/x11-libs/libxkbcommon-0.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-proto/xproto >=x11-proto/kbproto-1.0.5 sys-devel/bison sys-devel/flex doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-proto/xproto >=x11-proto/kbproto-1.0.5 sys-devel/bison sys-devel/flex doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org xkbcommon library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-proto/xproto >=x11-proto/kbproto-1.0.5
 SLOT=0
 SRC_URI=http://xkbcommon.org/download/libxkbcommon-0.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=20255500cd88b3e8f09febf9fb24e91f
diff --git a/metadata/md5-cache/x11-libs/libxkbfile-1.0.7 b/metadata/md5-cache/x11-libs/libxkbfile-1.0.7
index 516b74ce0253..4e7ba521c565 100644
--- a/metadata/md5-cache/x11-libs/libxkbfile-1.0.7
+++ b/metadata/md5-cache/x11-libs/libxkbfile-1.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-proto/kbproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-proto/kbproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xkbfile library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-proto/kbproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libxkbfile-1.0.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6677eed0c64136734b4d9b60df0b5031
diff --git a/metadata/md5-cache/x11-libs/libxkbfile-1.0.8 b/metadata/md5-cache/x11-libs/libxkbfile-1.0.8
index 2dc9f4a84ffe..d44a68d00a51 100644
--- a/metadata/md5-cache/x11-libs/libxkbfile-1.0.8
+++ b/metadata/md5-cache/x11-libs/libxkbfile-1.0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-proto/kbproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-proto/kbproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xkbfile library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-proto/kbproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libxkbfile-1.0.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=59994d49a4902be185c5a78d560c6860
diff --git a/metadata/md5-cache/x11-libs/libxkbui-1.0.2 b/metadata/md5-cache/x11-libs/libxkbui-1.0.2
index b3b437d3c187..869cf6344fb2 100644
--- a/metadata/md5-cache/x11-libs/libxkbui-1.0.2
+++ b/metadata/md5-cache/x11-libs/libxkbui-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=x11-libs/libXt >=x11-libs/libxkbfile-1.0.3 x11-proto/kbproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=x11-libs/libXt >=x11-libs/libxkbfile-1.0.3 x11-proto/kbproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=X.Org xkbui library
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXt >=x11-libs/libxkbfile-1.0.3 x11-proto/kbproto !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libxkbui-1.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=55fb4372ba958e24c2b2946014a985fc
diff --git a/metadata/md5-cache/x11-libs/libxkbui-1.0.2-r1 b/metadata/md5-cache/x11-libs/libxkbui-1.0.2-r1
index 64efa10f165f..a01915254aca 100644
--- a/metadata/md5-cache/x11-libs/libxkbui-1.0.2-r1
+++ b/metadata/md5-cache/x11-libs/libxkbui-1.0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXt >=x11-libs/libxkbfile-1.0.3 x11-proto/kbproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXt >=x11-libs/libxkbfile-1.0.3 x11-proto/kbproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xkbui library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXt >=x11-libs/libxkbfile-1.0.3 x11-proto/kbproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libxkbui-1.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=1a546413e002f5a72246b26d53ed3af5
diff --git a/metadata/md5-cache/x11-libs/libxsettings-client-0.10 b/metadata/md5-cache/x11-libs/libxsettings-client-0.10
index 0ec79d7b63b6..516a478815b4 100644
--- a/metadata/md5-cache/x11-libs/libxsettings-client-0.10
+++ b/metadata/md5-cache/x11-libs/libxsettings-client-0.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=x11-proto/xproto x11-libs/libX11 x11-libs/libXt || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-proto/xproto x11-libs/libX11 x11-libs/libXt || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=provides inter toolkit configuration settings
 HOMEPAGE=http://www.freedesktop.org/standards/xsettings-spec/
 KEYWORDS=~amd64 arm ~hppa ppc sh x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=x11-proto/xproto x11-libs/libX11 x11-libs/libXt
 SLOT=0
 SRC_URI=http://handhelds.org/~mallum/downloadables/Xsettings-client-0.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c520cc6daa2f34732f23c80565e4f904
diff --git a/metadata/md5-cache/x11-libs/libxsettings-client-0.17 b/metadata/md5-cache/x11-libs/libxsettings-client-0.17
index 811a1e91833b..073a6a8f8914 100644
--- a/metadata/md5-cache/x11-libs/libxsettings-client-0.17
+++ b/metadata/md5-cache/x11-libs/libxsettings-client-0.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=x11-proto/xproto x11-libs/libX11 >=dev-util/intltool-0.29 virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-proto/xproto x11-libs/libX11 >=dev-util/intltool-0.29 virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=XSETTINGS client code
 HOMEPAGE=http://gpe.linuxtogo.org
 IUSE=nls
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm ~hppa ppc sh x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=http://gpe.linuxtogo.org/download/source/libxsettings-client-0.17.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	gpe	dc397204e130de43bfcf156546e8d9d4	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=8943f170b56fb5e8da18c5df2efc057d
diff --git a/metadata/md5-cache/x11-libs/libyui-2.21.1 b/metadata/md5-cache/x11-libs/libyui-2.21.1
index bd0819d5e319..7b3427525c35 100644
--- a/metadata/md5-cache/x11-libs/libyui-2.21.1
+++ b/metadata/md5-cache/x11-libs/libyui-2.21.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=UI abstraction library
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/libyui/
@@ -10,5 +10,5 @@ PDEPEND=qt4? ( x11-libs/libyui-qt ) ncurses? ( x11-libs/libyui-ncurses ) gtk? (
 REQUIRED_USE=|| ( qt4 ncurses gtk )
 SLOT=0
 SRC_URI=mirror://sourceforge/libyui/libyui-2.21.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b1a1979c444563cfc80f830aad2d52a
diff --git a/metadata/md5-cache/x11-libs/libyui-gtk-2.21.96 b/metadata/md5-cache/x11-libs/libyui-gtk-2.21.96
index 2bf97ee2a231..04374503fd4e 100644
--- a/metadata/md5-cache/x11-libs/libyui-gtk-2.21.96
+++ b/metadata/md5-cache/x11-libs/libyui-gtk-2.21.96
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/gtk+:2 dev-python/pygtk x11-libs/libyui || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 dev-python/pygtk x11-libs/libyui || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=UI abstraction library - GTK plugin
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/libyui/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:2 dev-python/pygtk x11-libs/libyui
 SLOT=0
 SRC_URI=mirror://sourceforge/libyui/libyui-gtk-2.21.96.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=e1ec2b13f7f2b2e851d44854134ee75d
diff --git a/metadata/md5-cache/x11-libs/libyui-ncurses-2.21.1 b/metadata/md5-cache/x11-libs/libyui-ncurses-2.21.1
index 930e6cc4bb42..1db4d266080b 100644
--- a/metadata/md5-cache/x11-libs/libyui-ncurses-2.21.1
+++ b/metadata/md5-cache/x11-libs/libyui-ncurses-2.21.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses x11-libs/libyui || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/ncurses x11-libs/libyui || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=UI abstraction library - ncurses plugin
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/libyui/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses x11-libs/libyui
 SLOT=0
 SRC_URI=mirror://sourceforge/libyui/libyui-ncurses-2.21.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=5775e386b782175dbaef120a372165f2
diff --git a/metadata/md5-cache/x11-libs/motif-2.2.3-r11 b/metadata/md5-cache/x11-libs/motif-2.2.3-r11
index c2bce6373f7d..cace2ae76dc9 100644
--- a/metadata/md5-cache/x11-libs/motif-2.2.3-r11
+++ b/metadata/md5-cache/x11-libs/motif-2.2.3-r11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libXmu x11-libs/libXp x11-libs/libXaw x11-misc/xbitmaps || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libXmu x11-libs/libXp x11-libs/libXaw x11-misc/xbitmaps || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Legacy Open Motif libraries for old binaries
 EAPI=3
 HOMEPAGE=http://www.motifzone.net/
@@ -8,5 +8,5 @@ LICENSE=MOTIF MIT
 RDEPEND=x11-libs/libXmu x11-libs/libXp
 SLOT=2.2
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=116f9db9f5b1579b75a92ab07706f1a7
diff --git a/metadata/md5-cache/x11-libs/motif-2.2.3-r12 b/metadata/md5-cache/x11-libs/motif-2.2.3-r12
index cac3cf8d6339..3efd54ec76eb 100644
--- a/metadata/md5-cache/x11-libs/motif-2.2.3-r12
+++ b/metadata/md5-cache/x11-libs/motif-2.2.3-r12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( amd64? ( app-emulation/emul-linux-x86-baselibs ) !app-emulation/emul-linux-x86-motif ) x11-libs/libXaw x11-misc/xbitmaps || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( amd64? ( app-emulation/emul-linux-x86-baselibs ) !app-emulation/emul-linux-x86-motif ) x11-libs/libXaw x11-misc/xbitmaps || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Legacy Open Motif libraries for old binaries
 EAPI=5
 HOMEPAGE=http://motif.ics.com/
@@ -9,5 +9,5 @@ LICENSE=MOTIF MIT
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( amd64? ( app-emulation/emul-linux-x86-baselibs ) !app-emulation/emul-linux-x86-motif )
 SLOT=2.2
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multilib-minimal	17ae39785bd22c9cf6159d6f11f87a04	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multilib-minimal	17ae39785bd22c9cf6159d6f11f87a04	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=943025cdd2f23acbcb5389bcb12856a5
diff --git a/metadata/md5-cache/x11-libs/motif-2.3.4 b/metadata/md5-cache/x11-libs/motif-2.3.4
index aefb45315887..f94dbf9d27d8 100644
--- a/metadata/md5-cache/x11-libs/motif-2.3.4
+++ b/metadata/md5-cache/x11-libs/motif-2.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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 sys-freebsd/freebsd-ubin ) x11-misc/xbitmaps || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 sys-freebsd/freebsd-ubin ) x11-misc/xbitmaps || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Motif user interface component toolkit
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/motif/ http://motif.ics.com/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ MIT
 RDEPEND=x11-libs/libXmu x11-libs/libXp unicode? ( virtual/libiconv ) xft? ( x11-libs/libXft ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/motif/Motif%202.3.4%20Source%20Code/motif-2.3.4-src.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1d61d84f486d11a429e627538a752178
diff --git a/metadata/md5-cache/x11-libs/motif-2.3.4-r1 b/metadata/md5-cache/x11-libs/motif-2.3.4-r1
index 37cde9f14310..ca4a86c57df3 100644
--- a/metadata/md5-cache/x11-libs/motif-2.3.4-r1
+++ b/metadata/md5-cache/x11-libs/motif-2.3.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] unicode? ( virtual/libiconv ) xft? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXft[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0= ) abi_x86_32? ( amd64? ( app-emulation/emul-linux-x86-baselibs ) !app-emulation/emul-linux-x86-motif ) sys-devel/flex || ( dev-util/byacc sys-freebsd/freebsd-ubin ) x11-misc/xbitmaps || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] unicode? ( virtual/libiconv ) xft? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXft[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0= ) abi_x86_32? ( amd64? ( app-emulation/emul-linux-x86-baselibs ) !app-emulation/emul-linux-x86-motif ) sys-devel/flex || ( dev-util/byacc sys-freebsd/freebsd-ubin ) x11-misc/xbitmaps || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Motif user interface component toolkit
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/motif/ http://motif.ics.com/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ MIT
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] unicode? ( virtual/libiconv ) xft? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] x11-libs/libXft[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0= ) abi_x86_32? ( amd64? ( app-emulation/emul-linux-x86-baselibs ) !app-emulation/emul-linux-x86-motif )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/motif/Motif%202.3.4%20Source%20Code/motif-2.3.4-src.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multilib-minimal	17ae39785bd22c9cf6159d6f11f87a04	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multilib-minimal	17ae39785bd22c9cf6159d6f11f87a04	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e33f27180d80a94caf19829e7ae62954
diff --git a/metadata/md5-cache/x11-libs/pango-1.30.1 b/metadata/md5-cache/x11-libs/pango-1.30.1
index dfe7d03881a2..30c7994474bb 100644
--- a/metadata/md5-cache/x11-libs/pango-1.30.1
+++ b/metadata/md5-cache/x11-libs/pango-1.30.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.31.0: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 ) virtual/pkgconfig >=dev-util/gtk-doc-am-1.13 introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) X? ( x11-proto/xproto ) !<=sys-devel/autoconf-2.63:2.5 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.31.0: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 ) virtual/pkgconfig >=dev-util/gtk-doc-am-1.13 introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) X? ( x11-proto/xproto ) !<=sys-devel/autoconf-2.63:2.5 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Internationalized text layout and rendering library
 EAPI=4
 HOMEPAGE=http://www.pango.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ FTL
 RDEPEND=>=dev-libs/glib-2.31.0: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 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pango/1.30/pango-1.30.1.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ef1f9930a6aa76298f4958aefd0bf4ee
diff --git a/metadata/md5-cache/x11-libs/pango-1.32.5 b/metadata/md5-cache/x11-libs/pango-1.32.5
index 85a6f7988bbb..43f922b5636c 100644
--- a/metadata/md5-cache/x11-libs/pango-1.32.5
+++ b/metadata/md5-cache/x11-libs/pango-1.32.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=media-libs/harfbuzz-0.9.9:= >=dev-libs/glib-2.33.12:2 >=media-libs/fontconfig-2.5.0:1.0= media-libs/freetype:2= >=x11-libs/cairo-1.7.6:=[X?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) X? ( x11-libs/libXrender x11-libs/libX11 >=x11-libs/libXft-2.0.0 ) >=dev-util/gtk-doc-am-1.13 virtual/pkgconfig X? ( x11-proto/xproto ) !<=sys-devel/autoconf-2.63:2.5 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=media-libs/harfbuzz-0.9.9:= >=dev-libs/glib-2.33.12:2 >=media-libs/fontconfig-2.5.0:1.0= media-libs/freetype:2= >=x11-libs/cairo-1.7.6:=[X?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) X? ( x11-libs/libXrender x11-libs/libX11 >=x11-libs/libXft-2.0.0 ) >=dev-util/gtk-doc-am-1.13 virtual/pkgconfig X? ( x11-proto/xproto ) !<=sys-devel/autoconf-2.63:2.5 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Internationalized text layout and rendering library
 EAPI=5
 HOMEPAGE=http://www.pango.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ FTL
 RDEPEND=>=media-libs/harfbuzz-0.9.9:= >=dev-libs/glib-2.33.12:2 >=media-libs/fontconfig-2.5.0:1.0= media-libs/freetype:2= >=x11-libs/cairo-1.7.6:=[X?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) X? ( x11-libs/libXrender x11-libs/libX11 >=x11-libs/libXft-2.0.0 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pango/1.32/pango-1.32.5.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e37d85f5f269a288e1c59785e32516a3
diff --git a/metadata/md5-cache/x11-libs/pango-1.34.0 b/metadata/md5-cache/x11-libs/pango-1.34.0
index d2a3fcee0a75..ce1f910829c2 100644
--- a/metadata/md5-cache/x11-libs/pango-1.34.0
+++ b/metadata/md5-cache/x11-libs/pango-1.34.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=media-libs/harfbuzz-0.9.9:= >=dev-libs/glib-2.33.12:2 >=media-libs/fontconfig-2.10.91:1.0= media-libs/freetype:2= >=x11-libs/cairo-1.7.6:=[X?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) X? ( x11-libs/libXrender x11-libs/libX11 >=x11-libs/libXft-2.0.0 ) >=dev-util/gtk-doc-am-1.13 virtual/pkgconfig X? ( x11-proto/xproto ) !<=sys-devel/autoconf-2.63:2.5 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=media-libs/harfbuzz-0.9.9:= >=dev-libs/glib-2.33.12:2 >=media-libs/fontconfig-2.10.91:1.0= media-libs/freetype:2= >=x11-libs/cairo-1.7.6:=[X?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) X? ( x11-libs/libXrender x11-libs/libX11 >=x11-libs/libXft-2.0.0 ) >=dev-util/gtk-doc-am-1.13 virtual/pkgconfig X? ( x11-proto/xproto ) !<=sys-devel/autoconf-2.63:2.5 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Internationalized text layout and rendering library
 EAPI=5
 HOMEPAGE=http://www.pango.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ FTL
 RDEPEND=>=media-libs/harfbuzz-0.9.9:= >=dev-libs/glib-2.33.12:2 >=media-libs/fontconfig-2.10.91:1.0= media-libs/freetype:2= >=x11-libs/cairo-1.7.6:=[X?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) X? ( x11-libs/libXrender x11-libs/libX11 >=x11-libs/libXft-2.0.0 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pango/1.34/pango-1.34.0.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d3a14a820b54d8f043da727ea01301a6
diff --git a/metadata/md5-cache/x11-libs/pixman-0.28.0 b/metadata/md5-cache/x11-libs/pixman-0.28.0
index 4e5a088d7b24..d4582c400f6e 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.28.0
+++ b/metadata/md5-cache/x11-libs/pixman-0.28.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Low-level pixel manipulation routines
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/pixman-0.28.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6ab0067f0755edf92c432d9010d1eb42
diff --git a/metadata/md5-cache/x11-libs/pixman-0.28.2 b/metadata/md5-cache/x11-libs/pixman-0.28.2
index 4bfef4c4e96f..d5942c1da854 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.28.2
+++ b/metadata/md5-cache/x11-libs/pixman-0.28.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Low-level pixel manipulation routines
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/pixman-0.28.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=c635875c6cb404664b795a35cbfb2016
diff --git a/metadata/md5-cache/x11-libs/pixman-0.29.2 b/metadata/md5-cache/x11-libs/pixman-0.29.2
index d47187e2b19e..ce14a7064582 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.29.2
+++ b/metadata/md5-cache/x11-libs/pixman-0.29.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Low-level pixel manipulation routines
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/pixman-0.29.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=f9cac1d09db695b6381e074e0477372a
diff --git a/metadata/md5-cache/x11-libs/startup-notification-0.10 b/metadata/md5-cache/x11-libs/startup-notification-0.10
index e0b1931b2143..7df7880c5825 100644
--- a/metadata/md5-cache/x11-libs/startup-notification-0.10
+++ b/metadata/md5-cache/x11-libs/startup-notification-0.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 virtual/pkgconfig x11-proto/xproto x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig x11-proto/xproto x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Application startup notification and feedback library
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/software/startup-notification
@@ -8,5 +8,5 @@ LICENSE=LGPL-2 MIT
 RDEPEND=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
 SLOT=0
 SRC_URI=http://freedesktop.org/software/startup-notification/releases/startup-notification-0.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e6c07df39d0c54443f9e938a8af95787
diff --git a/metadata/md5-cache/x11-libs/startup-notification-0.12 b/metadata/md5-cache/x11-libs/startup-notification-0.12
index ce82694e9369..e0c0f2d2f0f2 100644
--- a/metadata/md5-cache/x11-libs/startup-notification-0.12
+++ b/metadata/md5-cache/x11-libs/startup-notification-0.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libX11-1.4.3 >x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.8 x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libX11-1.4.3 >x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.8 x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Application startup notification and feedback library
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/startup-notification
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 MIT
 RDEPEND=>=x11-libs/libX11-1.4.3 >x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.8
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=3e498d3a9c2626a852e7fd87fa61db9e
diff --git a/metadata/md5-cache/x11-libs/tslib-1.0-r1 b/metadata/md5-cache/x11-libs/tslib-1.0-r1
index d949e8ef727d..b212a12555ff 100644
--- a/metadata/md5-cache/x11-libs/tslib-1.0-r1
+++ b/metadata/md5-cache/x11-libs/tslib-1.0-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Touchscreen Access Library
 HOMEPAGE=http://tslib.berlios.de/
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://berlios/tslib/tslib-1.0.tar.bz2 mirror://gentoo/tslib-1.0-patches-4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2fecdd61a3f1345239dbba7ac1e26a9b
diff --git a/metadata/md5-cache/x11-libs/tslib-1.0-r2 b/metadata/md5-cache/x11-libs/tslib-1.0-r2
index 3c39b1ee9ac1..2bd91ca49d98 100644
--- a/metadata/md5-cache/x11-libs/tslib-1.0-r2
+++ b/metadata/md5-cache/x11-libs/tslib-1.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Touchscreen Access Library
 EAPI=2
 HOMEPAGE=http://tslib.berlios.de/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://berlios/tslib/tslib-1.0.tar.bz2 mirror://gentoo/tslib-1.0-patches-5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b45b53d8583d7ccbad1a5ee98fa5ecc3
diff --git a/metadata/md5-cache/x11-libs/xbae-4.60.4 b/metadata/md5-cache/x11-libs/xbae-4.60.4
index a3bbe1dedf42..783860402587 100644
--- a/metadata/md5-cache/x11-libs/xbae-4.60.4
+++ b/metadata/md5-cache/x11-libs/xbae-4.60.4
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/motif:0 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/xbae/xbae-4.60.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=238e2e933f15d9231cbfca9e1e19d2ae
diff --git a/metadata/md5-cache/x11-libs/xcb-util-0.3.6 b/metadata/md5-cache/x11-libs/xcb-util-0.3.6
index 41401d5d6f27..b36f7c1d20d7 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-0.3.6
+++ b/metadata/md5-cache/x11-libs/xcb-util-0.3.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-libs/libxcb-1.4 >=dev-util/gperf-3.0.1 virtual/pkgconfig >=x11-proto/xproto-7.0.8 >=x11-proto/xcb-proto-1.5 test? ( >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-libs/libxcb-1.4 >=dev-util/gperf-3.0.1 virtual/pkgconfig >=x11-proto/xproto-7.0.8 >=x11-proto/xcb-proto-1.5 test? ( >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=X C-language Bindings sample implementations
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=test debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.4 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-util-0.3.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=0baff6974a37a971cc80e7439806d62f
diff --git a/metadata/md5-cache/x11-libs/xcb-util-0.3.8 b/metadata/md5-cache/x11-libs/xcb-util-0.3.8
index d83d0aa502db..55384e43ca21 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-0.3.8
+++ b/metadata/md5-cache/x11-libs/xcb-util-0.3.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libxcb-1.7 x11-proto/xproto >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/libxcb-1.7 x11-proto/xproto >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X C-language Bindings sample implementations
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=>=x11-libs/xcb-util-image-0.3.8 >=x11-libs/xcb-util-keysyms-0.3.8 >=x11-
 RDEPEND=>=x11-libs/libxcb-1.7 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-0.3.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=55286b380427fef99c3842d4bbda0c06
diff --git a/metadata/md5-cache/x11-libs/xcb-util-0.3.9 b/metadata/md5-cache/x11-libs/xcb-util-0.3.9
index 7d97a863cc64..78db77b86e48 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-0.3.9
+++ b/metadata/md5-cache/x11-libs/xcb-util-0.3.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libxcb-1.7 x11-proto/xproto >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/libxcb-1.7 x11-proto/xproto >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X C-language Bindings sample implementations
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -10,5 +10,5 @@ PDEPEND=>=x11-libs/xcb-util-image-0.3.9 >=x11-libs/xcb-util-keysyms-0.3.9 >=x11-
 RDEPEND=>=x11-libs/libxcb-1.7 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-0.3.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=08c5bba8fa9e755f28f7269306315fef
diff --git a/metadata/md5-cache/x11-libs/xcb-util-image-0.3.8 b/metadata/md5-cache/x11-libs/xcb-util-image-0.3.8
index 963148a8ddcc..5d562fbfe9f2 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-image-0.3.8
+++ b/metadata/md5-cache/x11-libs/xcb-util-image-0.3.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/xcb-util-0.3.8 x11-proto/xproto >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/xcb-util-0.3.8 x11-proto/xproto >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X C-language Bindings sample implementations
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/xcb-util-0.3.8 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-image-0.3.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=fdd094b52208a38b53aa095fccb0ee0f
diff --git a/metadata/md5-cache/x11-libs/xcb-util-image-0.3.9 b/metadata/md5-cache/x11-libs/xcb-util-image-0.3.9
index a9cce5188705..1e84a53b4a7d 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-image-0.3.9
+++ b/metadata/md5-cache/x11-libs/xcb-util-image-0.3.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/xcb-util-0.3.9 x11-proto/xproto >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/xcb-util-0.3.9 x11-proto/xproto >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X C-language Bindings sample implementations
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/xcb-util-0.3.9 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-image-0.3.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=b52d93f9c4baa86a59638a7f5819def4
diff --git a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.8 b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.8
index baa8f5c24cd4..245e8276229d 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.8
+++ b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/xcb-util-0.3.8 x11-proto/xproto >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/xcb-util-0.3.8 x11-proto/xproto >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X C-language Bindings sample implementations
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/xcb-util-0.3.8 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-keysyms-0.3.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=b3d3c128e1cfaa3a0e23e6374965517f
diff --git a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.9 b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.9
index 7f8cfdc2bbe0..9c8377e0b90d 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.9
+++ b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/xcb-util-0.3.9 x11-proto/xproto >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/xcb-util-0.3.9 x11-proto/xproto >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X C-language Bindings sample implementations
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/xcb-util-0.3.9 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-keysyms-0.3.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d92d2d07fda8c89139c0ec4528c877b8
diff --git a/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.8 b/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.8
index 5f0df8fc5ac0..6e1bb418ee02 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.8
+++ b/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/xcb-util-0.3.8 x11-proto/xproto >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/xcb-util-0.3.8 x11-proto/xproto >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X C-language Bindings sample implementations
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/xcb-util-0.3.8 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-renderutil-0.3.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4e63ceb8542d273a1df39dec37279953
diff --git a/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.8 b/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.8
index 5cc11cfdf5f1..1b0e0db75468 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.8
+++ b/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/xcb-util-0.3.8 x11-proto/xcb-proto x11-proto/xproto >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/xcb-util-0.3.8 x11-proto/xcb-proto x11-proto/xproto >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X C-language Bindings sample implementations
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/xcb-util-0.3.8 x11-proto/xcb-proto x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-wm-0.3.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=bc7db82c2913fd20052b5a8991afe366
diff --git a/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.9 b/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.9
index d3e87a475d81..daeaadcec90d 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.9
+++ b/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/xcb-util-0.3.9 x11-proto/xcb-proto x11-proto/xproto >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/xcb-util-0.3.9 x11-proto/xcb-proto x11-proto/xproto >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X C-language Bindings sample implementations
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/xcb-util-0.3.9 x11-proto/xcb-proto x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-wm-0.3.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6cf390c830e3d70fb9a086c978d11ac1
diff --git a/metadata/md5-cache/x11-libs/xforms-1.0.93_p1-r1 b/metadata/md5-cache/x11-libs/xforms-1.0.93_p1-r1
index 953b678ba20b..e226964cccdd 100644
--- a/metadata/md5-cache/x11-libs/xforms-1.0.93_p1-r1
+++ b/metadata/md5-cache/x11-libs/xforms-1.0.93_p1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=virtual/jpeg x11-libs/libSM x11-libs/libX11 x11-libs/libXpm opengl? ( virtual/opengl ) x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/jpeg x11-libs/libSM x11-libs/libX11 x11-libs/libXpm opengl? ( virtual/opengl ) x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A graphical user interface toolkit for X
 EAPI=5
 HOMEPAGE=http://www.nongnu.org/xforms/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/jpeg x11-libs/libSM x11-libs/libX11 x11-libs/libXpm opengl? ( virtual/opengl )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/xforms/xforms-1.0.93sp1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=35a43755b080e6217a1dfadb4d84400e
diff --git a/metadata/md5-cache/x11-libs/xosd-2.2.14-r1 b/metadata/md5-cache/x11-libs/xosd-2.2.14-r1
index 2050b16d87c0..e6e7ab7f7d95 100644
--- a/metadata/md5-cache/x11-libs/xosd-2.2.14-r1
+++ b/metadata/md5-cache/x11-libs/xosd-2.2.14-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt media-fonts/font-misc-misc xinerama? ( x11-proto/xineramaproto ) x11-proto/xextproto x11-proto/xproto virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt media-fonts/font-misc-misc xinerama? ( x11-proto/xineramaproto ) x11-proto/xextproto x11-proto/xproto virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for overlaying text in X-Windows X-On-Screen-Display plus binary for sending text from CLI
 HOMEPAGE=https://sourceforge.net/projects/libxosd/
 IUSE=xinerama
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt media-fonts/font-misc-misc
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xosd/xosd_2.2.14.orig.tar.gz mirror://debian/pool/main/x/xosd/xosd_2.2.14-1.diff.gz http://digilander.libero.it/dgp85/gentoo/xosd-gentoo-m4-1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1a12e8da18277ac35972973493cdc31f
diff --git a/metadata/md5-cache/x11-libs/xosd-2.2.14-r2 b/metadata/md5-cache/x11-libs/xosd-2.2.14-r2
index 6b000ce349ac..3310ef0a34ba 100644
--- a/metadata/md5-cache/x11-libs/xosd-2.2.14-r2
+++ b/metadata/md5-cache/x11-libs/xosd-2.2.14-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt media-fonts/font-misc-misc xinerama? ( x11-proto/xineramaproto ) x11-proto/xextproto x11-proto/xproto virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt media-fonts/font-misc-misc xinerama? ( x11-proto/xineramaproto ) x11-proto/xextproto x11-proto/xproto virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for overlaying text in X-Windows X-On-Screen-Display plus binary for sending text from CLI
 HOMEPAGE=https://sourceforge.net/projects/libxosd/
 IUSE=xinerama
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt media-fonts/font-misc-misc
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xosd/xosd_2.2.14.orig.tar.gz mirror://debian/pool/main/x/xosd/xosd_2.2.14-1.diff.gz http://digilander.libero.it/dgp85/gentoo/xosd-gentoo-m4-1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8743e965d67d3af6cad0788008b1ca8e
diff --git a/metadata/md5-cache/x11-libs/xpa-2.1.12 b/metadata/md5-cache/x11-libs/xpa-2.1.12
index ceb3d596332e..a8949689e33e 100644
--- a/metadata/md5-cache/x11-libs/xpa-2.1.12
+++ b/metadata/md5-cache/x11-libs/xpa-2.1.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/tcl x11-libs/libXt !<sci-astronomy/ds9-5.3 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/tcl x11-libs/libXt !<sci-astronomy/ds9-5.3 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Messaging system providing communication between programs
 EAPI=2
 HOMEPAGE=http://hea-www.harvard.edu/RD/xpa/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-lang/tcl x11-libs/libXt !<sci-astronomy/ds9-5.3
 SLOT=0
 SRC_URI=http://hea-www.harvard.edu/saord/download/xpa/xpa-2.1.12.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c0ec2d21a18c6257711c5bfb8df026df
diff --git a/metadata/md5-cache/x11-libs/xpa-2.1.13 b/metadata/md5-cache/x11-libs/xpa-2.1.13
index 78b65e0e6bd8..5a13796b5740 100644
--- a/metadata/md5-cache/x11-libs/xpa-2.1.13
+++ b/metadata/md5-cache/x11-libs/xpa-2.1.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/tcl x11-libs/libXt !<sci-astronomy/ds9-5.3 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/tcl x11-libs/libXt !<sci-astronomy/ds9-5.3 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Messaging system providing communication between programs
 EAPI=4
 HOMEPAGE=http://hea-www.harvard.edu/RD/xpa/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-lang/tcl x11-libs/libXt !<sci-astronomy/ds9-5.3
 SLOT=0
 SRC_URI=http://hea-www.harvard.edu/saord/download/xpa/xpa-2.1.13.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6af0bf738eb85882855288d3b2ec769d
diff --git a/metadata/md5-cache/x11-libs/xpa-2.1.14 b/metadata/md5-cache/x11-libs/xpa-2.1.14
index d63bf8b890cf..91a1de7eef6d 100644
--- a/metadata/md5-cache/x11-libs/xpa-2.1.14
+++ b/metadata/md5-cache/x11-libs/xpa-2.1.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/tcl x11-libs/libXt !<sci-astronomy/ds9-5.3 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/tcl x11-libs/libXt !<sci-astronomy/ds9-5.3 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Messaging system providing communication between programs
 EAPI=4
 HOMEPAGE=http://hea-www.harvard.edu/RD/xpa/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-lang/tcl x11-libs/libXt !<sci-astronomy/ds9-5.3
 SLOT=0
 SRC_URI=http://hea-www.harvard.edu/saord/download/xpa/xpa-2.1.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c0c73e49fa1b835b9a2d23f5f3501422
diff --git a/metadata/md5-cache/x11-libs/xpyb-1.2-r1 b/metadata/md5-cache/x11-libs/xpyb-1.2-r1
index d8046f5ca275..f7532063cd01 100644
--- a/metadata/md5-cache/x11-libs/xpyb-1.2-r1
+++ b/metadata/md5-cache/x11-libs/xpyb-1.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DEPEND=>=x11-libs/libxcb-1.1 >=dev-lang/python-2.5 >=x11-proto/xcb-proto-1.2 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=>=x11-libs/libxcb-1.1 >=dev-lang/python-2.5 >=x11-proto/xcb-proto-1.2 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=XCB-based Python bindings for the X Window System
 HOMEPAGE=http://xcb.freedesktop.org/ http://pypi.python.org/pypi/xpyb
 IUSE=selinux debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.1 >=dev-lang/python-2.5 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xpyb-1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=9499e2a0f9f3523e126444c91553eb1c
diff --git a/metadata/md5-cache/x11-libs/xpyb-1.3.1 b/metadata/md5-cache/x11-libs/xpyb-1.3.1
index 4e01f7835bf4..704f7658b8ad 100644
--- a/metadata/md5-cache/x11-libs/xpyb-1.3.1
+++ b/metadata/md5-cache/x11-libs/xpyb-1.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libxcb-1.7 >=x11-proto/xcb-proto-1.7.1 =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libxcb-1.7 >=x11-proto/xcb-proto-1.7.1 =dev-lang/python-2* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=XCB-based Python bindings for the X Window System
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.7 >=x11-proto/xcb-proto-1.7.1 =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xpyb-1.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5fcaeaffd3b131ff682fd6215086c461
diff --git a/metadata/md5-cache/x11-libs/xpyb-1.3.1-r1 b/metadata/md5-cache/x11-libs/xpyb-1.3.1-r1
index c9f09d402d79..cb7ebbc94d74 100644
--- a/metadata/md5-cache/x11-libs/xpyb-1.3.1-r1
+++ b/metadata/md5-cache/x11-libs/xpyb-1.3.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libxcb-1.7 >=x11-proto/xcb-proto-1.7.1[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_python3_1? ( dev-lang/python:3.1 ) python_single_target_python3_2? ( dev-lang/python:3.2 ) python_single_target_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-libs/libxcb-1.7 >=x11-proto/xcb-proto-1.7.1[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_python3_1? ( dev-lang/python:3.1 ) python_single_target_python3_2? ( dev-lang/python:3.2 ) python_single_target_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=XCB-based Python bindings for the X Window System
 EAPI=5
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.7 >=x11-proto/xcb-proto-1.7.1[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_python3_1? ( dev-lang/python:3.1 ) python_single_target_python3_2? ( dev-lang/python:3.2 ) python_single_target_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?]
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xpyb-1.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=e9a604196b436393ba33a6d9ce794111
diff --git a/metadata/md5-cache/x11-libs/xtrans-1.2.6 b/metadata/md5-cache/x11-libs/xtrans-1.2.6
index 85625438085c..2900e03437ef 100644
--- a/metadata/md5-cache/x11-libs/xtrans-1.2.6
+++ b/metadata/md5-cache/x11-libs/xtrans-1.2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.3 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.3 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org xtrans library
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=b3df496c95486cb25f6d6800f61a0d64
diff --git a/metadata/md5-cache/x11-libs/xtrans-1.2.7 b/metadata/md5-cache/x11-libs/xtrans-1.2.7
index 43aecf737416..1fff58ac1185 100644
--- a/metadata/md5-cache/x11-libs/xtrans-1.2.7
+++ b/metadata/md5-cache/x11-libs/xtrans-1.2.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org xtrans library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~a
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a072e11179d29c247b1536c0225f3ee3
diff --git a/metadata/md5-cache/x11-libs/xvba-video-0.8.0-r1 b/metadata/md5-cache/x11-libs/xvba-video-0.8.0-r1
index 5c24c337ce0f..fa6d615ace4d 100644
--- a/metadata/md5-cache/x11-libs/xvba-video-0.8.0-r1
+++ b/metadata/md5-cache/x11-libs/xvba-video-0.8.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=XVBA Backend for Video Acceleration (VA) API
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ MIT
 RDEPEND=x11-libs/libva[X(+),opengl?] x11-libs/libvdpau x11-drivers/ati-drivers
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~scarabeus/xvba-driver-0.8.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0fc8beae18c18657d6bd4f3094c4a59f
diff --git a/metadata/md5-cache/x11-libs/xvba-video-9999 b/metadata/md5-cache/x11-libs/xvba-video-9999
index fccfd5814a0d..191a0b6e6f35 100644
--- a/metadata/md5-cache/x11-libs/xvba-video-9999
+++ b/metadata/md5-cache/x11-libs/xvba-video-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 ) virtual/pkgconfig dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 ) virtual/pkgconfig dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=XVBA Backend for Video Acceleration (VA) API
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
@@ -7,5 +7,5 @@ IUSE=debug opengl
 LICENSE=GPL-2+ MIT
 RDEPEND=x11-libs/libva[X(+),opengl?] x11-libs/libvdpau x11-drivers/ati-drivers
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	a6778a259dc0aab7e2c3bbf70e694fad	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a5f4a8df3ed891208374c6f87741542
diff --git a/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r1 b/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r1
index 94a272096dde..a34e90ee6f3d 100644
--- a/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r1
+++ b/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=postinst prepare
-DEPEND=media-libs/freeglut >=media-libs/freetype-2 media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm x11-proto/xf86vidmodeproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/freeglut >=media-libs/freetype-2 media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm x11-proto/xf86vidmodeproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OpenGL virtual desktop switching
 EAPI=4
 HOMEPAGE=http://desk3d.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/freeglut >=media-libs/freetype-2 media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=mirror://sourceforge/desk3d/3ddesktop-0.2.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1636949b19323a348e491b6198628dd8
diff --git a/metadata/md5-cache/x11-misc/alltray-0.7.5.1 b/metadata/md5-cache/x11-misc/alltray-0.7.5.1
index 05e333b344e6..1f47a78623c5 100644
--- a/metadata/md5-cache/x11-misc/alltray-0.7.5.1
+++ b/metadata/md5-cache/x11-misc/alltray-0.7.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An application which allows any application to be docked into the system notification area
 EAPI=4
 HOMEPAGE=http://alltray.trausch.us/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=http://code.launchpad.net/alltray/trunk/0.7.5.1dev/+download/alltray-0.7.5.1dev.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=b745c20130e5aea143ad2102cc6c7e1c
diff --git a/metadata/md5-cache/x11-misc/bbacpi-0.1.5-r2 b/metadata/md5-cache/x11-misc/bbacpi-0.1.5-r2
index c8cf62716b82..14d73de3dd0e 100644
--- a/metadata/md5-cache/x11-misc/bbacpi-0.1.5-r2
+++ b/metadata/md5-cache/x11-misc/bbacpi-0.1.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=x11-libs/libX11 media-libs/imlib x11-misc/xdialog sys-power/acpi sys-power/acpid || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 media-libs/imlib x11-misc/xdialog sys-power/acpi sys-power/acpid || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ACPI monitor for X11
 EAPI=4
 HOMEPAGE=http://bbacpi.sourceforge.net
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 media-libs/imlib x11-misc/xdialog sys-power/acpi sys-power/acpid media-fonts/font-adobe-100dpi
 SLOT=0
 SRC_URI=mirror://sourceforge/bbacpi/bbacpi-0.1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=083056c33e7ce1d1e984b29f95d3dd49
diff --git a/metadata/md5-cache/x11-misc/bbappconf-0.0.2 b/metadata/md5-cache/x11-misc/bbappconf-0.0.2
index 0765f989d2f0..fb9b350ea7a6 100644
--- a/metadata/md5-cache/x11-misc/bbappconf-0.0.2
+++ b/metadata/md5-cache/x11-misc/bbappconf-0.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=utility that allows you to specify window properties in blackbox
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/bbtools
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ppc sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/bbtools/bbappconf-0.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=350e96df9cabb316632aab7156beebd4
diff --git a/metadata/md5-cache/x11-misc/bbdate-0.2.4-r1 b/metadata/md5-cache/x11-misc/bbdate-0.2.4-r1
index d7f34964854a..9695105a9ad5 100644
--- a/metadata/md5-cache/x11-misc/bbdate-0.2.4-r1
+++ b/metadata/md5-cache/x11-misc/bbdate-0.2.4-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=blackbox date display
 HOMEPAGE=http://sourceforge.net/projects/bbtools
 KEYWORDS=amd64 ppc sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/bbtools/bbdate-0.2.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ce77b1ddc1c9268092a0659d222a2e96
diff --git a/metadata/md5-cache/x11-misc/bbmail-0.9.3 b/metadata/md5-cache/x11-misc/bbmail-0.9.3
index 47b706693eaa..1e088f925e10 100644
--- a/metadata/md5-cache/x11-misc/bbmail-0.9.3
+++ b/metadata/md5-cache/x11-misc/bbmail-0.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-wm/blackbox x11-libs/libX11 x11-libs/libXext x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-wm/blackbox x11-libs/libX11 x11-libs/libXext x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=blackbox mail notification
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/bbtools
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-wm/blackbox x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://sourceforge/bbtools/bbmail-0.9.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3aca43d0fc3c54ac1db5bcfceea4425a
diff --git a/metadata/md5-cache/x11-misc/bbpager-0.4.7 b/metadata/md5-cache/x11-misc/bbpager-0.4.7
index 56de1624762a..8563dce8f82b 100644
--- a/metadata/md5-cache/x11-misc/bbpager-0.4.7
+++ b/metadata/md5-cache/x11-misc/bbpager-0.4.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=x11-wm/blackbox virtual/pkgconfig || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-wm/blackbox virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An understated pager for Blackbox.
 HOMEPAGE=http://bbtools.sourceforge.net/
 KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=x11-wm/blackbox
 SLOT=0
 SRC_URI=mirror://sourceforge/bbtools/bbpager-0.4.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=217de92b012853e5bda12e327d893d3b
diff --git a/metadata/md5-cache/x11-misc/bbppp-0.2.5 b/metadata/md5-cache/x11-misc/bbppp-0.2.5
index 6ae4596feed3..393aa7ed9a56 100644
--- a/metadata/md5-cache/x11-misc/bbppp-0.2.5
+++ b/metadata/md5-cache/x11-misc/bbppp-0.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=blackbox ppp frontend/monitor
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/bbtools/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://sourceforge/bbtools/bbppp/bbppp-0.2.5/bbppp-0.2.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9b9c4760767c1981120ca1ae4b11b016
diff --git a/metadata/md5-cache/x11-misc/bbppp-0.2.5-r1 b/metadata/md5-cache/x11-misc/bbppp-0.2.5-r1
index 7141249b6bc8..a192d69d5960 100644
--- a/metadata/md5-cache/x11-misc/bbppp-0.2.5-r1
+++ b/metadata/md5-cache/x11-misc/bbppp-0.2.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=blackbox ppp frontend/monitor
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/bbtools/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 media-fonts/font-adobe-100dpi
 SLOT=0
 SRC_URI=mirror://sourceforge/bbtools/bbppp/bbppp-0.2.5/bbppp-0.2.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5fc2f9fc8b9944a720835144794e4627
diff --git a/metadata/md5-cache/x11-misc/bbsload-0.2.8 b/metadata/md5-cache/x11-misc/bbsload-0.2.8
index 88f9b55c50bc..a23dcf2106f5 100644
--- a/metadata/md5-cache/x11-misc/bbsload-0.2.8
+++ b/metadata/md5-cache/x11-misc/bbsload-0.2.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=blackbox load monitor
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/bbtools/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-fonts/font-adobe-100dpi
 SLOT=0
 SRC_URI=http://bbtools.windsofstorm.net/sources/bbsload-0.2.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fbef2d7ef838acc8276e5abeea7aefb1
diff --git a/metadata/md5-cache/x11-misc/bbsload-0.2.9 b/metadata/md5-cache/x11-misc/bbsload-0.2.9
index 0838d6eb7b02..a18734b488de 100644
--- a/metadata/md5-cache/x11-misc/bbsload-0.2.9
+++ b/metadata/md5-cache/x11-misc/bbsload-0.2.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=blackbox load monitor
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/bbtools/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-fonts/font-adobe-100dpi
 SLOT=0
 SRC_URI=mirror://sourceforge/bbtools/bbsload-0.2.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=826d1f44465482761553875e550117db
diff --git a/metadata/md5-cache/x11-misc/bbtime-0.1.5 b/metadata/md5-cache/x11-misc/bbtime-0.1.5
index 40aea49c8382..17b19ec8b0fd 100644
--- a/metadata/md5-cache/x11-misc/bbtime-0.1.5
+++ b/metadata/md5-cache/x11-misc/bbtime-0.1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=blackbox time watcher
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/bbtools/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://sourceforge/bbtools/bbtime-0.1.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=19f413aa17648d59bbfa2be3f1352081
diff --git a/metadata/md5-cache/x11-misc/bbweather-0.6.3 b/metadata/md5-cache/x11-misc/bbweather-0.6.3
index f9cb4dae0e2b..1bf745f4f398 100644
--- a/metadata/md5-cache/x11-misc/bbweather-0.6.3
+++ b/metadata/md5-cache/x11-misc/bbweather-0.6.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-lang/perl x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=blackbox weather monitor
 EAPI=2
 HOMEPAGE=http://www.netmeister.org/apps/bbweather/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl x11-libs/libX11 media-fonts/font-adobe-100dpi net-misc/wget x11-apps/xmessage !<=x11-plugins/gkrellweather-2.0.7-r1
 SLOT=0
 SRC_URI=http://www.netmeister.org/apps/bbweather-0.6.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f97d5109595639e06d99a95e7c529cff
diff --git a/metadata/md5-cache/x11-misc/bbweather-0.6.3-r1 b/metadata/md5-cache/x11-misc/bbweather-0.6.3-r1
index fcf0a68b7d66..30559847058f 100644
--- a/metadata/md5-cache/x11-misc/bbweather-0.6.3-r1
+++ b/metadata/md5-cache/x11-misc/bbweather-0.6.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-lang/perl x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-lang/perl x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=blackbox weather monitor
 EAPI=2
 HOMEPAGE=http://www.netmeister.org/apps/bbweather/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl x11-libs/libX11 net-misc/wget x11-apps/xmessage !<=x11-plugins/gkrellweather-2.0.7-r1
 SLOT=0
 SRC_URI=http://www.netmeister.org/apps/bbweather-0.6.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d3253f1d09bbbd79c52e6cfa1c1e2273
diff --git a/metadata/md5-cache/x11-misc/cairo-clock-0.3.3 b/metadata/md5-cache/x11-misc/cairo-clock-0.3.3
index 1f1ff466faf8..d7fabaf9edc1 100644
--- a/metadata/md5-cache/x11-misc/cairo-clock-0.3.3
+++ b/metadata/md5-cache/x11-misc/cairo-clock-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=virtual/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An analog clock displaying the system-time.
 EAPI=2
 HOMEPAGE=http://macslow.thepimp.net/?page_id=23
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gnome-base/libglade gnome-base/librsvg >=x11-libs/cairo-1.2 x11-libs/gtk+:2 >=x11-libs/pango-1.10
 SLOT=0
 SRC_URI=http://macslow.thepimp.net/projects/cairo-clock/cairo-clock_0.3.3-1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5e7d3cc54328dd712804d3ee3b8b29b9
diff --git a/metadata/md5-cache/x11-misc/colord-0.1.26 b/metadata/md5-cache/x11-misc/colord-0.1.26
index 384de78ba79a..5ce19e39f140 100644
--- a/metadata/md5-cache/x11-misc/colord-0.1.26
+++ b/metadata/md5-cache/x11-misc/colord-0.1.26
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=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 ) udev? ( virtual/udev:=[gudev] ) dev-libs/libxslt >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) vala? ( || ( dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig virtual/pkgconfig
+DEPEND=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 ) udev? ( virtual/udev:=[gudev] ) dev-libs/libxslt >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) vala? ( || ( dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=System service to accurately color manage input and output devices
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/software/colord/
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0/1
 SRC_URI=http://www.freedesktop.org/software/colord/releases/colord-0.1.26.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
 _md5_=2c81a0971627516ace4bccd4ff6a2a7d
diff --git a/metadata/md5-cache/x11-misc/colord-0.1.26-r1 b/metadata/md5-cache/x11-misc/colord-0.1.26-r1
index e4e6a7a71d39..492ef089a5ba 100644
--- a/metadata/md5-cache/x11-misc/colord-0.1.26-r1
+++ b/metadata/md5-cache/x11-misc/colord-0.1.26-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=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 ) systemd? ( >=sys-apps/systemd-44 ) udev? ( virtual/udev:=[gudev] ) dev-libs/libxslt >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) vala? ( || ( dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig virtual/pkgconfig
+DEPEND=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 ) systemd? ( >=sys-apps/systemd-44 ) udev? ( virtual/udev:=[gudev] ) dev-libs/libxslt >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) vala? ( || ( dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=System service to accurately color manage input and output devices
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/software/colord/
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0/1
 SRC_URI=http://www.freedesktop.org/software/colord/releases/colord-0.1.26.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
 _md5_=585a6685763c8883d60f95aca8e3651b
diff --git a/metadata/md5-cache/x11-misc/colord-0.1.28 b/metadata/md5-cache/x11-misc/colord-0.1.28
index 138280311ad6..55dec21f1a78 100644
--- a/metadata/md5-cache/x11-misc/colord-0.1.28
+++ b/metadata/md5-cache/x11-misc/colord-0.1.28
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND=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 ) systemd? ( >=sys-apps/systemd-44 ) udev? ( virtual/udev:=[gudev] ) dev-libs/libxslt >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) extra-print-profiles? ( media-gfx/argyllcms ) vala? ( || ( dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig virtual/pkgconfig
+DEPEND=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 ) systemd? ( >=sys-apps/systemd-44 ) udev? ( virtual/udev:=[gudev] ) dev-libs/libxslt >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) extra-print-profiles? ( media-gfx/argyllcms ) vala? ( || ( dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=System service to accurately color manage input and output devices
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/software/colord/
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0/1
 SRC_URI=http://www.freedesktop.org/software/colord/releases/colord-0.1.28.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
 _md5_=0ce43ba879e6d37b0904d9f5fe5647a1
diff --git a/metadata/md5-cache/x11-misc/devilspie-0.22 b/metadata/md5-cache/x11-misc/devilspie-0.22
index 4ea32753d7ae..38444c7fbde6 100644
--- a/metadata/md5-cache/x11-misc/devilspie-0.22
+++ b/metadata/md5-cache/x11-misc/devilspie-0.22
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=dev-libs/glib-2.10 x11-libs/gtk+:2 >=x11-libs/libwnck-2.10:1 x11-libs/libX11 virtual/pkgconfig dev-util/intltool sys-devel/gettext gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.10 x11-libs/gtk+:2 >=x11-libs/libwnck-2.10:1 x11-libs/libX11 virtual/pkgconfig dev-util/intltool sys-devel/gettext gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Window Matching utility similar to Sawfish's Matched Windows feature
 EAPI=2
 HOMEPAGE=http://www.burtonini.com/blog/computers/devilspie
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.10 x11-libs/gtk+:2 >=x11-libs/libwnck-2.10:1 x11-libs/libX11
 SLOT=0
 SRC_URI=http://www.burtonini.com/computing/devilspie-0.22.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=64707272617900394eb62fbc22f4375a
diff --git a/metadata/md5-cache/x11-misc/electricsheep-2.7_beta11 b/metadata/md5-cache/x11-misc/electricsheep-2.7_beta11
index e74dcd30a357..ecb83fca02f0 100644
--- a/metadata/md5-cache/x11-misc/electricsheep-2.7_beta11
+++ b/metadata/md5-cache/x11-misc/electricsheep-2.7_beta11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/expat >=gnome-base/libglade-2.5.0:2.0 >=virtual/ffmpeg-0.10 sys-libs/zlib >=x11-libs/gtk+-2.7.0:2 x11-libs/libX11 virtual/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/expat >=gnome-base/libglade-2.5.0:2.0 >=virtual/ffmpeg-0.10 sys-libs/zlib >=x11-libs/gtk+-2.7.0:2 x11-libs/libX11 virtual/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=realize the collective dream of sleeping computers from all over the internet
 EAPI=2
 HOMEPAGE=http://electricsheep.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat >=gnome-base/libglade-2.5.0:2.0 >=virtual/ffmpeg-0.10 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
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~dreeevil/electricsheep-2.7_beta11.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7f7f126b6fe1a7dcf633c04098adb7f4
diff --git a/metadata/md5-cache/x11-misc/fireflies-2.07-r1 b/metadata/md5-cache/x11-misc/fireflies-2.07-r1
index 1842f292bf0f..8f0e2362130d 100644
--- a/metadata/md5-cache/x11-misc/fireflies-2.07-r1
+++ b/metadata/md5-cache/x11-misc/fireflies-2.07-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare unpack
-DEPEND=media-libs/libsdl x11-libs/libX11 virtual/opengl || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libsdl x11-libs/libX11 virtual/opengl || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Fireflies screensaver: Wicked cool eye candy
 EAPI=4
 HOMEPAGE=http://somewhere.fscked.org/proj/fireflies/
@@ -8,5 +8,5 @@ LICENSE=GPL-2 HPND
 RDEPEND=media-libs/libsdl x11-libs/libX11 virtual/opengl
 SLOT=0
 SRC_URI=http://somewhere.fscked.org/proj/fireflies/files/fireflies-2.07.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9cc26009dd3aea94213d658fc831ef4b
diff --git a/metadata/md5-cache/x11-misc/fluxter-0.1.0 b/metadata/md5-cache/x11-misc/fluxter-0.1.0
index c9c054202bb8..a3b6da94914d 100644
--- a/metadata/md5-cache/x11-misc/fluxter-0.1.0
+++ b/metadata/md5-cache/x11-misc/fluxter-0.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=workspace pager dockapp, particularly useful with the Fluxbox window manager
 EAPI=2
 HOMEPAGE=http://www.isomedia.com/homes/stevencooper
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE
 SLOT=0
 SRC_URI=http://www.isomedia.com/homes/stevencooper/files/fluxter-0.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=58b98147e355919b84f96a047368afd8
diff --git a/metadata/md5-cache/x11-misc/gccmakedep-1.0.2 b/metadata/md5-cache/x11-misc/gccmakedep-1.0.2
index d662f370c25e..903ebca9bff2 100644
--- a/metadata/md5-cache/x11-misc/gccmakedep-1.0.2
+++ b/metadata/md5-cache/x11-misc/gccmakedep-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=create dependencies in makefiles using 'gcc -M'
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=a971e12b98fec2d15e3b1bb3e6a009b0
diff --git a/metadata/md5-cache/x11-misc/gccmakedep-1.0.2-r1 b/metadata/md5-cache/x11-misc/gccmakedep-1.0.2-r1
index ff0edcd7943c..73936cde4259 100644
--- a/metadata/md5-cache/x11-misc/gccmakedep-1.0.2-r1
+++ b/metadata/md5-cache/x11-misc/gccmakedep-1.0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=create dependencies in makefiles using 'gcc -M'
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=e126866a8b28c6cd1d8678a3126891dd
diff --git a/metadata/md5-cache/x11-misc/gcolor2-0.4-r3 b/metadata/md5-cache/x11-misc/gcolor2-0.4-r3
index fc89e3e5ad0a..eafb796f744b 100644
--- a/metadata/md5-cache/x11-misc/gcolor2-0.4-r3
+++ b/metadata/md5-cache/x11-misc/gcolor2-0.4-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=>=x11-libs/gtk+-2.4:2 >=dev-util/intltool-0.27 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.4:2 >=dev-util/intltool-0.27 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a GTK+ color selector
 EAPI=1
 HOMEPAGE=http://gcolor2.sourceforge.net
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.4:2
 SLOT=0
 SRC_URI=mirror://sourceforge/gcolor2/gcolor2-0.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=200e228f19f6a9258b7e92f352e0fd32
diff --git a/metadata/md5-cache/x11-misc/gigolo-0.4.1 b/metadata/md5-cache/x11-misc/gigolo-0.4.1
index 8025f66a85b5..5585d3c0c3ff 100644
--- a/metadata/md5-cache/x11-misc/gigolo-0.4.1
+++ b/metadata/md5-cache/x11-misc/gigolo-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.16 >=x11-libs/gtk+-2.12:2 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.16 >=x11-libs/gtk+-2.12:2 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a frontend to easily manage connections to remote filesystems using GIO/GVfs
 EAPI=5
 HOMEPAGE=http://www.uvena.de/gigolo/ http://goodies.xfce.org/projects/applications/gigolo
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 >=x11-libs/gtk+-2.12:2
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/gigolo/0.4/gigolo-0.4.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=1b3008bceeedd7a8eb20b8eb67ee94f2
diff --git a/metadata/md5-cache/x11-misc/gmrun-0.9.2 b/metadata/md5-cache/x11-misc/gmrun-0.9.2
index 305d65913c75..e13f47662e97 100644
--- a/metadata/md5-cache/x11-misc/gmrun-0.9.2
+++ b/metadata/md5-cache/x11-misc/gmrun-0.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/gtk+:2 dev-libs/popt virtual/pkgconfig sys-apps/sed || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 dev-libs/popt virtual/pkgconfig sys-apps/sed || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A GTK-2 based launcher box with bash style auto completion!
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/gmrun
@@ -8,5 +8,5 @@ LICENSE=GPL-1
 RDEPEND=x11-libs/gtk+:2 dev-libs/popt
 SLOT=0
 SRC_URI=mirror://sourceforge/gmrun/gmrun-0.9.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dbe350de4a00e7795b259040313fde8d
diff --git a/metadata/md5-cache/x11-misc/gmrun-0.9.2-r1 b/metadata/md5-cache/x11-misc/gmrun-0.9.2-r1
index b8042d510840..52cf801a43c0 100644
--- a/metadata/md5-cache/x11-misc/gmrun-0.9.2-r1
+++ b/metadata/md5-cache/x11-misc/gmrun-0.9.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/gtk+:2 dev-libs/popt virtual/pkgconfig sys-apps/sed elibc_glibc? ( >=sys-libs/glibc-2.10 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 dev-libs/popt virtual/pkgconfig sys-apps/sed elibc_glibc? ( >=sys-libs/glibc-2.10 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A GTK-2 based launcher box with bash style auto completion!
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/gmrun/
@@ -9,5 +9,5 @@ LICENSE=GPL-1
 RDEPEND=x11-libs/gtk+:2 dev-libs/popt
 SLOT=0
 SRC_URI=mirror://sourceforge/gmrun/gmrun-0.9.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b6f0f0b76b88cc2ea7d701dc7134c107
diff --git a/metadata/md5-cache/x11-misc/growl-for-linux-0.6.7 b/metadata/md5-cache/x11-misc/growl-for-linux-0.6.7
index 32cfe95879aa..19c4c41bccdf 100644
--- a/metadata/md5-cache/x11-misc/growl-for-linux-0.6.7
+++ b/metadata/md5-cache/x11-misc/growl-for-linux-0.6.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-db/sqlite:3 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl net-misc/curl x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-db/sqlite:3 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl net-misc/curl x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Growl Implementation For Linux
 EAPI=5
 HOMEPAGE=http://mattn.github.com/growl-for-linux/
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=dev-db/sqlite:3 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl net-misc/curl x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://github/mattn/growl-for-linux/growl-for-linux-0.6.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6f74ff9a1f3c8f48630edc489ba1c118
diff --git a/metadata/md5-cache/x11-misc/growl-for-linux-9999 b/metadata/md5-cache/x11-misc/growl-for-linux-9999
index 7aa8bad2aeab..f498ef80f1fb 100644
--- a/metadata/md5-cache/x11-misc/growl-for-linux-9999
+++ b/metadata/md5-cache/x11-misc/growl-for-linux-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-db/sqlite:3 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl net-misc/curl x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=dev-db/sqlite:3 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl net-misc/curl x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Growl Implementation For Linux
 EAPI=5
 HOMEPAGE=http://mattn.github.com/growl-for-linux/
 LICENSE=BSD-2
 RDEPEND=dev-db/sqlite:3 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl net-misc/curl x11-libs/gtk+:2
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c7d1ebf847b2070ee66708639ac969d4
diff --git a/metadata/md5-cache/x11-misc/hsetroot-1.0.2 b/metadata/md5-cache/x11-misc/hsetroot-1.0.2
index 891e17dc98c5..ccf03fdafaf0 100644
--- a/metadata/md5-cache/x11-misc/hsetroot-1.0.2
+++ b/metadata/md5-cache/x11-misc/hsetroot-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11 >=media-libs/imlib2-1.0.6.2003[X] x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 >=media-libs/imlib2-1.0.6.2003[X] x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tool which allows you to compose wallpapers ('root pixmaps') for X
 EAPI=2
 HOMEPAGE=http://thegraveyard.org/hsetroot.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 >=media-libs/imlib2-1.0.6.2003[X]
 SLOT=0
 SRC_URI=http://cdn.thegraveyard.org/releases/hsetroot/hsetroot-1.0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=c19514aae04b113088cc652d9237bd8a
diff --git a/metadata/md5-cache/x11-misc/imake-1.0.4 b/metadata/md5-cache/x11-misc/imake-1.0.4
index fce1091aa47e..2a5faa738775 100644
--- a/metadata/md5-cache/x11-misc/imake-1.0.4
+++ b/metadata/md5-cache/x11-misc/imake-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-misc/xorg-cf-files x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-misc/xorg-cf-files x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=C preprocessor interface to the make utility
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-misc/xorg-cf-files
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/imake-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6a83e7439d8c290e3a0d39d2a3f2d790
diff --git a/metadata/md5-cache/x11-misc/imake-1.0.5 b/metadata/md5-cache/x11-misc/imake-1.0.5
index eae9297a0bc7..afcfd429eb4e 100644
--- a/metadata/md5-cache/x11-misc/imake-1.0.5
+++ b/metadata/md5-cache/x11-misc/imake-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-misc/xorg-cf-files x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-misc/xorg-cf-files x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=C preprocessor interface to the make utility
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-misc/xorg-cf-files
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/imake-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=b4c85f533f42b28bc3e02aeb6fe067e7
diff --git a/metadata/md5-cache/x11-misc/imwheel-1.0.0_pre13_p20100827 b/metadata/md5-cache/x11-misc/imwheel-1.0.0_pre13_p20100827
index ac8a7e049008..4134a88fe0f8 100644
--- a/metadata/md5-cache/x11-misc/imwheel-1.0.0_pre13_p20100827
+++ b/metadata/md5-cache/x11-misc/imwheel-1.0.0_pre13_p20100827
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=mouse tool for advanced features such as wheels and 3+ buttons
 EAPI=2
 HOMEPAGE=http://imwheel.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://gentoo/imwheel-1.0.0_pre13_p20100827.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=476a0d013102ebc67dba4ada296b0423
diff --git a/metadata/md5-cache/x11-misc/kbdd-0.5.2 b/metadata/md5-cache/x11-misc/kbdd-0.5.2
index 3267b7fedb9d..1288832d214d 100644
--- a/metadata/md5-cache/x11-misc/kbdd-0.5.2
+++ b/metadata/md5-cache/x11-misc/kbdd-0.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/glib x11-libs/libX11 dbus? ( sys-apps/dbus >=dev-libs/dbus-glib-0.86 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib x11-libs/libX11 dbus? ( sys-apps/dbus >=dev-libs/dbus-glib-0.86 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Very simple layout switcher
 EAPI=4
 HOMEPAGE=http://github.com/qnikst/kbdd
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib x11-libs/libX11 dbus? ( sys-apps/dbus >=dev-libs/dbus-glib-0.86 )
 SLOT=0
 SRC_URI=https://github.com/qnikst/kbdd/tarball/v0.5.2 -> kbdd-0.5.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=8531da5e1f4346504204d3c6ad499891
diff --git a/metadata/md5-cache/x11-misc/kbdd-0.7 b/metadata/md5-cache/x11-misc/kbdd-0.7
index 38682959280c..5d72a1e55473 100644
--- a/metadata/md5-cache/x11-misc/kbdd-0.7
+++ b/metadata/md5-cache/x11-misc/kbdd-0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/glib x11-libs/libX11 dbus? ( sys-apps/dbus >=dev-libs/dbus-glib-0.86 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib x11-libs/libX11 dbus? ( sys-apps/dbus >=dev-libs/dbus-glib-0.86 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Very simple layout switcher
 EAPI=4
 HOMEPAGE=http://github.com/qnikst/kbdd
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib x11-libs/libX11 dbus? ( sys-apps/dbus >=dev-libs/dbus-glib-0.86 )
 SLOT=0
 SRC_URI=https://github.com/qnikst/kbdd/tarball/v0.7 -> kbdd-0.7.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e5fc474e1180930d8b4aeda7da20ac89
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.0.11 b/metadata/md5-cache/x11-misc/lightdm-1.0.11
index 7281da1d08c7..288db68d29d2 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.0.11
+++ b/metadata/md5-cache/x11-misc/lightdm-1.0.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 ) sys-apps/accountsservice dev-lang/vala:0.12 dev-util/intltool virtual/pkgconfig gnome-base/gnome-common sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=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? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 ) sys-apps/accountsservice dev-lang/vala:0.12 dev-util/intltool virtual/pkgconfig gnome-base/gnome-common sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A lightweight display manager
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/LightDM
@@ -11,5 +11,5 @@ REQUIRED_USE=branding? ( gtk ) || ( gtk qt4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/lightdm/1.0/1.0.11/+download/lightdm-1.0.11.tar.gz mirror://gentoo/introspection-20110205.m4.tar.bz2 gtk? ( http://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=d45f9b1a67def3c81ab90fe7568ac476
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.2.2-r3 b/metadata/md5-cache/x11-misc/lightdm-1.2.2-r3
index 8869dc9f7a3f..92f80e197dc5 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.2.2-r3
+++ b/metadata/md5-cache/x11-misc/lightdm-1.2.2-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.32.3:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( >=dev-libs/gobject-introspection-1 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) dev-util/gtk-doc-am dev-util/intltool gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.32.3:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( >=dev-libs/gobject-introspection-1 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) dev-util/gtk-doc-am dev-util/intltool gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A lightweight display manager
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/LightDM
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/glib-2.32.3:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( >=dev-libs/gobject-introspection-1 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) >=sys-auth/pambase-20101024-r2
 SLOT=0
 SRC_URI=http://launchpad.net/lightdm/1.2/1.2.2/+download/lightdm-1.2.2.tar.gz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fa174d7ffcc122452008ca6317717264
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.3.3 b/metadata/md5-cache/x11-misc/lightdm-1.3.3
index 75b59799dd79..76fae4f567f4 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.3.3
+++ b/metadata/md5-cache/x11-misc/lightdm-1.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.32.3:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( >=dev-libs/gobject-introspection-1 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) dev-util/gtk-doc-am dev-util/intltool gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.32.3:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( >=dev-libs/gobject-introspection-1 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) dev-util/gtk-doc-am dev-util/intltool gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A lightweight display manager
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/LightDM
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/glib-2.32.3:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( >=dev-libs/gobject-introspection-1 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) >=sys-auth/pambase-20101024-r2
 SLOT=0
 SRC_URI=http://launchpad.net/lightdm/1.4/1.3.3/+download/lightdm-1.3.3.tar.gz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=80b82c4811ddcfc8d4afcbb6adc3209e
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.4.0 b/metadata/md5-cache/x11-misc/lightdm-1.4.0
index 139fc7421278..9121c07899d5 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.4.0
+++ b/metadata/md5-cache/x11-misc/lightdm-1.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.32.3:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( >=dev-libs/gobject-introspection-1 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) dev-util/gtk-doc-am dev-util/intltool gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.32.3:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( >=dev-libs/gobject-introspection-1 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) dev-util/gtk-doc-am dev-util/intltool gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A lightweight display manager
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/LightDM
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/glib-2.32.3:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( >=dev-libs/gobject-introspection-1 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) >=sys-auth/pambase-20101024-r2
 SLOT=0
 SRC_URI=http://launchpad.net/lightdm/1.4/1.4.0/+download/lightdm-1.4.0.tar.gz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=687d254fea9f6ed0cfb45297c2d802b2
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.4.0-r1 b/metadata/md5-cache/x11-misc/lightdm-1.4.0-r1
index beb766c9bbaf..3b7e59c9f117 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.4.0-r1
+++ b/metadata/md5-cache/x11-misc/lightdm-1.4.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.32.3:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( >=dev-libs/gobject-introspection-1 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) dev-util/gtk-doc-am dev-util/intltool gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.32.3:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( >=dev-libs/gobject-introspection-1 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) dev-util/gtk-doc-am dev-util/intltool gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A lightweight display manager
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/LightDM
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.32.3:2 dev-libs/libxml2 sys-apps/accountsservice virtu
 REQUIRED_USE=|| ( gtk kde razor )
 SLOT=0
 SRC_URI=http://launchpad.net/lightdm/1.4/1.4.0/+download/lightdm-1.4.0.tar.gz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=86d63c794da0c0b70a4bf5a4b56d5050
diff --git a/metadata/md5-cache/x11-misc/lndir-1.0.2 b/metadata/md5-cache/x11-misc/lndir-1.0.2
index ac94f74b1c79..48b6d402de7e 100644
--- a/metadata/md5-cache/x11-misc/lndir-1.0.2
+++ b/metadata/md5-cache/x11-misc/lndir-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=create a shadow directory of symbolic links to another directory tree
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a5ba1ceeea0bacf35e30cce55e131c52
diff --git a/metadata/md5-cache/x11-misc/lndir-1.0.3 b/metadata/md5-cache/x11-misc/lndir-1.0.3
index 959354d738fc..d5fe472f0e82 100644
--- a/metadata/md5-cache/x11-misc/lndir-1.0.3
+++ b/metadata/md5-cache/x11-misc/lndir-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=create a shadow directory of symbolic links to another directory tree
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7999f492f3c5940d612f42c788118707
diff --git a/metadata/md5-cache/x11-misc/makedepend-1.0.3 b/metadata/md5-cache/x11-misc/makedepend-1.0.3
index 0a243649ee1d..607b7c275d76 100644
--- a/metadata/md5-cache/x11-misc/makedepend-1.0.3
+++ b/metadata/md5-cache/x11-misc/makedepend-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=create dependencies in makefiles
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=8cb2677a6632566e394878c188c3471a
diff --git a/metadata/md5-cache/x11-misc/makedepend-1.0.4 b/metadata/md5-cache/x11-misc/makedepend-1.0.4
index 8ded3d5c4671..721cd8194eef 100644
--- a/metadata/md5-cache/x11-misc/makedepend-1.0.4
+++ b/metadata/md5-cache/x11-misc/makedepend-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=create dependencies in makefiles
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=2b2434bfc7c6e22b4dbc3443fd38bf54
diff --git a/metadata/md5-cache/x11-misc/nitrogen-1.4-r1 b/metadata/md5-cache/x11-misc/nitrogen-1.4-r1
index 1dfaa184b2a4..005c97f87b3b 100644
--- a/metadata/md5-cache/x11-misc/nitrogen-1.4-r1
+++ b/metadata/md5-cache/x11-misc/nitrogen-1.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-cpp/gtkmm:2.4 >=gnome-base/librsvg-2.20:2 x11-libs/gtk+:2 xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-cpp/gtkmm:2.4 >=gnome-base/librsvg-2.20:2 x11-libs/gtk+:2 xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK+ background browser and setter for X.
 EAPI=2
 HOMEPAGE=http://projects.l3ib.org/nitrogen/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/gtkmm:2.4 >=gnome-base/librsvg-2.20:2 x11-libs/gtk+:2 xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=http://projects.l3ib.org/nitrogen/files/nitrogen-1.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4830b5404754928113a0166e4e0c5c3d
diff --git a/metadata/md5-cache/x11-misc/nitrogen-1.5.2 b/metadata/md5-cache/x11-misc/nitrogen-1.5.2
index 5ecc9a24ef19..7fc6c372e61e 100644
--- a/metadata/md5-cache/x11-misc/nitrogen-1.5.2
+++ b/metadata/md5-cache/x11-misc/nitrogen-1.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig nls? ( sys-devel/gettext ) xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig nls? ( sys-devel/gettext ) xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A background browser and setter for X
 EAPI=4
 HOMEPAGE=http://projects.l3ib.org/nitrogen/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=http://projects.l3ib.org/nitrogen/files/nitrogen-1.5.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=11f03a5e41a09a1b95eb4de7e5aa6d88
diff --git a/metadata/md5-cache/x11-misc/notify-osd-0.9.34 b/metadata/md5-cache/x11-misc/notify-osd-0.9.34
index a2d8f432dd71..bd1f54edb18d 100644
--- a/metadata/md5-cache/x11-misc/notify-osd-0.9.34
+++ b/metadata/md5-cache/x11-misc/notify-osd-0.9.34
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=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 virtual/pkgconfig gnome-base/gnome-common x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=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 virtual/pkgconfig gnome-base/gnome-common x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Canonical's on-screen-display notification agent
 EAPI=4
 HOMEPAGE=http://launchpad.net/notify-osd
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16 >=x11-libs/gtk+-3.2:3 >=x
 RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/notify-osd/precise/0.9.34/+download/notify-osd-0.9.34.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=1974cdbf5ba4f0c365924511d9c1031c
diff --git a/metadata/md5-cache/x11-misc/numlockx-1.2 b/metadata/md5-cache/x11-misc/numlockx-1.2
index 880e6139ce85..449c40d0c025 100644
--- a/metadata/md5-cache/x11-misc/numlockx-1.2
+++ b/metadata/md5-cache/x11-misc/numlockx-1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXtst x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXtst x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Turns on numlock in X
 EAPI=4
 HOMEPAGE=http://home.kde.org/~seli/numlockx/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXtst
 SLOT=0
 SRC_URI=mirror://gentoo/numlockx-1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=742e6394bcf55ddff57d8148ca1d10ad
diff --git a/metadata/md5-cache/x11-misc/obconf-2.0.3_p20110314 b/metadata/md5-cache/x11-misc/obconf-2.0.3_p20110314
index e2ec7b358123..2d5095db0787 100644
--- a/metadata/md5-cache/x11-misc/obconf-2.0.3_p20110314
+++ b/metadata/md5-cache/x11-misc/obconf-2.0.3_p20110314
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.0_pre20110313 virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.0_pre20110313 virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ObConf is a tool for configuring the Openbox window manager.
 EAPI=2
 HOMEPAGE=http://openbox.org/wiki/ObConf:About
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.0_pre20110313
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/obconf-2.0.3_p20110314.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=0d5449aa362cf23d679b58e61fca011e
diff --git a/metadata/md5-cache/x11-misc/obconf-2.0.3_p20110314-r1 b/metadata/md5-cache/x11-misc/obconf-2.0.3_p20110314-r1
index 8010422b90a1..3b31fd593696 100644
--- a/metadata/md5-cache/x11-misc/obconf-2.0.3_p20110314-r1
+++ b/metadata/md5-cache/x11-misc/obconf-2.0.3_p20110314-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.0_pre20110313 virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.0_pre20110313 virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ObConf is a tool for configuring the Openbox window manager.
 EAPI=2
 HOMEPAGE=http://openbox.org/wiki/ObConf:About
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.0_pre20110313
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/obconf-2.0.3_p20110314.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ff9199774585ea04ee7d948d7a6baebe
diff --git a/metadata/md5-cache/x11-misc/obconf-2.0.3_p20111019 b/metadata/md5-cache/x11-misc/obconf-2.0.3_p20111019
index 09cc755cb945..2d693e1241ff 100644
--- a/metadata/md5-cache/x11-misc/obconf-2.0.3_p20111019
+++ b/metadata/md5-cache/x11-misc/obconf-2.0.3_p20111019
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.0_p20111019 virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.0_p20111019 virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=ObConf is a tool for configuring the Openbox window manager.
 EAPI=2
 HOMEPAGE=http://openbox.org/wiki/ObConf:About
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.0_p20111019
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/obconf-2.0.3_p20111019.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a9e3777d6eb5bf99fa70d55625adad79
diff --git a/metadata/md5-cache/x11-misc/obconf-9999 b/metadata/md5-cache/x11-misc/obconf-9999
index 240474fd4fea..b19d377fbbcc 100644
--- a/metadata/md5-cache/x11-misc/obconf-9999
+++ b/metadata/md5-cache/x11-misc/obconf-9999
@@ -7,5 +7,5 @@ IUSE=nls
 LICENSE=GPL-2
 RDEPEND=gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification =x11-wm/openbox-9999
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=de10d78f63b9c74e368e0c1d520cd6a4
diff --git a/metadata/md5-cache/x11-misc/parcellite-1.0.2_rc5 b/metadata/md5-cache/x11-misc/parcellite-1.0.2_rc5
index b5f4e61517ce..091c3ae852aa 100644
--- a/metadata/md5-cache/x11-misc/parcellite-1.0.2_rc5
+++ b/metadata/md5-cache/x11-misc/parcellite-1.0.2_rc5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=>=dev-libs/glib-2.14 >=x11-libs/gtk+-2.10:2 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.14 >=x11-libs/gtk+-2.10:2 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A lightweight GTK+ based clipboard manager.
 EAPI=4
 HOMEPAGE=http://parcellite.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.14 >=x11-libs/gtk+-2.10:2
 SLOT=0
 SRC_URI=mirror://sourceforge/parcellite/parcellite-1.0.2rc5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=02ae0a9138e188bb00c4a9876cfbf6cc
diff --git a/metadata/md5-cache/x11-misc/parcellite-1.0.2_rc5-r1 b/metadata/md5-cache/x11-misc/parcellite-1.0.2_rc5-r1
index f6913f3c4e91..711aa21874f3 100644
--- a/metadata/md5-cache/x11-misc/parcellite-1.0.2_rc5-r1
+++ b/metadata/md5-cache/x11-misc/parcellite-1.0.2_rc5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=>=dev-libs/glib-2.14 >=x11-libs/gtk+-2.10:2 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.14 >=x11-libs/gtk+-2.10:2 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A lightweight GTK+ based clipboard manager.
 EAPI=4
 HOMEPAGE=http://parcellite.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.14 >=x11-libs/gtk+-2.10:2
 SLOT=0
 SRC_URI=mirror://sourceforge/parcellite/parcellite-1.0.2rc5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ad8a8189bf1ef05573de68f45338c42c
diff --git a/metadata/md5-cache/x11-misc/pathfinder-1.6.36 b/metadata/md5-cache/x11-misc/pathfinder-1.6.36
index 593d9dff44de..df8bab288280 100644
--- a/metadata/md5-cache/x11-misc/pathfinder-1.6.36
+++ b/metadata/md5-cache/x11-misc/pathfinder-1.6.36
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=x11-libs/fox:1.6 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+DEPEND=x11-libs/fox:1.6 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 DESCRIPTION=File manager based on the FOX Toolkit
 EAPI=1
 HOMEPAGE=http://www.fox-toolkit.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/fox:1.6 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 )
 SLOT=0
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.6.36.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bf9ec0eeeecfebec29104824b30b5ba8
diff --git a/metadata/md5-cache/x11-misc/pathfinder-1.7.32 b/metadata/md5-cache/x11-misc/pathfinder-1.7.32
index 36cf8d1c8aff..fef151bcd3c3 100644
--- a/metadata/md5-cache/x11-misc/pathfinder-1.7.32
+++ b/metadata/md5-cache/x11-misc/pathfinder-1.7.32
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=x11-libs/fox:1.7 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+DEPEND=x11-libs/fox:1.7 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 DESCRIPTION=File manager based on the FOX Toolkit
 EAPI=4
 HOMEPAGE=http://www.fox-toolkit.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/fox:1.7 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 )
 SLOT=0
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.32.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=32b6d02753123baf845acdc3678b3b9e
diff --git a/metadata/md5-cache/x11-misc/pathfinder-1.7.33 b/metadata/md5-cache/x11-misc/pathfinder-1.7.33
index 667d23f45103..42f9de2afd1a 100644
--- a/metadata/md5-cache/x11-misc/pathfinder-1.7.33
+++ b/metadata/md5-cache/x11-misc/pathfinder-1.7.33
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=x11-libs/fox:1.7 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+DEPEND=x11-libs/fox:1.7 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 DESCRIPTION=File manager based on the FOX Toolkit
 EAPI=4
 HOMEPAGE=http://www.fox-toolkit.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/fox:1.7 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 )
 SLOT=0
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.33.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5947425005cf81e12752478c1b13abaa
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-0.9.10 b/metadata/md5-cache/x11-misc/pcmanfm-0.9.10
index edbd0ae986d6..25b80af4cb29 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-0.9.10
+++ b/metadata/md5-cache/x11-misc/pcmanfm-0.9.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=>=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 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Fast lightweight tabbed filemanager
 EAPI=4
 HOMEPAGE=http://pcmanfm.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/pcmanfm-0.9.10.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=cc345b259fa4d20cd0f38cec7ba2b07a
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-9999 b/metadata/md5-cache/x11-misc/pcmanfm-9999
index f950c9b4fb05..b3ac498c4503 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-9999
+++ b/metadata/md5-cache/x11-misc/pcmanfm-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare unpack
-DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.22.1:2 >=lxde-base/menu-cache-0.3.2 >=x11-libs/libfm-9999 >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.22.1:2 >=lxde-base/menu-cache-0.3.2 >=x11-libs/libfm-9999 >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Fast lightweight tabbed filemanager
 EAPI=3
 HOMEPAGE=http://pcmanfm.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.22.1:2 >=lxde-base/menu-cache-0.3.2 >=x11-libs/libfm-9999 virtual/eject virtual/freedesktop-icon-theme
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=1ec9dc0821f74b1a216a3cf189896bd0
diff --git a/metadata/md5-cache/x11-misc/peksystray-0.4.0 b/metadata/md5-cache/x11-misc/peksystray-0.4.0
index d0ad884bcc17..6f1545c5ce52 100644
--- a/metadata/md5-cache/x11-misc/peksystray-0.4.0
+++ b/metadata/md5-cache/x11-misc/peksystray-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A system tray dockapp for window managers supporting docking
 EAPI=2
 HOMEPAGE=http://peksystray.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXt
 SLOT=0
 SRC_URI=mirror://sourceforge/peksystray/peksystray-0.4.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a31b74b2a90457837073773df3c9a61f
diff --git a/metadata/md5-cache/x11-misc/redshift-1.7-r1 b/metadata/md5-cache/x11-misc/redshift-1.7-r1
index ec969391d422..b80805cce384 100644
--- a/metadata/md5-cache/x11-misc/redshift-1.7-r1
+++ b/metadata/md5-cache/x11-misc/redshift-1.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb geoclue? ( app-misc/geoclue ) gnome? ( dev-libs/glib:2 >=gnome-base/gconf-2 ) gtk? ( python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb geoclue? ( app-misc/geoclue ) gnome? ( dev-libs/glib:2 >=gnome-base/gconf-2 ) gtk? ( python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A screen color temperature adjusting software
 EAPI=5
 HOMEPAGE=http://jonls.dk/redshift/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb geoclue? ( app-misc/geoclue ) gnome? ( dev-libs/glib:2 >=gnome-base/gconf-2 ) gtk? ( python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) gtk? ( >=dev-python/pygtk-2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] )
 SLOT=0
 SRC_URI=http://launchpad.net/redshift/trunk/1.7/+download/redshift-1.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cd44f86f4f47d8d3dfe0aaf13542ebc5
diff --git a/metadata/md5-cache/x11-misc/rendercheck-1.4 b/metadata/md5-cache/x11-misc/rendercheck-1.4
index aaf052a6f649..b206e886534d 100644
--- a/metadata/md5-cache/x11-misc/rendercheck-1.4
+++ b/metadata/md5-cache/x11-misc/rendercheck-1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXrender x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXrender x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Tests for compliance with X RENDER extension
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXrender x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/rendercheck-1.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=72527944fa0e91460b2266c4e8f1533a
diff --git a/metadata/md5-cache/x11-misc/rodent-4.8.0 b/metadata/md5-cache/x11-misc/rodent-4.8.0
index 2b4bef613f7b..495520392026 100644
--- a/metadata/md5-cache/x11-misc/rodent-4.8.0
+++ b/metadata/md5-cache/x11-misc/rodent-4.8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libX11 x11-libs/libSM dev-libs/libxml2 >=dev-libs/glib-2.24 x11-libs/gtk+:3 >=x11-libs/cairo-1.8.10 >=gnome-base/librsvg-2.26 >=dev-libs/libzip-0.9 sys-apps/file gnome-base/gvfs
 SLOT=0
 SRC_URI=mirror://sourceforge/xffm/rodent-4.8.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=c9a324201218e04cba7563b92c7640d5
diff --git a/metadata/md5-cache/x11-misc/rodent-4.9.2 b/metadata/md5-cache/x11-misc/rodent-4.9.2
index ce6472bb0047..62ef25d2d318 100644
--- a/metadata/md5-cache/x11-misc/rodent-4.9.2
+++ b/metadata/md5-cache/x11-misc/rodent-4.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=x11-libs/libX11 x11-libs/libSM dev-libs/libxml2 >=dev-libs/glib-2.24 x11-libs/gtk+:3 >=x11-libs/cairo-1.8.10 >=gnome-base/librsvg-2.26 >=dev-libs/libzip-0.9 sys-apps/file dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 x11-libs/libSM dev-libs/libxml2 >=dev-libs/glib-2.24 x11-libs/gtk+:3 >=x11-libs/cairo-1.8.10 >=gnome-base/librsvg-2.26 >=dev-libs/libzip-0.9 sys-apps/file dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fast, small and powerful file manager and graphical shell
 EAPI=5
 HOMEPAGE=http://rodent.xffm.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libX11 x11-libs/libSM dev-libs/libxml2 >=dev-libs/glib-2.24 x11-libs/gtk+:3 >=x11-libs/cairo-1.8.10 >=gnome-base/librsvg-2.26 >=dev-libs/libzip-0.9 sys-apps/file gnome-base/gvfs
 SLOT=0
 SRC_URI=mirror://sourceforge/xffm/4.9.2/rodent-4.9.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=558b2213c8bc3f1e549d0512ba8ae8f9
diff --git a/metadata/md5-cache/x11-misc/rss-glx-0.9.0 b/metadata/md5-cache/x11-misc/rss-glx-0.9.0
index b964c82cbd58..e659ceee5139 100644
--- a/metadata/md5-cache/x11-misc/rss-glx-0.9.0
+++ b/metadata/md5-cache/x11-misc/rss-glx-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=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 virtual/pkgconfig sys-apps/sed || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig sys-apps/sed || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Really Slick OpenGL Screensavers for XScreenSaver
 EAPI=2
 HOMEPAGE=http://rss-glx.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/rss-glx/rss-glx_0.9.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=bd28ee1f3b0cf775cdc24758b68c12e5
diff --git a/metadata/md5-cache/x11-misc/rss-glx-0.9.1 b/metadata/md5-cache/x11-misc/rss-glx-0.9.1
index 2d95f4dd0952..1c22adbb4ee0 100644
--- a/metadata/md5-cache/x11-misc/rss-glx-0.9.1
+++ b/metadata/md5-cache/x11-misc/rss-glx-0.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=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 virtual/pkgconfig sys-apps/sed || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig sys-apps/sed || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Really Slick OpenGL Screensavers for XScreenSaver
 EAPI=2
 HOMEPAGE=http://rss-glx.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/rss-glx/rss-glx_0.9.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=63c4b1c3f1d4a12e66ed3c1fe1226627
diff --git a/metadata/md5-cache/x11-misc/seetxt-0.72-r1 b/metadata/md5-cache/x11-misc/seetxt-0.72-r1
index 9b9cbadbc0b2..b7dc62597f9a 100644
--- a/metadata/md5-cache/x11-misc/seetxt-0.72-r1
+++ b/metadata/md5-cache/x11-misc/seetxt-0.72-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Clever, lightweight GUI text file and manual page viewer for X windows.
 EAPI=5
 HOMEPAGE=http://code.google.com/p/seetxt/ http://seetxt.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://seetxt.googlecode.com/files/seetxt-0.72.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a33e0d181e4dfd4590897422e6f40c02
diff --git a/metadata/md5-cache/x11-misc/shutterbug-1.6.36 b/metadata/md5-cache/x11-misc/shutterbug-1.6.36
index 16121d5edc69..8d7d117c6e19 100644
--- a/metadata/md5-cache/x11-misc/shutterbug-1.6.36
+++ b/metadata/md5-cache/x11-misc/shutterbug-1.6.36
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=x11-libs/fox:1.6 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+DEPEND=x11-libs/fox:1.6 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 DESCRIPTION=Screenshot utility based on the FOX Toolkit
 EAPI=1
 HOMEPAGE=http://www.fox-toolkit.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/fox:1.6 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 )
 SLOT=0
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.6.36.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5619cfd7e62a404f689aa576796bb282
diff --git a/metadata/md5-cache/x11-misc/shutterbug-1.7.32 b/metadata/md5-cache/x11-misc/shutterbug-1.7.32
index 00bc92818956..e706c65a8685 100644
--- a/metadata/md5-cache/x11-misc/shutterbug-1.7.32
+++ b/metadata/md5-cache/x11-misc/shutterbug-1.7.32
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=x11-libs/fox:1.7 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+DEPEND=x11-libs/fox:1.7 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 DESCRIPTION=Screenshot utility based on the FOX Toolkit
 EAPI=4
 HOMEPAGE=http://www.fox-toolkit.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/fox:1.7 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 )
 SLOT=0
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.32.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bca80ec56aba509922fb1e8d4bec8f32
diff --git a/metadata/md5-cache/x11-misc/shutterbug-1.7.33 b/metadata/md5-cache/x11-misc/shutterbug-1.7.33
index b447a053476f..d13d2f60fff7 100644
--- a/metadata/md5-cache/x11-misc/shutterbug-1.7.33
+++ b/metadata/md5-cache/x11-misc/shutterbug-1.7.33
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=x11-libs/fox:1.7 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+DEPEND=x11-libs/fox:1.7 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 DESCRIPTION=Screenshot utility based on the FOX Toolkit
 EAPI=4
 HOMEPAGE=http://www.fox-toolkit.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/fox:1.7 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 )
 SLOT=0
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.33.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fox	26650ced206327e4fca3dec6cd441381	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ada3fb7a51d0a26fd0f99600289c842f
diff --git a/metadata/md5-cache/x11-misc/superswitcher-0.6 b/metadata/md5-cache/x11-misc/superswitcher-0.6
index cec67e925d8b..52208527be6c 100644
--- a/metadata/md5-cache/x11-misc/superswitcher-0.6
+++ b/metadata/md5-cache/x11-misc/superswitcher-0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=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 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A more feature-full replacement of the Alt-Tab window switching behavior.
 EAPI=4
 HOMEPAGE=http://code.google.com/p/superswitcher/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=http://superswitcher.googlecode.com/files/superswitcher-0.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c03385fb12f0cb93f81ee728c7c8202e
diff --git a/metadata/md5-cache/x11-misc/sw-notify-send-0.1.1 b/metadata/md5-cache/x11-misc/sw-notify-send-0.1.1
index 34772f70c562..840f6e61ed21 100644
--- a/metadata/md5-cache/x11-misc/sw-notify-send-0.1.1
+++ b/metadata/md5-cache/x11-misc/sw-notify-send-0.1.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=sys-process/procps
 SLOT=0
 SRC_URI=mirror://github/mgorny/sw-notify-send/sw-notify-send-0.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=26de62c3fe61873dc3e3614db97fbfcc
diff --git a/metadata/md5-cache/x11-misc/sw-notify-send-1.2.1 b/metadata/md5-cache/x11-misc/sw-notify-send-1.2.1
index 399a94e9afa9..a620c894b641 100644
--- a/metadata/md5-cache/x11-misc/sw-notify-send-1.2.1
+++ b/metadata/md5-cache/x11-misc/sw-notify-send-1.2.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=x11-libs/libtinynotify ~x11-libs/libtinynotify-cli-1.2.1 x11-libs/libtinynotify-systemwide
 SLOT=0
 SRC_URI=mirror://github/mgorny/tinynotify-send/tinynotify-send-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=49f8492e233ab204d44312b7e7f2178b
diff --git a/metadata/md5-cache/x11-misc/sw-notify-send-9999 b/metadata/md5-cache/x11-misc/sw-notify-send-9999
index 805daa4507c0..fe94029813bd 100644
--- a/metadata/md5-cache/x11-misc/sw-notify-send-9999
+++ b/metadata/md5-cache/x11-misc/sw-notify-send-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=x11-libs/libtinynotify ~x11-libs/libtinynotify-cli-9999 x11-libs/libtinynotify-systemwide virtual/pkgconfig dev-util/gtk-doc dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libtinynotify ~x11-libs/libtinynotify-cli-9999 x11-libs/libtinynotify-systemwide virtual/pkgconfig dev-util/gtk-doc dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A system-wide variant of tinynotify-send
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/tinynotify-send/
 LICENSE=BSD
 RDEPEND=x11-libs/libtinynotify ~x11-libs/libtinynotify-cli-9999 x11-libs/libtinynotify-systemwide
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=498e7d0c94ef0edc7d4e3454a51f408c
diff --git a/metadata/md5-cache/x11-misc/tinynotify-send-1.2.1-r1 b/metadata/md5-cache/x11-misc/tinynotify-send-1.2.1-r1
index 9d08acc06005..3c614d1d5517 100644
--- a/metadata/md5-cache/x11-misc/tinynotify-send-1.2.1-r1
+++ b/metadata/md5-cache/x11-misc/tinynotify-send-1.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-admin/eselect-notify-send x11-libs/libtinynotify ~x11-libs/libtinynotify-cli-1.2.1
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/tinynotify-send/downloads/tinynotify-send-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d8a5d9f11a66253ab37238187b75d577
diff --git a/metadata/md5-cache/x11-misc/tinynotify-send-9999 b/metadata/md5-cache/x11-misc/tinynotify-send-9999
index 21fb4d2e339a..9ae31ac973ef 100644
--- a/metadata/md5-cache/x11-misc/tinynotify-send-9999
+++ b/metadata/md5-cache/x11-misc/tinynotify-send-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=app-admin/eselect-notify-send x11-libs/libtinynotify ~x11-libs/libtinynotify-cli-9999 virtual/pkgconfig dev-util/gtk-doc dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-admin/eselect-notify-send x11-libs/libtinynotify ~x11-libs/libtinynotify-cli-9999 virtual/pkgconfig dev-util/gtk-doc dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A notification sending utility (using libtinynotify)
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/tinynotify-send/
 LICENSE=BSD
 RDEPEND=app-admin/eselect-notify-send x11-libs/libtinynotify ~x11-libs/libtinynotify-cli-9999
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c82b9539fc9fe9643e9b3ad6d32ea4be
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.17 b/metadata/md5-cache/x11-misc/util-macros-1.17
index f9b460da8eb5..ae022b477ec8 100644
--- a/metadata/md5-cache/x11-misc/util-macros-1.17
+++ b/metadata/md5-cache/x11-misc/util-macros-1.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 ) virtual/pkgconfig
 DESCRIPTION=X.Org autotools utility macros
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~a
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/util-macros-1.17.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5ab9e3797cd9194117fba1660ba715dd
diff --git a/metadata/md5-cache/x11-misc/wbar-2.2.2 b/metadata/md5-cache/x11-misc/wbar-2.2.2
index 31e2cc7ebdb8..3b2b7d4d5a75 100644
--- a/metadata/md5-cache/x11-misc/wbar-2.2.2
+++ b/metadata/md5-cache/x11-misc/wbar-2.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fast, lightweight quick launch bar.
 EAPI=4
 HOMEPAGE=http://code.google.com/p/wbar/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://wbar.googlecode.com/files/wbar-2.2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f378f108a1597cf42d85004f003d5699
diff --git a/metadata/md5-cache/x11-misc/wbar-2.3.1 b/metadata/md5-cache/x11-misc/wbar-2.3.1
index 42fcefaa13ee..fb45a8049bf0 100644
--- a/metadata/md5-cache/x11-misc/wbar-2.3.1
+++ b/metadata/md5-cache/x11-misc/wbar-2.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=media-libs/imlib2[X] virtual/init x11-libs/libX11 gtk? ( gnome-base/libglade media-libs/freetype:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/imlib2[X] virtual/init x11-libs/libX11 gtk? ( gnome-base/libglade media-libs/freetype:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fast, lightweight quick launch bar
 EAPI=4
 HOMEPAGE=http://code.google.com/p/wbar/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/imlib2[X] virtual/init x11-libs/libX11 gtk? ( gnome-base/libglade media-libs/freetype:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=http://wbar.googlecode.com/files/wbar-2.3.1.orig.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dd725c1538be1c4d0118920d72887de0
diff --git a/metadata/md5-cache/x11-misc/wbar-2.3.3 b/metadata/md5-cache/x11-misc/wbar-2.3.3
index 589559c54ac0..4003fab8b75a 100644
--- a/metadata/md5-cache/x11-misc/wbar-2.3.3
+++ b/metadata/md5-cache/x11-misc/wbar-2.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=media-libs/imlib2[X] virtual/init x11-libs/libX11 gtk? ( gnome-base/libglade media-libs/freetype:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/imlib2[X] virtual/init x11-libs/libX11 gtk? ( gnome-base/libglade media-libs/freetype:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fast, lightweight quick launch bar
 EAPI=4
 HOMEPAGE=http://code.google.com/p/wbar/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/imlib2[X] virtual/init x11-libs/libX11 gtk? ( gnome-base/libglade media-libs/freetype:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=http://wbar.googlecode.com/files/wbar-2.3.3.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f06e0f029e8537b71305322701114711
diff --git a/metadata/md5-cache/x11-misc/wbar-2.3.4-r1 b/metadata/md5-cache/x11-misc/wbar-2.3.4-r1
index 070eceb0028c..4239a8d86e41 100644
--- a/metadata/md5-cache/x11-misc/wbar-2.3.4-r1
+++ b/metadata/md5-cache/x11-misc/wbar-2.3.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst prepare
-DEPEND=media-libs/imlib2[X] virtual/init x11-libs/libX11 gtk? ( gnome-base/libglade media-libs/freetype:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/imlib2[X] virtual/init x11-libs/libX11 gtk? ( gnome-base/libglade media-libs/freetype:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A fast, lightweight quick launch bar
 EAPI=4
 HOMEPAGE=http://code.google.com/p/wbar/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/imlib2[X] virtual/init x11-libs/libX11 gtk? ( gnome-base/libglade media-libs/freetype:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=http://wbar.googlecode.com/files/wbar-2.3.4.tgz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dd320cca0e553857f2a92c9a9edde3b2
diff --git a/metadata/md5-cache/x11-misc/xaos-3.5-r1 b/metadata/md5-cache/x11-misc/xaos-3.5-r1
index b740a7b0c577..2df806015b13 100644
--- a/metadata/md5-cache/x11-misc/xaos-3.5-r1
+++ b/metadata/md5-cache/x11-misc/xaos-3.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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 ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-texinfo ) X? ( x11-proto/xf86vidmodeproto x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-texinfo ) X? ( x11-proto/xf86vidmodeproto x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A very fast real-time fractal zoomer
 EAPI=4
 HOMEPAGE=http://xaos.sf.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/xaos.png.tar mirror://sourceforge/xaos/xaos-3.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4ab000f558da3024eff4e7f778a13cc1
diff --git a/metadata/md5-cache/x11-misc/xaos-3.5-r2 b/metadata/md5-cache/x11-misc/xaos-3.5-r2
index 2f8d82c2349b..27ac03f1c4a9 100644
--- a/metadata/md5-cache/x11-misc/xaos-3.5-r2
+++ b/metadata/md5-cache/x11-misc/xaos-3.5-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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 ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-texinfo ) X? ( x11-proto/xf86vidmodeproto x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-texinfo ) X? ( x11-proto/xf86vidmodeproto x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A very fast real-time fractal zoomer
 EAPI=4
 HOMEPAGE=http://xaos.sf.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/xaos.png.tar mirror://sourceforge/xaos/xaos-3.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3e3581bb37b6071da86bd1c4643d4043
diff --git a/metadata/md5-cache/x11-misc/xbitmaps-1.1.1 b/metadata/md5-cache/x11-misc/xbitmaps-1.1.1
index e144eb924899..cdd169343481 100644
--- a/metadata/md5-cache/x11-misc/xbitmaps-1.1.1
+++ b/metadata/md5-cache/x11-misc/xbitmaps-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org bitmaps data
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~a
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xbitmaps-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d424eeb18c9483c782570fe00dc4054f
diff --git a/metadata/md5-cache/x11-misc/xcave-2.3.2 b/metadata/md5-cache/x11-misc/xcave-2.3.2
index 9e049ad74ef8..5004cfc0a30a 100644
--- a/metadata/md5-cache/x11-misc/xcave-2.3.2
+++ b/metadata/md5-cache/x11-misc/xcave-2.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=x11-libs/gtk+-2.8:2 >=gnome-base/libglade-2.6 dev-libs/libxml2 virtual/pkgconfig sys-devel/gettext dev-util/intltool || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.8:2 >=gnome-base/libglade-2.6 dev-libs/libxml2 virtual/pkgconfig sys-devel/gettext dev-util/intltool || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=View and manage contents of your wine cellar
 EAPI=2
 HOMEPAGE=http://xcave.free.fr/index-en.php
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.8:2 >=gnome-base/libglade-2.6 dev-libs/libxml2
 SLOT=0
 SRC_URI=http://xcave.free.fr/backbone.php?what=download/xcave-2.3.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=1463013fda9cb18fcebeed05e9bcfbc8
diff --git a/metadata/md5-cache/x11-misc/xcave-2.4.0 b/metadata/md5-cache/x11-misc/xcave-2.4.0
index 038526ce3eeb..ff3bc9621d8a 100644
--- a/metadata/md5-cache/x11-misc/xcave-2.4.0
+++ b/metadata/md5-cache/x11-misc/xcave-2.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=>=x11-libs/gtk+-2.8:2 dev-libs/libxml2 virtual/pkgconfig sys-devel/gettext dev-util/intltool || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.8:2 dev-libs/libxml2 virtual/pkgconfig sys-devel/gettext dev-util/intltool || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=View and manage contents of your wine cellar
 EAPI=4
 HOMEPAGE=http://xcave.free.fr/index-en.php
@@ -9,5 +9,5 @@ RDEPEND=>=x11-libs/gtk+-2.8:2 dev-libs/libxml2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://xcave.free.fr/backbone.php?what=download/xcave-2.4.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=2568515c504fd6b041e251468ed439cb
diff --git a/metadata/md5-cache/x11-misc/xcompmgr-1.1.5 b/metadata/md5-cache/x11-misc/xcompmgr-1.1.5
index 9c2ee3b99733..750640e8cd6b 100644
--- a/metadata/md5-cache/x11-misc/xcompmgr-1.1.5
+++ b/metadata/md5-cache/x11-misc/xcompmgr-1.1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=x11-libs/libXrender x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXcomposite || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=x11-libs/libXrender x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXcomposite || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=X Compositing manager
 HOMEPAGE=http://freedesktop.org/Software/xapps
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=x11-libs/libXrender x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXcomposite !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcompmgr-1.1.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=4d26de9dee64d707717388df5ea189c7
diff --git a/metadata/md5-cache/x11-misc/xcompmgr-1.1.6 b/metadata/md5-cache/x11-misc/xcompmgr-1.1.6
index 4e5b20b0bf92..da21788be33f 100644
--- a/metadata/md5-cache/x11-misc/xcompmgr-1.1.6
+++ b/metadata/md5-cache/x11-misc/xcompmgr-1.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXrender x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXcomposite || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libXrender x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXcomposite || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X Compositing manager
 EAPI=4
 HOMEPAGE=http://freedesktop.org/Software/xapps
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=x11-libs/libXrender x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXcomposite
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcompmgr-1.1.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7ce4ff960b1dd89b23b8a137e85c6d3a
diff --git a/metadata/md5-cache/x11-misc/xdg-user-dirs-0.14 b/metadata/md5-cache/x11-misc/xdg-user-dirs-0.14
index 1aa52ecd9817..e681aad99abc 100644
--- a/metadata/md5-cache/x11-misc/xdg-user-dirs-0.14
+++ b/metadata/md5-cache/x11-misc/xdg-user-dirs-0.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A tool to help manage 'well known' user directories
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/xdg-user-dirs
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PDEPEND=gtk? ( nls? ( x11-misc/xdg-user-dirs-gtk ) )
 SLOT=0
 SRC_URI=http://user-dirs.freedesktop.org/releases/xdg-user-dirs-0.14.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aa73e1159539c11fc875ff4fe1a9c63e
diff --git a/metadata/md5-cache/x11-misc/xdialog-2.3.1 b/metadata/md5-cache/x11-misc/xdialog-2.3.1
index 18db83e47776..83984584790f 100644
--- a/metadata/md5-cache/x11-misc/xdialog-2.3.1
+++ b/metadata/md5-cache/x11-misc/xdialog-2.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/gtk+-2.2:2 virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.2:2 virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=drop-in replacement for cdialog using GTK
 EAPI=2
 HOMEPAGE=http://xdialog.free.fr/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.2:2
 SLOT=0
 SRC_URI=http://xdialog.free.fr/Xdialog-2.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=379a47b4ce7d891a785ee04a535ae2b1
diff --git a/metadata/md5-cache/x11-misc/xdiskusage-1.48_p20111016 b/metadata/md5-cache/x11-misc/xdiskusage-1.48_p20111016
index c00a65d953b8..f86177e2651a 100644
--- a/metadata/md5-cache/x11-misc/xdiskusage-1.48_p20111016
+++ b/metadata/md5-cache/x11-misc/xdiskusage-1.48_p20111016
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=>=x11-libs/fltk-1.3:1 app-arch/xz-utils || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/fltk-1.3:1 app-arch/xz-utils || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=front end to xdu for viewing disk usage graphically under X11
 EAPI=4
 HOMEPAGE=http://xdiskusage.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/fltk-1.3:1
 SLOT=0
 SRC_URI=mirror://gentoo/xdiskusage-1.48_p20111016.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=bcdeca35f52d941d7be7e4205d09bf9d
diff --git a/metadata/md5-cache/x11-misc/xdock-0.2.0 b/metadata/md5-cache/x11-misc/xdock-0.2.0
index f32b390305d3..6db378f129a1 100644
--- a/metadata/md5-cache/x11-misc/xdock-0.2.0
+++ b/metadata/md5-cache/x11-misc/xdock-0.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11 media-libs/imlib || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 media-libs/imlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=emulates Window Maker docks (runs in any window manager)
 EAPI=2
 HOMEPAGE=http://xdock.sourceforge.net
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 media-libs/imlib
 SLOT=0
 SRC_URI=mirror://sourceforge/xdock/xdock-0.2.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0c57e5a24aad7146488d449c7afd37fb
diff --git a/metadata/md5-cache/x11-misc/xdock-0.3.0 b/metadata/md5-cache/x11-misc/xdock-0.3.0
index 4ad07be94fce..30903e3df204 100644
--- a/metadata/md5-cache/x11-misc/xdock-0.3.0
+++ b/metadata/md5-cache/x11-misc/xdock-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=emulates Window Maker docks (runs in any window manager)
 EAPI=4
 HOMEPAGE=http://xdock.sourceforge.net
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://sourceforge/xdock/xdock-0.3.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6f4f5cc2b3b1a8ab94ab7efad206a031
diff --git a/metadata/md5-cache/x11-misc/xfe-1.33-r1 b/metadata/md5-cache/x11-misc/xfe-1.33-r1
index eb14636ab083..07854ff9ff15 100644
--- a/metadata/md5-cache/x11-misc/xfe-1.33-r1
+++ b/metadata/md5-cache/x11-misc/xfe-1.33-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=media-libs/libpng:0 x11-libs/fox:1.6[truetype,png] x11-libs/libX11 x11-libs/libXft startup-notification? ( x11-libs/startup-notification ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libpng:0 x11-libs/fox:1.6[truetype,png] x11-libs/libX11 x11-libs/libXft startup-notification? ( x11-libs/startup-notification ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MS-Explorer-like minimalist file manager for X
 EAPI=5
 HOMEPAGE=http://roland65.free.fr/xfe
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0 x11-libs/fox:1.6[truetype,png] x11-libs/libX11 x11-libs/libXft startup-notification? ( x11-libs/startup-notification )
 SLOT=0
 SRC_URI=mirror://sourceforge/xfe/xfe/1.33/xfe-1.33.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=369ad4f63b97321c529d2e5771816629
diff --git a/metadata/md5-cache/x11-misc/xfe-1.34 b/metadata/md5-cache/x11-misc/xfe-1.34
index 92355c8f133c..4b0aa339bc9a 100644
--- a/metadata/md5-cache/x11-misc/xfe-1.34
+++ b/metadata/md5-cache/x11-misc/xfe-1.34
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=media-libs/libpng:0 x11-libs/fox:1.6[truetype,png] x11-libs/libX11 x11-libs/libXft startup-notification? ( x11-libs/startup-notification ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/libpng:0 x11-libs/fox:1.6[truetype,png] x11-libs/libX11 x11-libs/libXft startup-notification? ( x11-libs/startup-notification ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MS-Explorer-like minimalist file manager for X
 EAPI=5
 HOMEPAGE=http://roland65.free.fr/xfe
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0 x11-libs/fox:1.6[truetype,png] x11-libs/libX11 x11-libs/libXft startup-notification? ( x11-libs/startup-notification )
 SLOT=0
 SRC_URI=mirror://sourceforge/xfe/xfe/1.34/xfe-1.34.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a9e518aa702cab47e1a0be609026acbc
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.6 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.6
index e2d40b235224..493d3e7dd967 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.6
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-apps/xkbcomp-1.2.3 >=x11-libs/libX11-1.4.3 dev-util/intltool >=x11-proto/xproto-7.0.20 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-apps/xkbcomp-1.2.3 >=x11-libs/libX11-1.4.3 dev-util/intltool >=x11-proto/xproto-7.0.20 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X keyboard configuration database
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-apps/xkbcomp-1.2.3 >=x11-libs/libX11-1.4.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=c05132d8b1d4bff0f39dcacee00498fd
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.7 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.7
index 1f82e3e189d8..fd97b5b2f922 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.7
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-apps/xkbcomp-1.2.3 >=x11-libs/libX11-1.4.3 dev-util/intltool >=x11-proto/xproto-7.0.20 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-apps/xkbcomp-1.2.3 >=x11-libs/libX11-1.4.3 dev-util/intltool >=x11-proto/xproto-7.0.20 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X keyboard configuration database
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-apps/xkbcomp-1.2.3 >=x11-libs/libX11-1.4.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=50ab80ecd4d1552a2b5432ab3c744b9e
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.8 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.8
index 6c17a544355d..fffafbbc2224 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.8
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-apps/xkbcomp-1.2.3 >=x11-libs/libX11-1.4.3 dev-util/intltool >=x11-proto/xproto-7.0.20 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-apps/xkbcomp-1.2.3 >=x11-libs/libX11-1.4.3 dev-util/intltool >=x11-proto/xproto-7.0.20 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X keyboard configuration database
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-apps/xkbcomp-1.2.3 >=x11-libs/libX11-1.4.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=848e29433ffb8c2a7dbd457efe714ae2
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.41 b/metadata/md5-cache/x11-misc/xlockmore-5.41
index 936549f69a45..b9d4fdbfd5c0 100644
--- a/metadata/md5-cache/x11-misc/xlockmore-5.41
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.41
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-proto/xineramaproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-proto/xineramaproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Just another screensaver application for X
 EAPI=4
 HOMEPAGE=http://www.tux.org/~bagleyd/xlockmore.html
@@ -10,5 +10,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick ) motif? (
 REQUIRED_USE=|| ( crypt pam )
 SLOT=0
 SRC_URI=http://ftp.tux.org/pub/tux/bagleyd/xlockmore/xlockmore-5.41/xlockmore-5.41.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a2cb1b3ac1555ccff6a71c2f87f46064
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.42 b/metadata/md5-cache/x11-misc/xlockmore-5.42
index cb9dc3a62996..1ffd84c7f7fe 100644
--- a/metadata/md5-cache/x11-misc/xlockmore-5.42
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.42
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-proto/xineramaproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-proto/xineramaproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Just another screensaver application for X
 EAPI=4
 HOMEPAGE=http://www.tux.org/~bagleyd/xlockmore.html
@@ -10,5 +10,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick ) motif? (
 REQUIRED_USE=|| ( crypt pam )
 SLOT=0
 SRC_URI=http://ftp.tux.org/pub/tux/bagleyd/xlockmore/xlockmore-5.42/xlockmore-5.42.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e4ba05b06b5583eaa0873e68455f5ed7
diff --git a/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.4 b/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.4
index 3282dd735863..b6638d51ae08 100644
--- a/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.4
+++ b/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=Old Imake-related build files
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=cf150e4e39a9530acf8e5f64e0787533
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.15 b/metadata/md5-cache/x11-misc/xscreensaver-5.15
index c79b89102895..412fd2fcd65f 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.15
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 ) selinux? ( sec-policy/selinux-xscreensaver ) xinerama? ( x11-libs/libXinerama ) dev-util/intltool virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 ) selinux? ( sec-policy/selinux-xscreensaver ) xinerama? ( x11-libs/libXinerama ) dev-util/intltool virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A modular screen saver and locker for the X Window System
 EAPI=4
 HOMEPAGE=http://www.jwz.org/xscreensaver/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libxml2 >=gnome-base/libglade-2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg ) new-login? ( || ( x11-misc/lightdm gnome-base/gdm kde-base/kdm ) ) opengl? ( virtual/opengl ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-xscreensaver ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 )
 SLOT=0
 SRC_URI=http://www.jwz.org/xscreensaver/xscreensaver-5.15.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=873b8981dc897ae66463e6d4f2ee8143
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.20 b/metadata/md5-cache/x11-misc/xscreensaver-5.20
index c714201fe9b4..63174f8377ca 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.20
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm kde-base/kdm ) ) ) opengl? ( virtual/opengl ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-xscreensaver ) xinerama? ( x11-libs/libXinerama ) dev-util/intltool virtual/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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm kde-base/kdm ) ) ) opengl? ( virtual/opengl ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-xscreensaver ) xinerama? ( x11-libs/libXinerama ) dev-util/intltool virtual/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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A modular screen saver and locker for the X Window System
 EAPI=4
 HOMEPAGE=http://www.jwz.org/xscreensaver/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libxml2 >=gnome-base/libglade-2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm kde-base/kdm ) ) ) opengl? ( virtual/opengl ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-xscreensaver ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 )
 SLOT=0
 SRC_URI=http://www.jwz.org/xscreensaver/xscreensaver-5.20.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0faf2266faf19e19042669c83f4075d5
diff --git a/metadata/md5-cache/x11-misc/xsensors-0.70 b/metadata/md5-cache/x11-misc/xsensors-0.70
index 2d0cc3eba0a5..afa8016d9689 100644
--- a/metadata/md5-cache/x11-misc/xsensors-0.70
+++ b/metadata/md5-cache/x11-misc/xsensors-0.70
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/gtk+:2 >=sys-apps/lm_sensors-3 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 >=sys-apps/lm_sensors-3 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A hardware health information viewer, interface to lm-sensors.
 EAPI=2
 HOMEPAGE=http://www.linuxhardware.org/xsensors/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 >=sys-apps/lm_sensors-3
 SLOT=0
 SRC_URI=http://www.linuxhardware.org/xsensors/xsensors-0.70.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1b6de91fdb3ea90ee4a496ba67a25d6c
diff --git a/metadata/md5-cache/x11-misc/xsri-2.1.0-r1 b/metadata/md5-cache/x11-misc/xsri-2.1.0-r1
index 9558c3c1d004..90cc06d9b54e 100644
--- a/metadata/md5-cache/x11-misc/xsri-2.1.0-r1
+++ b/metadata/md5-cache/x11-misc/xsri-2.1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare unpack
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-arch/rpm2targz-9.0.0.3g
+DEPEND=x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=The xsri wallpaper setter from RedHat
 EAPI=2
 HOMEPAGE=http://fedora.redhat.com/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://fedora/5/source/SRPMS/xsri-2.1.0-9.2.1.src.rpm
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=634431aa6313ba87d6cfbcf3c7cbaf6d
diff --git a/metadata/md5-cache/x11-misc/xsri-2.1.0-r2 b/metadata/md5-cache/x11-misc/xsri-2.1.0-r2
index b592954e615d..588006b27ef8 100644
--- a/metadata/md5-cache/x11-misc/xsri-2.1.0-r2
+++ b/metadata/md5-cache/x11-misc/xsri-2.1.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare unpack
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-arch/rpm2targz-9.0.0.3g
+DEPEND=x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=The xsri wallpaper setter from RedHat
 EAPI=4
 HOMEPAGE=http://fedoraproject.org
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://download.fedoraproject.org/pub/fedora/linux/releases/15/Everything/source/SRPMS/xsri-2.1.0-17.fc12.src.rpm
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5801c8851a788ea6dcc6ec9191daeab1
diff --git a/metadata/md5-cache/x11-misc/xstroke-0.6-r1 b/metadata/md5-cache/x11-misc/xstroke-0.6-r1
index ba2ad0c558b0..47467fece186 100644
--- a/metadata/md5-cache/x11-misc/xstroke-0.6-r1
+++ b/metadata/md5-cache/x11-misc/xstroke-0.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXtst sys-devel/flex virtual/pkgconfig virtual/yacc x11-proto/inputproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXtst sys-devel/flex virtual/pkgconfig virtual/yacc x11-proto/inputproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Gesture/Handwriting recognition engine for X
 EAPI=4
 HOMEPAGE=http://freshmeat.net/projects/xstroke/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXtst
 SLOT=0
 SRC_URI=mirror://gentoo/xstroke-0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9741b0c9c89fdef6882905c5dc18c2aa
diff --git a/metadata/md5-cache/x11-misc/xteddy-2.2 b/metadata/md5-cache/x11-misc/xteddy-2.2
index 54543a19a477..f7a24d65605d 100644
--- a/metadata/md5-cache/x11-misc/xteddy-2.2
+++ b/metadata/md5-cache/x11-misc/xteddy-2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=media-libs/imlib2[X,png] x11-libs/libX11 x11-libs/libXext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=media-libs/imlib2[X,png] x11-libs/libX11 x11-libs/libXext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A cuddly teddy bear (or other image) for your X desktop
 EAPI=4
 HOMEPAGE=http://webstaff.itn.liu.se/~stegu/xteddy/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/imlib2[X,png] x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=http://webstaff.itn.liu.se/~stegu/xteddy/xteddy-2.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=5d359b33d88a2ff94e27647f45f91d8d
diff --git a/metadata/md5-cache/x11-misc/xtrace-1.3.0 b/metadata/md5-cache/x11-misc/xtrace-1.3.0
index d67cd9a7bcb7..fbf5783ff335 100644
--- a/metadata/md5-cache/x11-misc/xtrace-1.3.0
+++ b/metadata/md5-cache/x11-misc/xtrace-1.3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://alioth.debian.org/frs/download.php/3694/xtrace_1.3.0.orig.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c7b5c0ae00dd3af47c3f444142f73e0e
diff --git a/metadata/md5-cache/x11-misc/xtscal-0.6.3 b/metadata/md5-cache/x11-misc/xtscal-0.6.3
index 8f33991f4e95..c664d7903605 100644
--- a/metadata/md5-cache/x11-misc/xtscal-0.6.3
+++ b/metadata/md5-cache/x11-misc/xtscal-0.6.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=x11-libs/libX11 x11-proto/xcalibrateproto x11-libs/libXCalibrate || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 x11-proto/xcalibrateproto x11-libs/libXCalibrate || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Touchscreen calibration utility
 HOMEPAGE=http://gpe.linuxtogo.org/
 KEYWORDS=alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://gpe.linuxtogo.org/download/source/xtscal-0.6.3.tar.bz2 mirror://gentoo/xtscal-0.6.3-patches-0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9947bcf3e5ce1b6ae08b34d9bcfe80c6
diff --git a/metadata/md5-cache/x11-plugins/compiz-plugins-extra-0.8.8 b/metadata/md5-cache/x11-plugins/compiz-plugins-extra-0.8.8
index 2c0070b09df9..9a06300b3e1d 100644
--- a/metadata/md5-cache/x11-plugins/compiz-plugins-extra-0.8.8
+++ b/metadata/md5-cache/x11-plugins/compiz-plugins-extra-0.8.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=>=gnome-base/librsvg-2.14.0:2 virtual/jpeg:0 >=x11-libs/compiz-bcop-0.8.8 >=x11-plugins/compiz-plugins-main-0.8.8 >=x11-wm/compiz-0.8.8[gconf?] libnotify? ( x11-libs/libnotify ) >=dev-util/intltool-0.35 virtual/pkgconfig >=sys-devel/gettext-0.15 x11-libs/cairo gconf? ( gnome-base/gconf:2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=gnome-base/librsvg-2.14.0:2 virtual/jpeg:0 >=x11-libs/compiz-bcop-0.8.8 >=x11-plugins/compiz-plugins-main-0.8.8 >=x11-wm/compiz-0.8.8[gconf?] libnotify? ( x11-libs/libnotify ) >=dev-util/intltool-0.35 virtual/pkgconfig >=sys-devel/gettext-0.15 x11-libs/cairo gconf? ( gnome-base/gconf:2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Compiz Fusion Window Decorator Extra Plugins
 EAPI=4
 HOMEPAGE=http://www.compiz.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnome-base/librsvg-2.14.0:2 virtual/jpeg:0 >=x11-libs/compiz-bcop-0.8.8 >=x11-plugins/compiz-plugins-main-0.8.8 >=x11-wm/compiz-0.8.8[gconf?] libnotify? ( x11-libs/libnotify )
 SLOT=0
 SRC_URI=http://releases.compiz.org/0.8.8/compiz-plugins-extra-0.8.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cde936124439b4829acf9b585f53cd04
diff --git a/metadata/md5-cache/x11-plugins/compiz-plugins-main-0.8.8 b/metadata/md5-cache/x11-plugins/compiz-plugins-main-0.8.8
index 3a73fc52d1e2..da69bfa57ec9 100644
--- a/metadata/md5-cache/x11-plugins/compiz-plugins-main-0.8.8
+++ b/metadata/md5-cache/x11-plugins/compiz-plugins-main-0.8.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=>=gnome-base/librsvg-2.14.0:2 x11-libs/cairo >=x11-libs/compiz-bcop-0.8.8 >=x11-wm/compiz-0.8.8[gconf?] virtual/jpeg:0 virtual/glu >=dev-util/intltool-0.35 virtual/pkgconfig >=sys-devel/gettext-0.15 gconf? ( gnome-base/gconf:2 ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=gnome-base/librsvg-2.14.0:2 x11-libs/cairo >=x11-libs/compiz-bcop-0.8.8 >=x11-wm/compiz-0.8.8[gconf?] virtual/jpeg:0 virtual/glu >=dev-util/intltool-0.35 virtual/pkgconfig >=sys-devel/gettext-0.15 gconf? ( gnome-base/gconf:2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Compiz Fusion Window Decorator Plugins
 EAPI=4
 HOMEPAGE=http://www.compiz.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnome-base/librsvg-2.14.0:2 x11-libs/cairo >=x11-libs/compiz-bcop-0.8.8 >=x11-wm/compiz-0.8.8[gconf?] virtual/jpeg:0 virtual/glu
 SLOT=0
 SRC_URI=http://releases.compiz.org/0.8.8/compiz-plugins-main-0.8.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3b476ca07a8b0778a774631f407321a3
diff --git a/metadata/md5-cache/x11-plugins/fsviewer-0.2.6 b/metadata/md5-cache/x11-plugins/fsviewer-0.2.6
index 46af8b570628..57f44371c9eb 100644
--- a/metadata/md5-cache/x11-plugins/fsviewer-0.2.6
+++ b/metadata/md5-cache/x11-plugins/fsviewer-0.2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-wm/windowmaker-0.95.2 x11-libs/libXft x11-libs/libXpm x11-libs/libX11 x11-proto/xproto nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-wm/windowmaker-0.95.2 x11-libs/libXft x11-libs/libXpm x11-libs/libX11 x11-proto/xproto nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A file system viewer for Window Maker
 EAPI=4
 HOMEPAGE=http://www.bayernline.de/~gscholz/linux/fsviewer/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-wm/windowmaker-0.95.2 x11-libs/libXft x11-libs/libXpm x11-libs/libX11
 SLOT=0
 SRC_URI=http://www.bayernline.de/~gscholz/linux/fsviewer/fsviewer-app-0.2.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=229bea87786ca7edfad03abe2b365a32
diff --git a/metadata/md5-cache/x11-plugins/matchbox-desktop-image-browser-0.2 b/metadata/md5-cache/x11-plugins/matchbox-desktop-image-browser-0.2
index 2ef5258cb873..063543018313 100644
--- a/metadata/md5-cache/x11-plugins/matchbox-desktop-image-browser-0.2
+++ b/metadata/md5-cache/x11-plugins/matchbox-desktop-image-browser-0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=x11-libs/libmatchbox-1.1 x11-wm/matchbox-desktop || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/libmatchbox-1.1 x11-wm/matchbox-desktop || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An alpha-ish image browser plug in for matchbox-desktop.
 HOMEPAGE=http://matchbox-project.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/libmatchbox-1.1
 SLOT=0
 SRC_URI=http://matchbox-project.org/sources/mb-desktop-image-browser/0.2/mb-desktop-image-browser-0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fe102b4855f7f1421e4689fcd4bf081a
diff --git a/metadata/md5-cache/x11-plugins/matchbox-desktop-image-browser-0.2-r1 b/metadata/md5-cache/x11-plugins/matchbox-desktop-image-browser-0.2-r1
index 66c213f0bfdf..ff2736aa3f74 100644
--- a/metadata/md5-cache/x11-plugins/matchbox-desktop-image-browser-0.2-r1
+++ b/metadata/md5-cache/x11-plugins/matchbox-desktop-image-browser-0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=x11-libs/libmatchbox-1.1 x11-wm/matchbox-desktop || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/libmatchbox-1.1 x11-wm/matchbox-desktop || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An alpha-ish image browser plug in for matchbox-desktop.
 HOMEPAGE=http://matchbox-project.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/libmatchbox-1.1
 SLOT=0
 SRC_URI=http://matchbox-project.org/sources/mb-desktop-image-browser/0.2/mb-desktop-image-browser-0.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=abc46570e0d7c7f196e2a9530c5027f0
diff --git a/metadata/md5-cache/x11-plugins/matchbox-desktop-xine-0.4 b/metadata/md5-cache/x11-plugins/matchbox-desktop-xine-0.4
index 5f7543f0b2ea..81469c2b00c4 100644
--- a/metadata/md5-cache/x11-plugins/matchbox-desktop-xine-0.4
+++ b/metadata/md5-cache/x11-plugins/matchbox-desktop-xine-0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=x11-libs/libmatchbox-1.1 x11-wm/matchbox-desktop >=media-libs/xine-lib-1.0.0 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/libmatchbox-1.1 x11-wm/matchbox-desktop >=media-libs/xine-lib-1.0.0 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A matchbox-desktop plugin that allows you to browse and play media.
 HOMEPAGE=http://matchbox-project.org/
 IUSE=debug
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/libmatchbox-1.1 x11-wm/matchbox-desktop >=media-libs/xine-lib-1.0.0
 SLOT=0
 SRC_URI=http://matchbox-project.org/sources/mb-desktop-xine/0.4/mb-desktop-xine-0.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3831867ff1224cf295a1e41c3c548abc
diff --git a/metadata/md5-cache/x11-plugins/mountapp-3.1 b/metadata/md5-cache/x11-plugins/mountapp-3.1
index de641408a491..b38acc7d347b 100644
--- a/metadata/md5-cache/x11-plugins/mountapp-3.1
+++ b/metadata/md5-cache/x11-plugins/mountapp-3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND==x11-libs/gtk+-1.2* x11-libs/libX11 >=x11-libs/libXpm-3.5.7 >=x11-wm/windowmaker-0.95 x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==x11-libs/gtk+-1.2* x11-libs/libX11 >=x11-libs/libXpm-3.5.7 >=x11-wm/windowmaker-0.95 x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=mount filesystems via an easy-to-use windowmaker applet
 EAPI=4
 HOMEPAGE=http://mountapp.sourceforge.net
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==x11-libs/gtk+-1.2* x11-libs/libX11 >=x11-libs/libXpm-3.5.7 >=x11-wm/windowmaker-0.95
 SLOT=0
 SRC_URI=http://mountapp.sourceforge.net/mountapp-3.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=69a203920c43e435dc16b53ad4a021e3
diff --git a/metadata/md5-cache/x11-plugins/pidgin-musictracker-0.4.21-r1 b/metadata/md5-cache/x11-plugins/pidgin-musictracker-0.4.21-r1
index 091c65dddc32..3ceb238a874f 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-musictracker-0.4.21-r1
+++ b/metadata/md5-cache/x11-plugins/pidgin-musictracker-0.4.21-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=net-im/pidgin-2.0.0 >=dev-libs/dbus-glib-0.73 dev-libs/libpcre >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-im/pidgin-2.0.0 >=dev-libs/dbus-glib-0.73 dev-libs/libpcre >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Pidgin now playing plugin to publicise the songs you are listening to in your status message
 EAPI=2
 HOMEPAGE=http://code.google.com/p/pidgin-musictracker/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-im/pidgin-2.0.0 >=dev-libs/dbus-glib-0.73 dev-libs/libpcre >=sys-devel/gettext-0.17
 SLOT=0
 SRC_URI=http://pidgin-musictracker.googlecode.com/files/pidgin-musictracker-0.4.21.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=4c2849190a16067e4e7cc55eb07e0966
diff --git a/metadata/md5-cache/x11-plugins/pidgin-musictracker-0.4.22 b/metadata/md5-cache/x11-plugins/pidgin-musictracker-0.4.22
index 5030558b543a..f67f1d37e31f 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-musictracker-0.4.22
+++ b/metadata/md5-cache/x11-plugins/pidgin-musictracker-0.4.22
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Pidgin now playing plugin to publicise the songs you are listening to in your status message
 EAPI=2
 HOMEPAGE=http://code.google.com/p/pidgin-musictracker/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-im/pidgin-2.0.0[gtk] >=dev-libs/dbus-glib-0.73 dev-libs/libpcre >=sys-devel/gettext-0.17
 SLOT=0
 SRC_URI=http://pidgin-musictracker.googlecode.com/files/pidgin-musictracker-0.4.22.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=a1f4334b81d08207c51f8a38baae5272
diff --git a/metadata/md5-cache/x11-plugins/pidgin-privacy-please-0.6.4 b/metadata/md5-cache/x11-plugins/pidgin-privacy-please-0.6.4
index 83f3319dc6dc..673361afc67b 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-privacy-please-0.6.4
+++ b/metadata/md5-cache/x11-plugins/pidgin-privacy-please-0.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=<net-im/pidgin-3[gtk] virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=<net-im/pidgin-3[gtk] virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=pidgin plugin to stop spammers from annoying you
 EAPI=2
 HOMEPAGE=http://code.google.com/p/pidgin-privacy-please/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=<net-im/pidgin-3[gtk]
 SLOT=0
 SRC_URI=http://pidgin-privacy-please.googlecode.com/files/pidgin-privacy-please-0.6.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=4848243ce73322377750dd910244b88b
diff --git a/metadata/md5-cache/x11-plugins/pidgin-privacy-please-0.7.1 b/metadata/md5-cache/x11-plugins/pidgin-privacy-please-0.7.1
index 87724fcbd2de..acee0aac97da 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-privacy-please-0.7.1
+++ b/metadata/md5-cache/x11-plugins/pidgin-privacy-please-0.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=<net-im/pidgin-3[gtk] virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=<net-im/pidgin-3[gtk] virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=pidgin plugin to stop spammers from annoying you
 EAPI=2
 HOMEPAGE=http://code.google.com/p/pidgin-privacy-please/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=<net-im/pidgin-3[gtk]
 SLOT=0
 SRC_URI=http://pidgin-privacy-please.googlecode.com/files/pidgin-privacy-please-0.7.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=edf5f1860ffa2d87c1051dd083f3b853
diff --git a/metadata/md5-cache/x11-plugins/pidgin-sipe-1.14.1 b/metadata/md5-cache/x11-plugins/pidgin-sipe-1.14.1
index cd41a9a14519..c01993c0b82d 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-sipe-1.14.1
+++ b/metadata/md5-cache/x11-plugins/pidgin-sipe-1.14.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-util/intltool virtual/pkgconfig >=dev-libs/gmime-2.4.16 dev-libs/libxml2 dev-libs/nss kerberos? ( virtual/krb5 ) voice? ( >=dev-libs/glib-2.28.0 >=net-libs/libnice-0.1.0 media-libs/gstreamer:0.10 >=net-im/pidgin-2.8.0[gnutls] ) !voice? ( >=dev-libs/glib-2.12.0 net-im/pidgin[gnutls] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-util/intltool virtual/pkgconfig >=dev-libs/gmime-2.4.16 dev-libs/libxml2 dev-libs/nss kerberos? ( virtual/krb5 ) voice? ( >=dev-libs/glib-2.28.0 >=net-libs/libnice-0.1.0 media-libs/gstreamer:0.10 >=net-im/pidgin-2.8.0[gnutls] ) !voice? ( >=dev-libs/glib-2.12.0 net-im/pidgin[gnutls] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Pidgin Plug-in SIPE (Sip Exchange Protocol)
 EAPI=5
 HOMEPAGE=http://sipe.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/gmime-2.4.16 dev-libs/libxml2 dev-libs/nss kerberos? ( virtual/krb5 ) voice? ( >=dev-libs/glib-2.28.0 >=net-libs/libnice-0.1.0 media-libs/gstreamer:0.10 >=net-im/pidgin-2.8.0[gnutls] ) !voice? ( >=dev-libs/glib-2.12.0 net-im/pidgin[gnutls] )
 SLOT=0
 SRC_URI=mirror://sourceforge/sipe/pidgin-sipe-1.14.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d4dc9aef3fb7d752221db8ad7e153f82
diff --git a/metadata/md5-cache/x11-plugins/pidgin-sipe-1.15.0 b/metadata/md5-cache/x11-plugins/pidgin-sipe-1.15.1
similarity index 80%
rename from metadata/md5-cache/x11-plugins/pidgin-sipe-1.15.0
rename to metadata/md5-cache/x11-plugins/pidgin-sipe-1.15.1
index c95762b9bd0a..18b713ee1a38 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-sipe-1.15.0
+++ b/metadata/md5-cache/x11-plugins/pidgin-sipe-1.15.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-util/intltool virtual/pkgconfig >=dev-libs/gmime-2.4.16 dev-libs/libxml2 dev-libs/nss kerberos? ( virtual/krb5 ) voice? ( >=dev-libs/glib-2.28.0 >=net-libs/libnice-0.1.0 media-libs/gstreamer:0.10 >=net-im/pidgin-2.8.0[gnutls] ) !voice? ( >=dev-libs/glib-2.12.0 net-im/pidgin[gnutls] ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-util/intltool virtual/pkgconfig >=dev-libs/gmime-2.4.16 dev-libs/libxml2 dev-libs/nss kerberos? ( virtual/krb5 ) voice? ( >=dev-libs/glib-2.28.0 >=net-libs/libnice-0.1.0 media-libs/gstreamer:0.10 >=net-im/pidgin-2.8.0[gnutls] ) !voice? ( >=dev-libs/glib-2.12.0 net-im/pidgin[gnutls] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Pidgin Plug-in SIPE (Sip Exchange Protocol)
 EAPI=5
 HOMEPAGE=http://sipe.sourceforge.net/
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/gmime-2.4.16 dev-libs/libxml2 dev-libs/nss kerberos? ( virtual/krb5 ) voice? ( >=dev-libs/glib-2.28.0 >=net-libs/libnice-0.1.0 media-libs/gstreamer:0.10 >=net-im/pidgin-2.8.0[gnutls] ) !voice? ( >=dev-libs/glib-2.12.0 net-im/pidgin[gnutls] )
 SLOT=0
-SRC_URI=mirror://sourceforge/sipe/pidgin-sipe-1.15.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=df8f9e73a34fb2c70c3a40930330db8e
+SRC_URI=mirror://sourceforge/sipe/pidgin-sipe-1.15.1.tar.gz
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=88bafa2af7e999198a1a4e4bafe35f8f
diff --git a/metadata/md5-cache/x11-plugins/wmbattery-2.40 b/metadata/md5-cache/x11-plugins/wmbattery-2.40
index 06a2e0d89ce4..3426e7bfd7c2 100644
--- a/metadata/md5-cache/x11-plugins/wmbattery-2.40
+++ b/metadata/md5-cache/x11-plugins/wmbattery-2.40
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=sys-apps/apmd x11-libs/libX11 x11-libs/libXext x11-libs/libXpm || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/apmd x11-libs/libX11 x11-libs/libXext x11-libs/libXpm || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A dockable app to report APM, ACPI, or SPIC battery status
 EAPI=3
 HOMEPAGE=http://joeyh.name/code/wmbattery/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/apmd x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=mirror://debian/pool/main/w/wmbattery/wmbattery_2.40.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=354a757aa43e2ee5beafd85569c1730b
diff --git a/metadata/md5-cache/x11-plugins/wmbattery-2.41 b/metadata/md5-cache/x11-plugins/wmbattery-2.41
index 284924725e4d..7d4193625d97 100644
--- a/metadata/md5-cache/x11-plugins/wmbattery-2.41
+++ b/metadata/md5-cache/x11-plugins/wmbattery-2.41
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=sys-apps/apmd x11-libs/libX11 x11-libs/libXext x11-libs/libXpm || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/apmd x11-libs/libX11 x11-libs/libXext x11-libs/libXpm || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A dockable app to report APM, ACPI, or SPIC battery status
 EAPI=4
 HOMEPAGE=http://joeyh.name/code/wmbattery/
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc -sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/w/wmbattery/wmbattery_2.41.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=55ef8bfec2ed21a8efcdcd8c3575f2bb
diff --git a/metadata/md5-cache/x11-plugins/wmbiff-0.4.27 b/metadata/md5-cache/x11-plugins/wmbiff-0.4.27
index d5444dfbd348..868ce7cb8987 100644
--- a/metadata/md5-cache/x11-plugins/wmbiff-0.4.27
+++ b/metadata/md5-cache/x11-plugins/wmbiff-0.4.27
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1 <net-libs/gnutls-3.0 ) virtual/pkgconfig x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1 <net-libs/gnutls-3.0 ) virtual/pkgconfig x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes.
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/wmbiff/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1 <net-libs/gnutls-3.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/wmbiff/wmbiff-0.4.27.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8789f05798b677305c2bd9097c6f588d
diff --git a/metadata/md5-cache/x11-plugins/wmbiff-0.4.27-r1 b/metadata/md5-cache/x11-plugins/wmbiff-0.4.27-r1
index 18083de4553e..3e1cb86a8bbf 100644
--- a/metadata/md5-cache/x11-plugins/wmbiff-0.4.27-r1
+++ b/metadata/md5-cache/x11-plugins/wmbiff-0.4.27-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1 >=net-libs/gnutls-1.2.3 ) virtual/pkgconfig x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1 >=net-libs/gnutls-1.2.3 ) virtual/pkgconfig x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes.
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/wmbiff/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1 >=net-libs/gnutls-1.2.3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/wmbiff/wmbiff-0.4.27.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=636eeda7994d6b304ac6e1102171bcc9
diff --git a/metadata/md5-cache/x11-plugins/wmblob-1.0.3 b/metadata/md5-cache/x11-plugins/wmblob-1.0.3
index e0e677323e51..b777660653f6 100644
--- a/metadata/md5-cache/x11-plugins/wmblob-1.0.3
+++ b/metadata/md5-cache/x11-plugins/wmblob-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXpm x11-libs/libXext virtual/pkgconfig x11-proto/xextproto x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXpm x11-libs/libXext virtual/pkgconfig x11-proto/xextproto x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a fancy but useless dockapp with moving blobs.
 EAPI=1
 HOMEPAGE=http://freshmeat.net/projects/wmblob
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXpm x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://debian/pool/main/w/wmblob/wmblob_1.0.3.orig.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=8fc710e08c9c7dc11199987cccd56f07
diff --git a/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r1 b/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r1
index 461f2e67110e..e6f739f0a1e6 100644
--- a/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r1
+++ b/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/gtk+:2 gnome-base/libgtop:2 x11-libs/libX11 x11-libs/libXext session? ( x11-libs/libSM x11-libs/libICE ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 gnome-base/libgtop:2 x11-libs/libX11 x11-libs/libXext session? ( x11-libs/libSM x11-libs/libICE ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Load monitoring dockapp displaying dancing flame.
 EAPI=2
 HOMEPAGE=http://www.swanson.ukfsn.org/#wmfire
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 gnome-base/libgtop:2 x11-libs/libX11 x11-libs/libXext session? ( x11-libs/libSM x11-libs/libICE )
 SLOT=0
 SRC_URI=http://www.swanson.ukfsn.org/wmfire/wmfire-1.2.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a3c4897ca95429b2c9e0b53c35fd312c
diff --git a/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r2 b/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r2
index 976ebd434cae..ef611ccac08b 100644
--- a/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r2
+++ b/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/gtk+:2 gnome-base/libgtop:2 x11-libs/libX11 x11-libs/libXext session? ( x11-libs/libSM x11-libs/libICE ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 gnome-base/libgtop:2 x11-libs/libX11 x11-libs/libXext session? ( x11-libs/libSM x11-libs/libICE ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Load monitoring dockapp displaying dancing flame.
 EAPI=4
 HOMEPAGE=http://www.swanson.ukfsn.org/#wmfire
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 gnome-base/libgtop:2 x11-libs/libX11 x11-libs/libXext session? ( x11-libs/libSM x11-libs/libICE )
 SLOT=0
 SRC_URI=http://www.swanson.ukfsn.org/wmfire/wmfire-1.2.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c258d395a190aa7d8f923ade14628417
diff --git a/metadata/md5-cache/x11-plugins/wmmemload-0.1.6 b/metadata/md5-cache/x11-plugins/wmmemload-0.1.6
index 136d6c776207..b471b15c7cf7 100644
--- a/metadata/md5-cache/x11-plugins/wmmemload-0.1.6
+++ b/metadata/md5-cache/x11-plugins/wmmemload-0.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-proto/xextproto x11-libs/libICE x11-libs/libXt || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-proto/xextproto x11-libs/libICE x11-libs/libXt || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=dockapp that displays memory and swap space usage.
 HOMEPAGE=http://www.markstaggs.net/wmmemload
 KEYWORDS=alpha amd64 ppc ppc64 sparc x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=http://markstaggs.net/wmmemload-download/wmmemload-0.1.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=2f6ce3cda22308a17586844b53bc636a
diff --git a/metadata/md5-cache/x11-plugins/wmmemload-0.1.6-r1 b/metadata/md5-cache/x11-plugins/wmmemload-0.1.6-r1
index 6bf3b2de6706..312c56ecd653 100644
--- a/metadata/md5-cache/x11-plugins/wmmemload-0.1.6-r1
+++ b/metadata/md5-cache/x11-plugins/wmmemload-0.1.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-proto/xextproto x11-libs/libICE x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-proto/xextproto x11-libs/libICE x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=dockapp that displays memory and swap space usage.
 EAPI=4
 HOMEPAGE=http://www.markstaggs.net/wmmemload
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=http://markstaggs.net/wmmemload-download/wmmemload-0.1.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0b3ac9b5a9b54921d00ef3529ede20d0
diff --git a/metadata/md5-cache/x11-plugins/wmmsg-1.0.1 b/metadata/md5-cache/x11-plugins/wmmsg-1.0.1
index 4861987fcf1d..679c40ae8c3a 100644
--- a/metadata/md5-cache/x11-plugins/wmmsg-1.0.1
+++ b/metadata/md5-cache/x11-plugins/wmmsg-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11 virtual/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11 virtual/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a dockapp that informs events, such as incoming chat messages, by displaying icons and times
 EAPI=1
 HOMEPAGE=http://swapspace.net/~matt/wmmsg
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11
 SLOT=0
 SRC_URI=http://swapspace.net/~matt/wmmsg/wmmsg-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ba1a28e8f5028ff7e7503ac5f74ed965
diff --git a/metadata/md5-cache/x11-plugins/wmmsg-1.0.1-r1 b/metadata/md5-cache/x11-plugins/wmmsg-1.0.1-r1
index 717a00f09021..f427a47710ba 100644
--- a/metadata/md5-cache/x11-plugins/wmmsg-1.0.1-r1
+++ b/metadata/md5-cache/x11-plugins/wmmsg-1.0.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11 virtual/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11 virtual/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a dockapp that informs events, such as incoming chat messages, by displaying icons and times
 EAPI=1
 HOMEPAGE=http://swapspace.net/~matt/wmmsg
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11
 SLOT=0
 SRC_URI=http://swapspace.net/~matt/wmmsg/wmmsg-1.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=89e94375433ffbf8037f890eb6e6b69f
diff --git a/metadata/md5-cache/x11-plugins/wmnetload-1.3-r3 b/metadata/md5-cache/x11-plugins/wmnetload-1.3-r3
index e3b3b3c0c7f9..a57d87436cf1 100644
--- a/metadata/md5-cache/x11-plugins/wmnetload-1.3-r3
+++ b/metadata/md5-cache/x11-plugins/wmnetload-1.3-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Network interface monitor dockapp
 HOMEPAGE=http://freshmeat.net/projects/wmnetload/
 KEYWORDS=amd64 ppc ppc64 x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/libdockapp-0.6.1
 SLOT=0
 SRC_URI=ftp://truffula.com/pub/wmnetload-1.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0b38b5fb577a6dc4bb8f3577bcaa75b1
diff --git a/metadata/md5-cache/x11-proto/bigreqsproto-1.1.1 b/metadata/md5-cache/x11-proto/bigreqsproto-1.1.1
index 1edb443694c6..35b7e515d143 100644
--- a/metadata/md5-cache/x11-proto/bigreqsproto-1.1.1
+++ b/metadata/md5-cache/x11-proto/bigreqsproto-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org BigReqs protocol headers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/bigreqsproto-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=f05a5e25c2172d5abf1d3dc382d9c1e8
diff --git a/metadata/md5-cache/x11-proto/bigreqsproto-1.1.2 b/metadata/md5-cache/x11-proto/bigreqsproto-1.1.2
index 808b6fbd7e70..89577e15bae0 100644
--- a/metadata/md5-cache/x11-proto/bigreqsproto-1.1.2
+++ b/metadata/md5-cache/x11-proto/bigreqsproto-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org BigReqs protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~a
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/bigreqsproto-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=ee5c416e7f41436f8753091332f6dcc4
diff --git a/metadata/md5-cache/x11-proto/compositeproto-0.4.2 b/metadata/md5-cache/x11-proto/compositeproto-0.4.2
index 69e51f056bc4..f0213e2f7abc 100644
--- a/metadata/md5-cache/x11-proto/compositeproto-0.4.2
+++ b/metadata/md5-cache/x11-proto/compositeproto-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Composite protocol headers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/compositeproto-0.4.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=15ae1f353f88e548d436f100c0fca9a2
diff --git a/metadata/md5-cache/x11-proto/compositeproto-0.4.2-r1 b/metadata/md5-cache/x11-proto/compositeproto-0.4.2-r1
index 0fde99309a9d..a90a767567ec 100644
--- a/metadata/md5-cache/x11-proto/compositeproto-0.4.2-r1
+++ b/metadata/md5-cache/x11-proto/compositeproto-0.4.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Composite protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/compositeproto-0.4.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=110ad8cb6924e489036370b09c546a86
diff --git a/metadata/md5-cache/x11-proto/damageproto-1.2.1 b/metadata/md5-cache/x11-proto/damageproto-1.2.1
index 60edcbf54529..e3b4c0bb6369 100644
--- a/metadata/md5-cache/x11-proto/damageproto-1.2.1
+++ b/metadata/md5-cache/x11-proto/damageproto-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Damage protocol headers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/damageproto-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=87742e55ca84d6e3be548f79bcc928dd
diff --git a/metadata/md5-cache/x11-proto/damageproto-1.2.1-r1 b/metadata/md5-cache/x11-proto/damageproto-1.2.1-r1
index 48d3ce0b9745..8ca4c7509436 100644
--- a/metadata/md5-cache/x11-proto/damageproto-1.2.1-r1
+++ b/metadata/md5-cache/x11-proto/damageproto-1.2.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Damage protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/damageproto-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=713b8f2400bcb65ae6f8e3336da95298
diff --git a/metadata/md5-cache/x11-proto/dmxproto-2.3.1 b/metadata/md5-cache/x11-proto/dmxproto-2.3.1
index 52c42648bee5..bc0a06e3c892 100644
--- a/metadata/md5-cache/x11-proto/dmxproto-2.3.1
+++ b/metadata/md5-cache/x11-proto/dmxproto-2.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=!<x11-libs/libdmx-1.0.99.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-libs/libdmx-1.0.99.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org DMX protocol headers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libdmx-1.0.99.1
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/dmxproto-2.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=fddaa14033d75bc982153f13aa4b2538
diff --git a/metadata/md5-cache/x11-proto/dri2proto-2.6 b/metadata/md5-cache/x11-proto/dri2proto-2.6
index 99d7669225bd..00d4607a2740 100644
--- a/metadata/md5-cache/x11-proto/dri2proto-2.6
+++ b/metadata/md5-cache/x11-proto/dri2proto-2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org DRI2 protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6d0b3f837635361803cc21ef0d0c13dd
diff --git a/metadata/md5-cache/x11-proto/dri2proto-2.8 b/metadata/md5-cache/x11-proto/dri2proto-2.8
index d9e264faf38f..ccb800af99fe 100644
--- a/metadata/md5-cache/x11-proto/dri2proto-2.8
+++ b/metadata/md5-cache/x11-proto/dri2proto-2.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org DRI2 protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5b9cd386d70912cec39abfebfd31f900
diff --git a/metadata/md5-cache/x11-proto/evieext-1.1.1 b/metadata/md5-cache/x11-proto/evieext-1.1.1
index 93b6dd85f69e..08d78e7306be 100644
--- a/metadata/md5-cache/x11-proto/evieext-1.1.1
+++ b/metadata/md5-cache/x11-proto/evieext-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org EvIE protocol headers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/evieext-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=29c4e460dfdd8a296afd3b5b44ba130c
diff --git a/metadata/md5-cache/x11-proto/fixesproto-5.0 b/metadata/md5-cache/x11-proto/fixesproto-5.0
index e346d5fb8f38..69f4a48bc0a6 100644
--- a/metadata/md5-cache/x11-proto/fixesproto-5.0
+++ b/metadata/md5-cache/x11-proto/fixesproto-5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-proto/xextproto-7.0.99.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-proto/xextproto-7.0.99.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Fixes protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-proto/xextproto-7.0.99.1
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/fixesproto-5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6465cc98c29688ead2f7f5700a0a2033
diff --git a/metadata/md5-cache/x11-proto/fixesproto-5.0-r1 b/metadata/md5-cache/x11-proto/fixesproto-5.0-r1
index 1e195c0808f1..f371eabdb6ea 100644
--- a/metadata/md5-cache/x11-proto/fixesproto-5.0-r1
+++ b/metadata/md5-cache/x11-proto/fixesproto-5.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-proto/xextproto-7.0.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=>=x11-proto/xextproto-7.0.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Fixes protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-proto/xextproto-7.0.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/fixesproto-5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d0851adf93a9860eacecbda6dcac1949
diff --git a/metadata/md5-cache/x11-proto/fontcacheproto-0.1.3 b/metadata/md5-cache/x11-proto/fontcacheproto-0.1.3
index 2973a41137e2..0a2d59fb6864 100644
--- a/metadata/md5-cache/x11-proto/fontcacheproto-0.1.3
+++ b/metadata/md5-cache/x11-proto/fontcacheproto-0.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Fontcache protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/fontcacheproto-0.1.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=cb98e22cc3c265311bffdcae28814ac5
diff --git a/metadata/md5-cache/x11-proto/fontsproto-2.1.1 b/metadata/md5-cache/x11-proto/fontsproto-2.1.1
index d8f844d404b1..426aa0f13114 100644
--- a/metadata/md5-cache/x11-proto/fontsproto-2.1.1
+++ b/metadata/md5-cache/x11-proto/fontsproto-2.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Fonts protocol headers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/fontsproto-2.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5e73c1297dcfc6ab34f8a9e538dcedd0
diff --git a/metadata/md5-cache/x11-proto/fontsproto-2.1.2 b/metadata/md5-cache/x11-proto/fontsproto-2.1.2
index cd1eb83c7799..01f9612a1394 100644
--- a/metadata/md5-cache/x11-proto/fontsproto-2.1.2
+++ b/metadata/md5-cache/x11-proto/fontsproto-2.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Fonts protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/fontsproto-2.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=ef2c08f6635d130cab8df8613f80700f
diff --git a/metadata/md5-cache/x11-proto/glproto-1.4.14-r1 b/metadata/md5-cache/x11-proto/glproto-1.4.14-r1
index 793c864474db..8c48255bcb28 100644
--- a/metadata/md5-cache/x11-proto/glproto-1.4.14-r1
+++ b/metadata/md5-cache/x11-proto/glproto-1.4.14-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org GL protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=SGI-B-2.0
 RDEPEND=>=app-admin/eselect-opengl-1.2.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.14.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=431df5f4b005a383e5bad5e429320d61
diff --git a/metadata/md5-cache/x11-proto/glproto-1.4.15 b/metadata/md5-cache/x11-proto/glproto-1.4.15
index 31a7751af04a..2eb0b705b454 100644
--- a/metadata/md5-cache/x11-proto/glproto-1.4.15
+++ b/metadata/md5-cache/x11-proto/glproto-1.4.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org GL protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=SGI-B-2.0
 RDEPEND=>=app-admin/eselect-opengl-1.2.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.15.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=ea99427a530fab9d4c31de617584c7be
diff --git a/metadata/md5-cache/x11-proto/glproto-1.4.15-r1 b/metadata/md5-cache/x11-proto/glproto-1.4.15-r1
index 6b28c87ab238..626baaab256b 100644
--- a/metadata/md5-cache/x11-proto/glproto-1.4.15-r1
+++ b/metadata/md5-cache/x11-proto/glproto-1.4.15-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org GL protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=SGI-B-2.0
 RDEPEND=>=app-admin/eselect-opengl-1.2.6
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.15.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=92cfdc3b1daeffad8bd31e861bd18fde
diff --git a/metadata/md5-cache/x11-proto/glproto-1.4.16 b/metadata/md5-cache/x11-proto/glproto-1.4.16
index bc39bce13918..5761b157cb28 100644
--- a/metadata/md5-cache/x11-proto/glproto-1.4.16
+++ b/metadata/md5-cache/x11-proto/glproto-1.4.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org GL protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=SGI-B-2.0
 RDEPEND=>=app-admin/eselect-opengl-1.2.6
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.16.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5e5a8f33a3fbb0dbc3c5d5174f243141
diff --git a/metadata/md5-cache/x11-proto/inputproto-2.2 b/metadata/md5-cache/x11-proto/inputproto-2.2
index b6306d47cd8c..1aa4c6e294ce 100644
--- a/metadata/md5-cache/x11-proto/inputproto-2.2
+++ b/metadata/md5-cache/x11-proto/inputproto-2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=!<x11-libs/libXi-1.2.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-libs/libXi-1.2.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Input protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~a
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=65696d235b6e44763897be23668d3adf
diff --git a/metadata/md5-cache/x11-proto/inputproto-2.2-r1 b/metadata/md5-cache/x11-proto/inputproto-2.2-r1
index 9058be21ab33..57af3f36bc8e 100644
--- a/metadata/md5-cache/x11-proto/inputproto-2.2-r1
+++ b/metadata/md5-cache/x11-proto/inputproto-2.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=!<x11-libs/libXi-1.2.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-libs/libXi-1.2.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Input protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=4623d4fe9b21a7805f97ff448d8b1366
diff --git a/metadata/md5-cache/x11-proto/inputproto-2.3 b/metadata/md5-cache/x11-proto/inputproto-2.3
index fe56ae0553c7..192a02805916 100644
--- a/metadata/md5-cache/x11-proto/inputproto-2.3
+++ b/metadata/md5-cache/x11-proto/inputproto-2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=!<x11-libs/libXi-1.2.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-libs/libXi-1.2.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Input protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=2dd8f5253ce322fc2d2c105a99b44008
diff --git a/metadata/md5-cache/x11-proto/kbproto-1.0.5 b/metadata/md5-cache/x11-proto/kbproto-1.0.5
index cd2871ef477c..e64b1f05d42e 100644
--- a/metadata/md5-cache/x11-proto/kbproto-1.0.5
+++ b/metadata/md5-cache/x11-proto/kbproto-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org KB protocol headers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=04ba13b7c8c735d949679703f7cba8f1
diff --git a/metadata/md5-cache/x11-proto/kbproto-1.0.6 b/metadata/md5-cache/x11-proto/kbproto-1.0.6
index 76cb398af295..321402eca1fb 100644
--- a/metadata/md5-cache/x11-proto/kbproto-1.0.6
+++ b/metadata/md5-cache/x11-proto/kbproto-1.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org KB protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~a
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=2e6936a0f855930b5046bf21e390b38d
diff --git a/metadata/md5-cache/x11-proto/kbproto-1.0.6-r1 b/metadata/md5-cache/x11-proto/kbproto-1.0.6-r1
index 4a091cc3abbc..8af99ad0f59e 100644
--- a/metadata/md5-cache/x11-proto/kbproto-1.0.6-r1
+++ b/metadata/md5-cache/x11-proto/kbproto-1.0.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org KB protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=248d0cd767529c1ba6168116e3601a6c
diff --git a/metadata/md5-cache/x11-proto/printproto-1.0.5 b/metadata/md5-cache/x11-proto/printproto-1.0.5
index 39d3c6e5d51a..080b51f681b4 100644
--- a/metadata/md5-cache/x11-proto/printproto-1.0.5
+++ b/metadata/md5-cache/x11-proto/printproto-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Print protocol headers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~a
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/printproto-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d92e3885c18d42e1e41437fbf6cb44a2
diff --git a/metadata/md5-cache/x11-proto/printproto-1.0.5-r1 b/metadata/md5-cache/x11-proto/printproto-1.0.5-r1
index 58962b1c731f..fb9abe032768 100644
--- a/metadata/md5-cache/x11-proto/printproto-1.0.5-r1
+++ b/metadata/md5-cache/x11-proto/printproto-1.0.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Print protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/printproto-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=e4c554ab0a49cf90371fd98c28042f33
diff --git a/metadata/md5-cache/x11-proto/randrproto-1.3.2 b/metadata/md5-cache/x11-proto/randrproto-1.3.2
index f3321a3e7db9..06dbab3ad624 100644
--- a/metadata/md5-cache/x11-proto/randrproto-1.3.2
+++ b/metadata/md5-cache/x11-proto/randrproto-1.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Randr protocol headers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/randrproto-1.3.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=72948a0e210718c8136045b3f7843111
diff --git a/metadata/md5-cache/x11-proto/randrproto-1.4.0 b/metadata/md5-cache/x11-proto/randrproto-1.4.0
index 44e38b1d2a74..168e4c7fd219 100644
--- a/metadata/md5-cache/x11-proto/randrproto-1.4.0
+++ b/metadata/md5-cache/x11-proto/randrproto-1.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Randr protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/randrproto-1.4.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=44386ce8ef9ae5702d92ad9e7c493630
diff --git a/metadata/md5-cache/x11-proto/randrproto-1.4.0-r1 b/metadata/md5-cache/x11-proto/randrproto-1.4.0-r1
index 8a478b008716..482612173c2b 100644
--- a/metadata/md5-cache/x11-proto/randrproto-1.4.0-r1
+++ b/metadata/md5-cache/x11-proto/randrproto-1.4.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Randr protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/randrproto-1.4.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=eb81d6fd434c9f14a5d31a751b032279
diff --git a/metadata/md5-cache/x11-proto/recordproto-1.14.1 b/metadata/md5-cache/x11-proto/recordproto-1.14.1
index 52b40e383a02..6487aa951033 100644
--- a/metadata/md5-cache/x11-proto/recordproto-1.14.1
+++ b/metadata/md5-cache/x11-proto/recordproto-1.14.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!<x11-libs/libXtst-1.0.99.2 doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-libs/libXtst-1.0.99.2 doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Record protocol headers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXtst-1.0.99.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/recordproto-1.14.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=00275afadff442df020ef97752b02a40
diff --git a/metadata/md5-cache/x11-proto/recordproto-1.14.2 b/metadata/md5-cache/x11-proto/recordproto-1.14.2
index 8db6d69534b1..a30e04496706 100644
--- a/metadata/md5-cache/x11-proto/recordproto-1.14.2
+++ b/metadata/md5-cache/x11-proto/recordproto-1.14.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!<x11-libs/libXtst-1.0.99.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=!<x11-libs/libXtst-1.0.99.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Record protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXtst-1.0.99.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/recordproto-1.14.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=2fdf5a573476d2db40d15a6bfdc87493
diff --git a/metadata/md5-cache/x11-proto/recordproto-1.14.2-r1 b/metadata/md5-cache/x11-proto/recordproto-1.14.2-r1
index 58e743310720..d1d800c1176d 100644
--- a/metadata/md5-cache/x11-proto/recordproto-1.14.2-r1
+++ b/metadata/md5-cache/x11-proto/recordproto-1.14.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!<x11-libs/libXtst-1.0.99.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=!<x11-libs/libXtst-1.0.99.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Record protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXtst-1.0.99.2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/recordproto-1.14.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=49ec5d71cc938770795d831222749d49
diff --git a/metadata/md5-cache/x11-proto/renderproto-0.11.1 b/metadata/md5-cache/x11-proto/renderproto-0.11.1
index b9415afdb204..42f6e9e1f65c 100644
--- a/metadata/md5-cache/x11-proto/renderproto-0.11.1
+++ b/metadata/md5-cache/x11-proto/renderproto-0.11.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Render protocol headers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/renderproto-0.11.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=338c7100b299a40c97b0a0794567ef77
diff --git a/metadata/md5-cache/x11-proto/renderproto-0.11.1-r1 b/metadata/md5-cache/x11-proto/renderproto-0.11.1-r1
index 9f180762cb3a..fc645e915d32 100644
--- a/metadata/md5-cache/x11-proto/renderproto-0.11.1-r1
+++ b/metadata/md5-cache/x11-proto/renderproto-0.11.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Render protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/renderproto-0.11.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=3f56ffd618d1c2eb8e7be8459e523b0e
diff --git a/metadata/md5-cache/x11-proto/resourceproto-1.2.0 b/metadata/md5-cache/x11-proto/resourceproto-1.2.0
index ac4e9942e2b7..ceba34a398b7 100644
--- a/metadata/md5-cache/x11-proto/resourceproto-1.2.0
+++ b/metadata/md5-cache/x11-proto/resourceproto-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Resource protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/resourceproto-1.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=a3f47c5b6ce132a79bd6f5f4dcf3a9bc
diff --git a/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.1 b/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.1
index 6b67dd97c7b9..a48d5efe063f 100644
--- a/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.1
+++ b/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!<x11-libs/libXScrnSaver-1.2 doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-libs/libXScrnSaver-1.2 doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org ScrnSaver protocol headers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXScrnSaver-1.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=db044703fd81f593889444b96084825b
diff --git a/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2 b/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2
index 317cd7280c64..2246c72fd842 100644
--- a/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2
+++ b/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!<x11-libs/libXScrnSaver-1.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=!<x11-libs/libXScrnSaver-1.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org ScrnSaver protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXScrnSaver-1.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-1.2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=f56d044a84f97127fae05d59d3832d19
diff --git a/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2-r1 b/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2-r1
index df8c900fc418..25843c688391 100644
--- a/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2-r1
+++ b/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!<x11-libs/libXScrnSaver-1.2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=!<x11-libs/libXScrnSaver-1.2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org ScrnSaver protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXScrnSaver-1.2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-1.2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=40f357d092113645319bcd2ab0d9408e
diff --git a/metadata/md5-cache/x11-proto/trapproto-3.4.3 b/metadata/md5-cache/x11-proto/trapproto-3.4.3
index fcd1652620c0..96adfcbab632 100644
--- a/metadata/md5-cache/x11-proto/trapproto-3.4.3
+++ b/metadata/md5-cache/x11-proto/trapproto-3.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Trap protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/trapproto-3.4.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=03e33975a8e4031755e76fa9cd6b7e5d
diff --git a/metadata/md5-cache/x11-proto/videoproto-2.3.1 b/metadata/md5-cache/x11-proto/videoproto-2.3.1
index 3fe75dfe372a..7ef59b3e1e8b 100644
--- a/metadata/md5-cache/x11-proto/videoproto-2.3.1
+++ b/metadata/md5-cache/x11-proto/videoproto-2.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Video protocol headers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~a
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/videoproto-2.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=258a4224a9cdd7e85965fb534ee85809
diff --git a/metadata/md5-cache/x11-proto/videoproto-2.3.1-r1 b/metadata/md5-cache/x11-proto/videoproto-2.3.1-r1
index c74215d34fc6..d953da63a2bb 100644
--- a/metadata/md5-cache/x11-proto/videoproto-2.3.1-r1
+++ b/metadata/md5-cache/x11-proto/videoproto-2.3.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Video protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/videoproto-2.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d8b92b8bc6bff02fdbb055bc943ccc6e
diff --git a/metadata/md5-cache/x11-proto/xcalibrateproto-0.1_pre20081210 b/metadata/md5-cache/x11-proto/xcalibrateproto-0.1_pre20081210
index fc0c515632d4..17d7a85fdf58 100644
--- a/metadata/md5-cache/x11-proto/xcalibrateproto-0.1_pre20081210
+++ b/metadata/md5-cache/x11-proto/xcalibrateproto-0.1_pre20081210
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=Touchscreen calibration protocol
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-f
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/calibrateproto-20081210.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=e4ffa1a1eb33570a538dba09318320c7
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.6-r1 b/metadata/md5-cache/x11-proto/xcb-proto-1.6-r1
index 9e872d71686d..7ecc079bd754 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.6-r1
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libxml2 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=dev-libs/libxml2 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X C-language Bindings protocol headers
 EAPI=3
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=08d5438a2649f2169d9c7622b4ca3bb8
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.6-r2 b/metadata/md5-cache/x11-proto/xcb-proto-1.6-r2
index 211472ac6433..54792ff0adb3 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.6-r2
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.6-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libxml2 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=dev-libs/libxml2 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X C-language Bindings protocol headers
 EAPI=3
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d75985d87a3f17729cefe7a9f8229f0b
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.7 b/metadata/md5-cache/x11-proto/xcb-proto-1.7
index 0f5b073c1367..e959bb0cb0b7 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.7
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libxml2 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=dev-libs/libxml2 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X C-language Bindings protocol headers
 EAPI=3
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d6ddfcff1ef78c2f1f0df2f1254a23da
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.7-r1 b/metadata/md5-cache/x11-proto/xcb-proto-1.7-r1
index 0d7df3a74636..8a234f599f7a 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.7-r1
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libxml2 dev-lang/python || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=dev-libs/libxml2 dev-lang/python || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X C-language Bindings protocol headers
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/python
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=eceed6b5ba97dd33c6fbd361cbf00ab5
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.7.1 b/metadata/md5-cache/x11-proto/xcb-proto-1.7.1
index 8119fef5cc6a..f426fa742942 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.7.1
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libxml2 dev-lang/python || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=dev-libs/libxml2 dev-lang/python || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X C-language Bindings protocol headers
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/python
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.7.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d26050c76a42c3a5af7d85a17246c39c
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.8 b/metadata/md5-cache/x11-proto/xcb-proto-1.8
index 2489d5ee2986..97ef53d953a3 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.8
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libxml2 dev-lang/python || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=dev-libs/libxml2 dev-lang/python || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X C-language Bindings protocol headers
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/python
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=ec7f0e4dfbe7613c85cce161d2836b06
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.8-r1 b/metadata/md5-cache/x11-proto/xcb-proto-1.8-r1
index 9726d58c5cb4..dada1b06da6e 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.8-r1
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_python3_1? ( dev-lang/python:3.1 ) python_single_target_python3_2? ( dev-lang/python:3.2 ) python_single_target_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] dev-libs/libxml2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_python3_1? ( dev-lang/python:3.1 ) python_single_target_python3_2? ( dev-lang/python:3.2 ) python_single_target_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] dev-libs/libxml2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X C-language Bindings protocol headers
 EAPI=5
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_python3_1? ( dev-lang/python:3.1 ) python_single_target_python3_2? ( dev-lang/python:3.2 ) python_single_target_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?]
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=eecdcc21260dab051bf8e511745c79ae
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.8-r2 b/metadata/md5-cache/x11-proto/xcb-proto-1.8-r2
index 262c91369b6e..2983eb68ee1f 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.8-r2
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.8-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_python3_1? ( dev-lang/python:3.1 ) python_single_target_python3_2? ( dev-lang/python:3.2 ) python_single_target_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] dev-libs/libxml2 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_python3_1? ( dev-lang/python:3.1 ) python_single_target_python3_2? ( dev-lang/python:3.2 ) python_single_target_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] dev-libs/libxml2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X C-language Bindings protocol headers
 EAPI=5
 HOMEPAGE=http://xcb.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_python3_1? ( dev-lang/python:3.1 ) python_single_target_python3_2? ( dev-lang/python:3.2 ) python_single_target_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_1(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	1abc4a4828358a8fc1c4d65e74ae4a19	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=cb66e5a4418e7b8d0fdec82223e68ee4
diff --git a/metadata/md5-cache/x11-proto/xcmiscproto-1.2.1 b/metadata/md5-cache/x11-proto/xcmiscproto-1.2.1
index 41a9c9a11a7a..487b1016516e 100644
--- a/metadata/md5-cache/x11-proto/xcmiscproto-1.2.1
+++ b/metadata/md5-cache/x11-proto/xcmiscproto-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org XCMisc protocol headers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xcmiscproto-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=51ad10be1175fe29d63cc3d9522021be
diff --git a/metadata/md5-cache/x11-proto/xcmiscproto-1.2.2 b/metadata/md5-cache/x11-proto/xcmiscproto-1.2.2
index 02c59f4c23bb..ddfa158c94c9 100644
--- a/metadata/md5-cache/x11-proto/xcmiscproto-1.2.2
+++ b/metadata/md5-cache/x11-proto/xcmiscproto-1.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org XCMisc protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~a
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xcmiscproto-1.2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=e24a6cc83c8b35a168a5eafe9255ec46
diff --git a/metadata/md5-cache/x11-proto/xextproto-7.2.0 b/metadata/md5-cache/x11-proto/xextproto-7.2.0
index 73d160443630..8be6e4550232 100644
--- a/metadata/md5-cache/x11-proto/xextproto-7.2.0
+++ b/metadata/md5-cache/x11-proto/xextproto-7.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!<x11-libs/libXext-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=!<x11-libs/libXext-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org XExt protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXext-1.0.99
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=cb95620ed80e592fe8fb1353e0e0e233
diff --git a/metadata/md5-cache/x11-proto/xextproto-7.2.1 b/metadata/md5-cache/x11-proto/xextproto-7.2.1
index ceca56857ada..06c8a0a1a335 100644
--- a/metadata/md5-cache/x11-proto/xextproto-7.2.1
+++ b/metadata/md5-cache/x11-proto/xextproto-7.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!<x11-libs/libXext-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=!<x11-libs/libXext-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org XExt protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXext-1.0.99
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=98f63add5846c80b399bcc87e351c381
diff --git a/metadata/md5-cache/x11-proto/xextproto-7.2.1-r1 b/metadata/md5-cache/x11-proto/xextproto-7.2.1-r1
index 35f45a3b4003..1cef1f4d87b3 100644
--- a/metadata/md5-cache/x11-proto/xextproto-7.2.1-r1
+++ b/metadata/md5-cache/x11-proto/xextproto-7.2.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!<x11-libs/libXext-1.0.99 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=!<x11-libs/libXext-1.0.99 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org XExt protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXext-1.0.99 abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=48755dd47b35cb78693f05bbdda02a05
diff --git a/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0 b/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0
index cfdfba935d5e..957364d46097 100644
--- a/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0
+++ b/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org XF86BigFont protocol headers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~a
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86bigfontproto-1.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=38423181d8940346a27f9f430a961de3
diff --git a/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0-r1 b/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0-r1
index 81eba29d6f92..8874446f06ed 100644
--- a/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0-r1
+++ b/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org XF86BigFont protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86bigfontproto-1.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=b9ccc6bd2baf8b8d9cd0c921daaf9830
diff --git a/metadata/md5-cache/x11-proto/xf86dgaproto-2.1 b/metadata/md5-cache/x11-proto/xf86dgaproto-2.1
index b655beb212de..eb91ba55140d 100644
--- a/metadata/md5-cache/x11-proto/xf86dgaproto-2.1
+++ b/metadata/md5-cache/x11-proto/xf86dgaproto-2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=!<x11-libs/libXxf86dga-1.0.99.1 || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=!<x11-libs/libXxf86dga-1.0.99.1 || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=X.Org XF86DGA protocol headers
 HOMEPAGE=http://xorg.freedesktop.org/
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
@@ -7,5 +7,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXxf86dga-1.0.99.1 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86dgaproto-2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=49fb75181e14b15802e97ce324729624
diff --git a/metadata/md5-cache/x11-proto/xf86dgaproto-2.1-r1 b/metadata/md5-cache/x11-proto/xf86dgaproto-2.1-r1
index 66d6ffde4c69..3aa77a7b7916 100644
--- a/metadata/md5-cache/x11-proto/xf86dgaproto-2.1-r1
+++ b/metadata/md5-cache/x11-proto/xf86dgaproto-2.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=!<x11-libs/libXxf86dga-1.0.99.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-libs/libXxf86dga-1.0.99.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org XF86DGA protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXxf86dga-1.0.99.1
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86dgaproto-2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6410c7b1fc3eb60d9c46a248c6506ca0
diff --git a/metadata/md5-cache/x11-proto/xf86dgaproto-2.1-r2 b/metadata/md5-cache/x11-proto/xf86dgaproto-2.1-r2
index 8d559d253a7e..b748e6a3dacf 100644
--- a/metadata/md5-cache/x11-proto/xf86dgaproto-2.1-r2
+++ b/metadata/md5-cache/x11-proto/xf86dgaproto-2.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=!<x11-libs/libXxf86dga-1.0.99.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-libs/libXxf86dga-1.0.99.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org XF86DGA protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXxf86dga-1.0.99.1 abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86dgaproto-2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=35769844ffda013a6514ea9a2dd70829
diff --git a/metadata/md5-cache/x11-proto/xf86driproto-2.1.1 b/metadata/md5-cache/x11-proto/xf86driproto-2.1.1
index cd58d0ec27ce..9bde127fd0cb 100644
--- a/metadata/md5-cache/x11-proto/xf86driproto-2.1.1
+++ b/metadata/md5-cache/x11-proto/xf86driproto-2.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org XF86DRI protocol headers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86driproto-2.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=100742542ea61a41a1fb359ab2eaeb8b
diff --git a/metadata/md5-cache/x11-proto/xf86miscproto-0.9.3 b/metadata/md5-cache/x11-proto/xf86miscproto-0.9.3
index 864cb2da45b0..c5d0f6d63cd1 100644
--- a/metadata/md5-cache/x11-proto/xf86miscproto-0.9.3
+++ b/metadata/md5-cache/x11-proto/xf86miscproto-0.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org XF86Misc protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86miscproto-0.9.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=b2b651bbe28dafcb1f62dbf2123f8e8b
diff --git a/metadata/md5-cache/x11-proto/xf86rushproto-1.1.2 b/metadata/md5-cache/x11-proto/xf86rushproto-1.1.2
index 08307d1d530a..961befcc1574 100644
--- a/metadata/md5-cache/x11-proto/xf86rushproto-1.1.2
+++ b/metadata/md5-cache/x11-proto/xf86rushproto-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
 DESCRIPTION=X.Org XF86Rush protocol headers
 HOMEPAGE=http://xorg.freedesktop.org/
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
@@ -7,5 +7,5 @@ LICENSE=MIT
 RDEPEND=!<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86rushproto-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=ba318687ea1b8175ab5c94bed66394e5
diff --git a/metadata/md5-cache/x11-proto/xf86rushproto-1.1.2-r1 b/metadata/md5-cache/x11-proto/xf86rushproto-1.1.2-r1
index 163edfffc9d8..987ba514349a 100644
--- a/metadata/md5-cache/x11-proto/xf86rushproto-1.1.2-r1
+++ b/metadata/md5-cache/x11-proto/xf86rushproto-1.1.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org XF86Rush protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86rushproto-1.1.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=7c389017be60fccc841061521e88f844
diff --git a/metadata/md5-cache/x11-proto/xf86vidmodeproto-2.3.1 b/metadata/md5-cache/x11-proto/xf86vidmodeproto-2.3.1
index 9a330126de3d..4039038e17e4 100644
--- a/metadata/md5-cache/x11-proto/xf86vidmodeproto-2.3.1
+++ b/metadata/md5-cache/x11-proto/xf86vidmodeproto-2.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=!<x11-libs/libXxf86vm-1.0.99.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-libs/libXxf86vm-1.0.99.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org XF86VidMode protocol headers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXxf86vm-1.0.99.1
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=ff10926d7fb014fc6a307fb158cc464a
diff --git a/metadata/md5-cache/x11-proto/xf86vidmodeproto-2.3.1-r1 b/metadata/md5-cache/x11-proto/xf86vidmodeproto-2.3.1-r1
index 2f161d095b5d..3c20d6bf392c 100644
--- a/metadata/md5-cache/x11-proto/xf86vidmodeproto-2.3.1-r1
+++ b/metadata/md5-cache/x11-proto/xf86vidmodeproto-2.3.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=!<x11-libs/libXxf86vm-1.0.99.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-libs/libXxf86vm-1.0.99.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org XF86VidMode protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXxf86vm-1.0.99.1 abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6cd87bf224c85080edd47e380f8a86b1
diff --git a/metadata/md5-cache/x11-proto/xineramaproto-1.2.1 b/metadata/md5-cache/x11-proto/xineramaproto-1.2.1
index 2611149d2c8c..016c6cce6ee8 100644
--- a/metadata/md5-cache/x11-proto/xineramaproto-1.2.1
+++ b/metadata/md5-cache/x11-proto/xineramaproto-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=!<x11-libs/libXinerama-1.0.99.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-libs/libXinerama-1.0.99.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xinerama protocol headers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXinerama-1.0.99.1
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xineramaproto-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=e92ab4a14794f1939009d554e8007d69
diff --git a/metadata/md5-cache/x11-proto/xineramaproto-1.2.1-r1 b/metadata/md5-cache/x11-proto/xineramaproto-1.2.1-r1
index d94ff5e5b7e9..f9dc6fb21589 100644
--- a/metadata/md5-cache/x11-proto/xineramaproto-1.2.1-r1
+++ b/metadata/md5-cache/x11-proto/xineramaproto-1.2.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=!<x11-libs/libXinerama-1.0.99.1 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=!<x11-libs/libXinerama-1.0.99.1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org Xinerama protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXinerama-1.0.99.1 abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xineramaproto-1.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=63072346519fb40a4e7c4d881ae2c65c
diff --git a/metadata/md5-cache/x11-proto/xproto-7.0.22 b/metadata/md5-cache/x11-proto/xproto-7.0.22
index a024080e6ef0..a9afbb75942b 100644
--- a/metadata/md5-cache/x11-proto/xproto-7.0.22
+++ b/metadata/md5-cache/x11-proto/xproto-7.0.22
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org xproto protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.22.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=de1035740023b50b55973f19f2166f7b
diff --git a/metadata/md5-cache/x11-proto/xproto-7.0.23 b/metadata/md5-cache/x11-proto/xproto-7.0.23
index c57b08778bc8..9b93a524f730 100644
--- a/metadata/md5-cache/x11-proto/xproto-7.0.23
+++ b/metadata/md5-cache/x11-proto/xproto-7.0.23
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org xproto protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.23.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=99c3e65647413cc478b01c9a5e789c45
diff --git a/metadata/md5-cache/x11-proto/xproto-7.0.23-r1 b/metadata/md5-cache/x11-proto/xproto-7.0.23-r1
index 099c5d10c1f0..b83940704e2f 100644
--- a/metadata/md5-cache/x11-proto/xproto-7.0.23-r1
+++ b/metadata/md5-cache/x11-proto/xproto-7.0.23-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org xproto protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~a
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.23.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=c5de71896235af092b0a58ef5e68b657
diff --git a/metadata/md5-cache/x11-proto/xproto-7.0.23-r2 b/metadata/md5-cache/x11-proto/xproto-7.0.23-r2
index c8deeeb37b04..677aa391cfe6 100644
--- a/metadata/md5-cache/x11-proto/xproto-7.0.23-r2
+++ b/metadata/md5-cache/x11-proto/xproto-7.0.23-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org xproto protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.23.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=492deb28ec6dbca7c182a756d804b7e6
diff --git a/metadata/md5-cache/x11-proto/xproto-7.0.24 b/metadata/md5-cache/x11-proto/xproto-7.0.24
index 63c1f7d677b5..0c7d68729d53 100644
--- a/metadata/md5-cache/x11-proto/xproto-7.0.24
+++ b/metadata/md5-cache/x11-proto/xproto-7.0.24
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org xproto protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.24.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-multilib	3ca3ffaa40575becc8cfd0cc6aeb1080	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=6d009eaf808ca5289b05ff4c1b312f4f
diff --git a/metadata/md5-cache/x11-terms/eterm-0.9.5 b/metadata/md5-cache/x11-terms/eterm-0.9.5
index 1a7ba681aad2..3669212d0a2d 100644
--- a/metadata/md5-cache/x11-terms/eterm-0.9.5
+++ b/metadata/md5-cache/x11-terms/eterm-0.9.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A vt102 terminal emulator for X
 EAPI=2
 HOMEPAGE=http://www.eterm.org/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=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 )
 SLOT=0
 SRC_URI=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 )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5abb2f2d192305a3270f1a9c3f9414d1
diff --git a/metadata/md5-cache/x11-terms/eterm-0.9.6 b/metadata/md5-cache/x11-terms/eterm-0.9.6
index f931450230bd..1dc18948586c 100644
--- a/metadata/md5-cache/x11-terms/eterm-0.9.6
+++ b/metadata/md5-cache/x11-terms/eterm-0.9.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A vt102 terminal emulator for X
 EAPI=3
 HOMEPAGE=http://www.eterm.org/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://www.eterm.org/download/Eterm-0.9.6.tar.gz !minimal? ( http://www.eterm.org/download/Eterm-bg-0.9.6.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=310c418b9352950f210f541e66c2b683
diff --git a/metadata/md5-cache/x11-terms/eterm-9999 b/metadata/md5-cache/x11-terms/eterm-9999
index b24b7583e26d..074bf116c7b3 100644
--- a/metadata/md5-cache/x11-terms/eterm-9999
+++ b/metadata/md5-cache/x11-terms/eterm-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install preinst prepare unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=A vt102 terminal emulator for X
 EAPI=3
 HOMEPAGE=http://www.eterm.org/
@@ -7,5 +7,5 @@ IUSE=escreen minimal mmx sse2 unicode +utempter
 LICENSE=BSD
 RDEPEND=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 )
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ec70a886f12560c5cd4b22e74738e4d6
diff --git a/metadata/md5-cache/x11-terms/gnome-terminal-3.6.2 b/metadata/md5-cache/x11-terms/gnome-terminal-3.6.2
index db3649b6f864..0816d778615c 100644
--- a/metadata/md5-cache/x11-terms/gnome-terminal-3.6.2
+++ b/metadata/md5-cache/x11-terms/gnome-terminal-3.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.26.0:2 >=x11-libs/gtk+-3.3.17:3[X] >=x11-libs/vte-0.30.0:2.90 >=gnome-base/gconf-2.31.3 >=gnome-base/gsettings-desktop-schemas-0.1.0 x11-libs/libSM x11-libs/libICE || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 ) app-text/yelp-tools >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.26.0:2 >=x11-libs/gtk+-3.3.17:3[X] >=x11-libs/vte-0.30.0:2.90 >=gnome-base/gconf-2.31.3 >=gnome-base/gsettings-desktop-schemas-0.1.0 x11-libs/libSM x11-libs/libICE || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 ) app-text/yelp-tools >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=The Gnome Terminal
 EAPI=5
 HOMEPAGE=http://www.gnome.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.26.0:2 >=x11-libs/gtk+-3.3.17:3[X] >=x11-libs/vte-0.30.0:2.90 >=gnome-base/gconf-2.31.3 >=gnome-base/gsettings-desktop-schemas-0.1.0 x11-libs/libSM x11-libs/libICE
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-terminal/3.6/gnome-terminal-3.6.2.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=06a56e56c57bb676e486539db361c4f2
diff --git a/metadata/md5-cache/x11-terms/mlterm-3.0.11-r1 b/metadata/md5-cache/x11-terms/mlterm-3.0.11-r1
index 6b4216541bd6..be891dfce31c 100644
--- a/metadata/md5-cache/x11-terms/mlterm-3.0.11-r1
+++ b/metadata/md5-cache/x11-terms/mlterm-3.0.11-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( 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 ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( 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 ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A multi-lingual terminal emulator
 EAPI=3
 HOMEPAGE=http://mlterm.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=|| ( 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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mlterm/mlterm-3.0.11.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9a384b01a0bc0264b4b3b149e1430742
diff --git a/metadata/md5-cache/x11-terms/mlterm-3.0.9 b/metadata/md5-cache/x11-terms/mlterm-3.0.9
index 851436133f7d..3a4eda1a4972 100644
--- a/metadata/md5-cache/x11-terms/mlterm-3.0.9
+++ b/metadata/md5-cache/x11-terms/mlterm-3.0.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( 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 ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( 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 ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A multi-lingual terminal emulator
 EAPI=3
 HOMEPAGE=http://mlterm.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=|| ( 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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mlterm/mlterm-3.0.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2e0cd64f1fd66fba94babd34747f1042
diff --git a/metadata/md5-cache/x11-terms/mlterm-3.0.9-r1 b/metadata/md5-cache/x11-terms/mlterm-3.0.9-r1
index d7022b08fff7..ead43989026b 100644
--- a/metadata/md5-cache/x11-terms/mlterm-3.0.9-r1
+++ b/metadata/md5-cache/x11-terms/mlterm-3.0.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=|| ( 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 ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( 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 ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A multi-lingual terminal emulator
 EAPI=3
 HOMEPAGE=http://mlterm.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=|| ( 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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mlterm/mlterm-3.0.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5bff0e71f4fab60709bca897ba87a2f2
diff --git a/metadata/md5-cache/x11-terms/mlterm-3.1.9 b/metadata/md5-cache/x11-terms/mlterm-3.1.9
index becf8d2d350c..5cdbfb547779 100644
--- a/metadata/md5-cache/x11-terms/mlterm-3.1.9
+++ b/metadata/md5-cache/x11-terms/mlterm-3.1.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=|| ( 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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mlterm/mlterm-3.1.9.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8b2c8eb0e7dd444cde6fa1deb47a23a3
diff --git a/metadata/md5-cache/x11-terms/mrxvt-0.5.4 b/metadata/md5-cache/x11-terms/mrxvt-0.5.4
index c1464d486957..ab66344eb9a5 100644
--- a/metadata/md5-cache/x11-terms/mrxvt-0.5.4
+++ b/metadata/md5-cache/x11-terms/mrxvt-0.5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Multi-tabbed rxvt clone with XFT, transparent background and CJK support
 EAPI=4
 HOMEPAGE=http://materm.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=mirror://sourceforge/materm/mrxvt-0.5.4.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2cd465651d3a18371aea150ca2f049fc
diff --git a/metadata/md5-cache/x11-terms/rxvt-unicode-9.16 b/metadata/md5-cache/x11-terms/rxvt-unicode-9.16
index b657771c7dea..22c4316ac36a 100644
--- a/metadata/md5-cache/x11-terms/rxvt-unicode-9.16
+++ b/metadata/md5-cache/x11-terms/rxvt-unicode-9.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=sys-libs/ncurses-5.7-r6 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 ) virtual/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.7-r6 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 ) virtual/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=rxvt clone with xft and unicode support
 EAPI=4
 HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html
@@ -11,5 +11,5 @@ REQUIRED_USE=vanilla? ( !alt-font-width !buffer-on-clear focused-urgency !second
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-9.16.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5579b8dc478620202e36a4f4ef8e76be
diff --git a/metadata/md5-cache/x11-terms/rxvt-unicode-9.17 b/metadata/md5-cache/x11-terms/rxvt-unicode-9.17
index a7fd4819f8fd..6cd3acdbe977 100644
--- a/metadata/md5-cache/x11-terms/rxvt-unicode-9.17
+++ b/metadata/md5-cache/x11-terms/rxvt-unicode-9.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=sys-libs/ncurses-5.7-r6 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 ) virtual/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.7-r6 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 ) virtual/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=rxvt clone with xft and unicode support
 EAPI=4
 HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html
@@ -11,5 +11,5 @@ REQUIRED_USE=vanilla? ( !alt-font-width !buffer-on-clear focused-urgency !second
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-9.17.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ef189d22cedc49c91a2ea7c0ba6f0192
diff --git a/metadata/md5-cache/x11-terms/rxvt-unicode-9.18 b/metadata/md5-cache/x11-terms/rxvt-unicode-9.18
index fc0af3b5a447..9d8be902faae 100644
--- a/metadata/md5-cache/x11-terms/rxvt-unicode-9.18
+++ b/metadata/md5-cache/x11-terms/rxvt-unicode-9.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=sys-libs/ncurses-5.7-r6 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 ) virtual/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=sys-libs/ncurses-5.7-r6 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 ) virtual/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=rxvt clone with xft and unicode support
 EAPI=4
 HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html
@@ -11,5 +11,5 @@ REQUIRED_USE=vanilla? ( !alt-font-width !buffer-on-clear focused-urgency !second
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-9.18.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7f754b1c0adb319bb108795acbcd43db
diff --git a/metadata/md5-cache/x11-terms/xfce4-terminal-0.4.8 b/metadata/md5-cache/x11-terms/xfce4-terminal-0.4.8
index 27a11fbb4785..fde53ee26d62 100644
--- a/metadata/md5-cache/x11-terms/xfce4-terminal-0.4.8
+++ b/metadata/md5-cache/x11-terms/xfce4-terminal-0.4.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.14:2 x11-libs/libX11 >=x11-libs/vte-0.22.5:0 >=xfce-base/exo-0.6 dbus? ( >=dev-libs/dbus-glib-0.88 ) !gnustep-apps/terminal
 SLOT=0
 SRC_URI=mirror://gentoo/Terminal-0.4.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=11ba1a943660f966bc1c936fa0140337
diff --git a/metadata/md5-cache/x11-terms/xfce4-terminal-0.6.1 b/metadata/md5-cache/x11-terms/xfce4-terminal-0.6.1
index 5cd612543032..712459a5508b 100644
--- a/metadata/md5-cache/x11-terms/xfce4-terminal-0.6.1
+++ b/metadata/md5-cache/x11-terms/xfce4-terminal-0.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26 >=x11-libs/gtk+-2.24:2 x11-libs/libX11 >=x11-libs/vte-0.28:0 >=xfce-base/libxfce4ui-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/xfce4-terminal/0.6/xfce4-terminal-0.6.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=968b5596c20d94cb8bcf55a06f066e10
diff --git a/metadata/md5-cache/x11-themes/fvwm-themes-0.7.0 b/metadata/md5-cache/x11-themes/fvwm-themes-0.7.0
index 39e5b38ccc9b..47cdcc28cd11 100644
--- a/metadata/md5-cache/x11-themes/fvwm-themes-0.7.0
+++ b/metadata/md5-cache/x11-themes/fvwm-themes-0.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=x11-wm/fvwm-2.6.2 gnome? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-wm/fvwm-2.6.2 gnome? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A configuration framework for the fvwm window manager
 EAPI=2
 HOMEPAGE=http://fvwm-themes.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-wm/fvwm-2.6.2
 SLOT=0
 SRC_URI=mirror://sourceforge/fvwm-themes/fvwm-themes-0.7.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d34f03e7c4195b519c9f83a2b2f7c006
diff --git a/metadata/md5-cache/x11-themes/gnome-icon-theme-3.4.0 b/metadata/md5-cache/x11-themes/gnome-icon-theme-3.4.0
index a3c2a6b51130..927ad0aa3aaa 100644
--- a/metadata/md5-cache/x11-themes/gnome-icon-theme-3.4.0
+++ b/metadata/md5-cache/x11-themes/gnome-icon-theme-3.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=x11-misc/icon-naming-utils-0.8.7 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=x11-misc/icon-naming-utils-0.8.7 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNOME default icon theme
 EAPI=4
 HOMEPAGE=http://www.gnome.org/ http://people.freedesktop.org/~jimmac/icons/#git
@@ -10,5 +10,5 @@ RDEPEND=>=x11-themes/hicolor-icon-theme-0.10
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-icon-theme/3.4/gnome-icon-theme-3.4.0.tar.xz branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=374c9896c1720aff7437d4a9857b2e80
diff --git a/metadata/md5-cache/x11-themes/gnome-icon-theme-3.6.2 b/metadata/md5-cache/x11-themes/gnome-icon-theme-3.6.2
index c271029c26a2..161724c33377 100644
--- a/metadata/md5-cache/x11-themes/gnome-icon-theme-3.6.2
+++ b/metadata/md5-cache/x11-themes/gnome-icon-theme-3.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=x11-misc/icon-naming-utils-0.8.7 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=x11-misc/icon-naming-utils-0.8.7 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GNOME default icon theme
 EAPI=5
 HOMEPAGE=http://www.gnome.org/ http://people.freedesktop.org/~jimmac/icons/#git
@@ -10,5 +10,5 @@ RDEPEND=>=x11-themes/hicolor-icon-theme-0.10
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-icon-theme/3.6/gnome-icon-theme-3.6.2.tar.xz branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6944f53fb2df99d43ba53c225b591afa
diff --git a/metadata/md5-cache/x11-themes/gnome-icon-theme-extras-2.30.1 b/metadata/md5-cache/x11-themes/gnome-icon-theme-extras-2.30.1
index d923b3017b6c..1a7d1798ce22 100644
--- a/metadata/md5-cache/x11-themes/gnome-icon-theme-extras-2.30.1
+++ b/metadata/md5-cache/x11-themes/gnome-icon-theme-extras-2.30.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=x11-misc/icon-naming-utils-0.8.7 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=x11-misc/icon-naming-utils-0.8.7 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Extra GNOME icons for specific devices and file types
 EAPI=3
 HOMEPAGE=http://www.gnome.org/ http://git.gnome.org/browse/gnome-icon-theme-extras/
@@ -9,5 +9,5 @@ RDEPEND=>=x11-themes/hicolor-icon-theme-0.10
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-icon-theme-extras/2.30/gnome-icon-theme-extras-2.30.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a03459ba4c9ddb197d4ddb66b363d52e
diff --git a/metadata/md5-cache/x11-themes/gnome-themes-extras-2.22.0-r1 b/metadata/md5-cache/x11-themes/gnome-themes-extras-2.22.0-r1
index ce7a3f995d6e..570c67539d33 100644
--- a/metadata/md5-cache/x11-themes/gnome-themes-extras-2.22.0-r1
+++ b/metadata/md5-cache/x11-themes/gnome-themes-extras-2.22.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-libs/gtk+-2.6:2 >=x11-themes/gtk-engines-2.14:2 >=x11-misc/icon-naming-utils-0.8.1 gnome-base/librsvg virtual/pkgconfig >=dev-util/intltool-0.23 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=x11-libs/gtk+-2.6:2 >=x11-themes/gtk-engines-2.14:2 >=x11-misc/icon-naming-utils-0.8.1 gnome-base/librsvg virtual/pkgconfig >=dev-util/intltool-0.23 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Additional themes for GNOME
 EAPI=4
 HOMEPAGE=http://librsvg.sourceforge.net/theme.php
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2 DSL
 RDEPEND=>=x11-libs/gtk+-2.6:2 >=x11-themes/gtk-engines-2.14:2 >=x11-misc/icon-naming-utils-0.8.1 gnome-base/librsvg
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-themes-extras/2.22/gnome-themes-extras-2.22.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1ac4a9708f8afb5d3a7479febb775d98
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-candido-0.9.1 b/metadata/md5-cache/x11-themes/gtk-engines-candido-0.9.1
index ff79240a2359..165c83263097 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-candido-0.9.1
+++ b/metadata/md5-cache/x11-themes/gtk-engines-candido-0.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/gtk+-2.8:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.8:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Candido GTK+ 2.x Theme Engine
 EAPI=4
 HOMEPAGE=http://candido.berlios.de/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.8:2
 SLOT=0
 SRC_URI=mirror://berlios/candido/candido-engine-0.9.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1540794c53a14f293c87a7406550c368
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-cleanice-2.4.1 b/metadata/md5-cache/x11-themes/gtk-engines-cleanice-2.4.1
index 9213646437c6..dc113ac39235 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-cleanice-2.4.1
+++ b/metadata/md5-cache/x11-themes/gtk-engines-cleanice-2.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=x11-libs/gtk+-2.4:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.4:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK+ CleanIce Theme Engine
 EAPI=3
 HOMEPAGE=http://sourceforge.net/projects/elysium-project
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.4:2
 SLOT=2
 SRC_URI=mirror://sourceforge/elysium-project/gtk-engines-cleanice-2.4.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=91db92ddddd7ff3fb38816fb48d09d79
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-dwerg-0.8 b/metadata/md5-cache/x11-themes/gtk-engines-dwerg-0.8
index 21fdc6f8a286..6d08fcff2e7b 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-dwerg-0.8
+++ b/metadata/md5-cache/x11-themes/gtk-engines-dwerg-0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK+2 Dwerg Theme Engine
 EAPI=3
 HOMEPAGE=http://themes.freshmeat.net/projects/dwerg/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=2
 SRC_URI=http://download.freshmeat.net/themes/dwerg/dwerg-default-0.8.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=f39a4925218e1ee7f67ae770f4d6336c
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-experience-0.10.4 b/metadata/md5-cache/x11-themes/gtk-engines-experience-0.10.4
index 13384d07d679..cdcbdaf058e5 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-experience-0.10.4
+++ b/metadata/md5-cache/x11-themes/gtk-engines-experience-0.10.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=x11-libs/gtk+-2.6:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.6:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK+ Experience Theme Engine
 EAPI=3
 HOMEPAGE=http://benjamin.sipsolutions.net/Projects/eXperience
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=x11-libs/gtk+-2.6:2
 SLOT=2
 SRC_URI=http://benjamin.sipsolutions.net/experience/experience-0.10.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=73d94c2d0f0dafe681614692ce017960
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-experience-0.10.5 b/metadata/md5-cache/x11-themes/gtk-engines-experience-0.10.5
index 4b7952a41ec4..69724bf65b01 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-experience-0.10.5
+++ b/metadata/md5-cache/x11-themes/gtk-engines-experience-0.10.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=x11-libs/gtk+-2.6:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.6:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK+ Experience Theme Engine
 EAPI=4
 HOMEPAGE=http://benjamin.sipsolutions.net/Projects/eXperience
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=x11-libs/gtk+-2.6:2
 SLOT=2
 SRC_URI=http://benjamin.sipsolutions.net/experience/gtk-engine-experience-0.10.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1318a963e9327fe24bd54e14e44e4597
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-flat-2.0-r2 b/metadata/md5-cache/x11-themes/gtk-engines-flat-2.0-r2
index 967031c6678c..1518a78c479c 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-flat-2.0-r2
+++ b/metadata/md5-cache/x11-themes/gtk-engines-flat-2.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK+ Flat Theme Engine
 EAPI=3
 HOMEPAGE=http://themes.freshmeat.net/projects/gtk2flat
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=2
 SRC_URI=http://download.freshmeat.net/themes/gtk2flat/gtk2flat-default.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=977fe4059ead95dc43d795dfcc2f81d3
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-qtpixmap-0.28-r2 b/metadata/md5-cache/x11-themes/gtk-engines-qtpixmap-0.28-r2
index 61726e1a8f7e..bc6a7a4a1796 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-qtpixmap-0.28-r2
+++ b/metadata/md5-cache/x11-themes/gtk-engines-qtpixmap-0.28-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A modified version of the original GTK pixmap engine which follows the KDE color scheme
 EAPI=1
 HOMEPAGE=http://www.kde-look.org/content/show.php?content=7043
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://www.cpdrummond.freeuk.com/QtPixmap-0.28.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e3afcb98d42ae26d58e853271bef8a47
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-quartz-0.2 b/metadata/md5-cache/x11-themes/gtk-engines-quartz-0.2
index e8832123876e..3dee401fde38 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-quartz-0.2
+++ b/metadata/md5-cache/x11-themes/gtk-engines-quartz-0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=x11-libs/gtk+-2.10:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.10:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=OSX GTK+ Theme Engine
 EAPI=3
 HOMEPAGE=http://sourceforge.net/apps/trac/gtk-osx/wiki/GtkQuartzEngine
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.10:2
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/project/gtk-osx/GTK%20Quartz%20Engine/gtk-quartz-engine-0.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=24c5f6c765b1c1fc12fc69fffa82b8cd
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-rezlooks-0.6 b/metadata/md5-cache/x11-themes/gtk-engines-rezlooks-0.6
index cbc58001be44..ad4cf6aab2ce 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-rezlooks-0.6
+++ b/metadata/md5-cache/x11-themes/gtk-engines-rezlooks-0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/gtk+-2.8:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.8:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Rezlooks GTK+ Engine
 EAPI=4
 HOMEPAGE=http://www.gnome-look.org/content/show.php?content=39179
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.8:2
 SLOT=0
 SRC_URI=http://www.gnome-look.org/content/files/39179-rezlooks-0.6.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e047653794027a1d2638c0df6960b8b
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3 b/metadata/md5-cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3
index 048188165cbc..d897a4ede8b1 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3
+++ b/metadata/md5-cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A derivative of the standard Clearlooks GTK+ 2.x engine with more orange approach
 EAPI=4
 HOMEPAGE=http://packages.ubuntu.com/search?keywords=gtk2-engines-ubuntulooks
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e302d690afb3739b90c530f5ac23ef47
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.1-r200 b/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.1-r200
index 7e897c2f6d2c..5c1fa832e57b 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.1-r200
+++ b/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.1-r200
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24 >=x11-libs/gtk+-2.20:2
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/gtk-xfce-engine/3.0/gtk-xfce-engine-3.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=c82f8742abd61cad04dfa845a5e812d1
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.1-r300 b/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.1-r300
index 25a759441b37..532a0c939711 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.1-r300
+++ b/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.1-r300
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24 >=x11-libs/gtk+-3.2:3
 SLOT=3
 SRC_URI=mirror://xfce/src/xfce/gtk-xfce-engine/3.0/gtk-xfce-engine-3.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=63d6ad6486557ac7723ed147cce7a1a6
diff --git a/metadata/md5-cache/x11-themes/nimbus-0.1.7-r1 b/metadata/md5-cache/x11-themes/nimbus-0.1.7-r1
index cab0053287b5..cb76717a9569 100644
--- a/metadata/md5-cache/x11-themes/nimbus-0.1.7-r1
+++ b/metadata/md5-cache/x11-themes/nimbus-0.1.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) dev-util/intltool virtual/pkgconfig >=x11-misc/icon-naming-utils-0.8.90 !gtk? ( || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) kernel_Interix? ( || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) >=sys-apps/sed-4
+DEPEND=gtk? ( x11-libs/gtk+:2 ) dev-util/intltool virtual/pkgconfig >=x11-misc/icon-naming-utils-0.8.90 !gtk? ( || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) kernel_Interix? ( || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) >=sys-apps/sed-4
 DESCRIPTION=The default OpenSolaris theme (GTK+ 2.x engine, icon- and metacity theme)
 EAPI=4
 HOMEPAGE=http://dlc.sun.com/osol/jds/downloads/extras/nimbus/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) !minimal? ( || ( x11-themes/gnome-icon-theme x11-themes/tango-icon-theme ) )
 SLOT=0
 SRC_URI=http://dlc.sun.com/osol/jds/downloads/extras/nimbus/nimbus-0.1.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=43333d7add3d9efe744015bf80e9a247
diff --git a/metadata/md5-cache/x11-themes/redhat-artwork-5.0.8-r4 b/metadata/md5-cache/x11-themes/redhat-artwork-5.0.8-r4
index 7224af6e2456..579ddd288d15 100644
--- a/metadata/md5-cache/x11-themes/redhat-artwork-5.0.8-r4
+++ b/metadata/md5-cache/x11-themes/redhat-artwork-5.0.8-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig dev-util/intltool media-gfx/icon-slicer >=app-arch/rpm2targz-9.0.0.3g || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 virtual/pkgconfig dev-util/intltool media-gfx/icon-slicer >=app-arch/rpm2targz-9.0.0.3g || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=RedHat's Bluecurve theme for GTK2, KDE, GDM, Metacity and Nautilus
 EAPI=2
 HOMEPAGE=http://www.redhat.com
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://fedora/development/source/SRPMS/redhat-artwork-5.0.8-4.fc7.src.rpm
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f7e9bcfe85af12cf70f0fda51512d73e
diff --git a/metadata/md5-cache/x11-themes/sound-theme-freedesktop-0.7 b/metadata/md5-cache/x11-themes/sound-theme-freedesktop-0.7
index a778874738dc..cd8e351339b2 100644
--- a/metadata/md5-cache/x11-themes/sound-theme-freedesktop-0.7
+++ b/metadata/md5-cache/x11-themes/sound-theme-freedesktop-0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=sys-devel/gettext dev-libs/glib:2 >=dev-util/intltool-0.40 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-devel/gettext dev-libs/glib:2 >=dev-util/intltool-0.40 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Default freedesktop.org sound theme following the XDG theming specification
 EAPI=2
 HOMEPAGE=http://www.freedesktop.org/wiki/Specifications/sound-theme-spec
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86
 LICENSE=GPL-2 LGPL-2 CC-BY-3.0 CC-BY-SA-2.0
 SLOT=0
 SRC_URI=http://cgit.freedesktop.org/sound-theme-freedesktop/snapshot/sound-theme-freedesktop-0.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=447f2450c1254e7d1f2dfa8abe6115c7
diff --git a/metadata/md5-cache/x11-themes/tango-icon-theme-extras-0.1.0-r1 b/metadata/md5-cache/x11-themes/tango-icon-theme-extras-0.1.0-r1
index c6a8b9858de8..94399ab696ce 100644
--- a/metadata/md5-cache/x11-themes/tango-icon-theme-extras-0.1.0-r1
+++ b/metadata/md5-cache/x11-themes/tango-icon-theme-extras-0.1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=>=x11-themes/tango-icon-theme-0.8.90 virtual/pkgconfig >=gnome-base/librsvg-2.34 || ( media-gfx/imagemagick[png?] media-gfx/graphicsmagick[imagemagick,png?] ) >=x11-misc/icon-naming-utils-0.8.90 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=x11-themes/tango-icon-theme-0.8.90 virtual/pkgconfig >=gnome-base/librsvg-2.34 || ( media-gfx/imagemagick[png?] media-gfx/graphicsmagick[imagemagick,png?] ) >=x11-misc/icon-naming-utils-0.8.90 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=Tango icons for iPod Digital Audio Player (DAP) devices and the Dell Pocket DJ DAP.
 EAPI=4
 HOMEPAGE=http://tango.freedesktop.org
@@ -10,5 +10,5 @@ RDEPEND=>=x11-themes/tango-icon-theme-0.8.90
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://tango.freedesktop.org/releases/tango-icon-theme-extras-0.1.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=59c16da136fb26ff748a02f6b5ae7d3c
diff --git a/metadata/md5-cache/x11-themes/wm-icons-0.4.0_pre1-r1 b/metadata/md5-cache/x11-themes/wm-icons-0.4.0_pre1-r1
index a7a1b2bc8610..f0e912830af5 100644
--- a/metadata/md5-cache/x11-themes/wm-icons-0.4.0_pre1-r1
+++ b/metadata/md5-cache/x11-themes/wm-icons-0.4.0_pre1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=|| ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Large Assortment of Beutiful Themed Icons, Created with FVWM in mind
 HOMEPAGE=http://wm-icons.sourceforge.net/
 KEYWORDS=alpha amd64 ia64 ppc ppc64 x86
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/awk dev-lang/perl
 SLOT=0
 SRC_URI=mirror://gentoo/wm-icons-0.4.0_pre1-cvs-01092003.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=788b2f7119296c8844ad020eb12b8f49
diff --git a/metadata/md5-cache/x11-themes/xcursor-themes-1.0.3 b/metadata/md5-cache/x11-themes/xcursor-themes-1.0.3
index 53b5c11b02f4..593595ea2334 100644
--- a/metadata/md5-cache/x11-themes/xcursor-themes-1.0.3
+++ b/metadata/md5-cache/x11-themes/xcursor-themes-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=media-libs/libpng x11-libs/libX11 x11-libs/libXcursor x11-apps/xcursorgen || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=media-libs/libpng x11-libs/libX11 x11-libs/libXcursor x11-apps/xcursorgen || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org cursor themes: whiteglass, redglass and handhelds
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=media-libs/libpng x11-libs/libX11 x11-libs/libXcursor
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xcursor-themes-1.0.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=d00b55db68e3d06b4177b5a36683c5ab
diff --git a/metadata/md5-cache/x11-themes/xfwm4-themes-4.10.0 b/metadata/md5-cache/x11-themes/xfwm4-themes-4.10.0
index 5000e208f2b8..f4f63377e25f 100644
--- a/metadata/md5-cache/x11-themes/xfwm4-themes-4.10.0
+++ b/metadata/md5-cache/x11-themes/xfwm4-themes-4.10.0
@@ -9,5 +9,5 @@ RDEPEND=>=xfce-base/xfwm4-4.10
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://xfce/src/art/xfwm4-themes/4.10/xfwm4-themes-4.10.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=9913294541f81c715c450f366c563418
diff --git a/metadata/md5-cache/x11-wm/afterstep-2.2.11 b/metadata/md5-cache/x11-wm/afterstep-2.2.11
index 1d5bef3e3f7c..6df134e5dce2 100644
--- a/metadata/md5-cache/x11-wm/afterstep-2.2.11
+++ b/metadata/md5-cache/x11-wm/afterstep-2.2.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A feature rich NeXTish window manager
 EAPI=4
 HOMEPAGE=http://www.afterstep.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=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 )
 SLOT=0
 SRC_URI=ftp://ftp.afterstep.org/stable/AfterStep-2.2.11.tar.bz2 mirror://sourceforge/afterstep/AfterStep-2.2.11.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bdff2445c33f7dfb35f9059e4d5073f1
diff --git a/metadata/md5-cache/x11-wm/afterstep-2.2.11-r1 b/metadata/md5-cache/x11-wm/afterstep-2.2.11-r1
index ea80db1e931f..2e82d4fbaecd 100644
--- a/metadata/md5-cache/x11-wm/afterstep-2.2.11-r1
+++ b/metadata/md5-cache/x11-wm/afterstep-2.2.11-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A feature rich NeXTish window manager
 EAPI=5
 HOMEPAGE=http://www.afterstep.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=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 )
 SLOT=0
 SRC_URI=ftp://ftp.afterstep.org/stable/AfterStep-2.2.11.tar.bz2 mirror://sourceforge/afterstep/AfterStep-2.2.11.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=845d4ad7f0556782547bae1be19758b6
diff --git a/metadata/md5-cache/x11-wm/afterstep-2.2.9 b/metadata/md5-cache/x11-wm/afterstep-2.2.9
index 20f4228c692e..14e3d9b48aa4 100644
--- a/metadata/md5-cache/x11-wm/afterstep-2.2.9
+++ b/metadata/md5-cache/x11-wm/afterstep-2.2.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A feature rich NeXTish window manager
 EAPI=4
 HOMEPAGE=http://www.afterstep.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=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 )
 SLOT=0
 SRC_URI=ftp://ftp.afterstep.org/stable/AfterStep-2.2.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4283aa6f45fb2eebfd318c2d13cdc3f7
diff --git a/metadata/md5-cache/x11-wm/blackbox-0.70.1 b/metadata/md5-cache/x11-wm/blackbox-0.70.1
index b7158baec6e0..55b5af2ffcbe 100644
--- a/metadata/md5-cache/x11-wm/blackbox-0.70.1
+++ b/metadata/md5-cache/x11-wm/blackbox-0.70.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libXft x11-libs/libXt nls? ( sys-devel/gettext ) truetype? ( media-libs/freetype ) virtual/pkgconfig >=sys-apps/sed-4 x11-proto/xextproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libXft x11-libs/libXt nls? ( sys-devel/gettext ) truetype? ( media-libs/freetype ) virtual/pkgconfig >=sys-apps/sed-4 x11-proto/xextproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A small, fast, full-featured window manager for X
 HOMEPAGE=http://blackboxwm.sourceforge.net/
 IUSE=nls truetype debug
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXft x11-libs/libXt nls? ( sys-devel/gettext ) truetype? ( media-libs/freetype )
 SLOT=0
 SRC_URI=mirror://sourceforge/blackboxwm/blackbox-0.70.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3ef66751762920ddd57e982e507cf579
diff --git a/metadata/md5-cache/x11-wm/compiz-0.8.8-r2 b/metadata/md5-cache/x11-wm/compiz-0.8.8-r2
index 53b2ca42beca..1249e14a07da 100644
--- a/metadata/md5-cache/x11-wm/compiz-0.8.8-r2
+++ b/metadata/md5-cache/x11-wm/compiz-0.8.8-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare prerm
-DEPEND=>=dev-libs/glib-2 dev-libs/libxml2 dev-libs/libxslt media-libs/libpng:0 >=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 virtual/glu cairo? ( x11-libs/cairo[X] ) dbus? ( >=sys-apps/dbus-1.0 dev-libs/dbus-glib ) 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 ) virtual/pkgconfig x11-proto/damageproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2 dev-libs/libxml2 dev-libs/libxslt media-libs/libpng:0 >=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 virtual/glu cairo? ( x11-libs/cairo[X] ) dbus? ( >=sys-apps/dbus-1.0 dev-libs/dbus-glib ) 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 ) virtual/pkgconfig x11-proto/damageproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=OpenGL window and compositing manager
 EAPI=5
 HOMEPAGE=http://www.compiz.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 MIT
 RDEPEND=>=dev-libs/glib-2 dev-libs/libxml2 dev-libs/libxslt media-libs/libpng:0 >=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 virtual/glu cairo? ( x11-libs/cairo[X] ) dbus? ( >=sys-apps/dbus-1.0 dev-libs/dbus-glib ) 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/xdpyinfo x11-apps/xset x11-apps/xvinfo
 SLOT=0
 SRC_URI=http://releases.compiz.org/0.8.8/compiz-0.8.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c56dae0215cc254bd44bdf55534889fa
diff --git a/metadata/md5-cache/x11-wm/compiz-0.8.8-r3 b/metadata/md5-cache/x11-wm/compiz-0.8.8-r3
index c0ceb481dd92..fb6e096a1cd0 100644
--- a/metadata/md5-cache/x11-wm/compiz-0.8.8-r3
+++ b/metadata/md5-cache/x11-wm/compiz-0.8.8-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare prerm
-DEPEND=>=dev-libs/glib-2 dev-libs/libxml2 dev-libs/libxslt media-libs/libpng:0= >=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 virtual/glu cairo? ( x11-libs/cairo[X] ) dbus? ( >=sys-apps/dbus-1.0 dev-libs/dbus-glib ) 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 ) virtual/pkgconfig x11-proto/damageproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2 dev-libs/libxml2 dev-libs/libxslt media-libs/libpng:0= >=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 virtual/glu cairo? ( x11-libs/cairo[X] ) dbus? ( >=sys-apps/dbus-1.0 dev-libs/dbus-glib ) 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 ) virtual/pkgconfig x11-proto/damageproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=OpenGL window and compositing manager
 EAPI=5
 HOMEPAGE=http://www.compiz.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 MIT
 RDEPEND=>=dev-libs/glib-2 dev-libs/libxml2 dev-libs/libxslt media-libs/libpng:0= >=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 virtual/glu cairo? ( x11-libs/cairo[X] ) dbus? ( >=sys-apps/dbus-1.0 dev-libs/dbus-glib ) 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/xdpyinfo x11-apps/xset x11-apps/xvinfo
 SLOT=0
 SRC_URI=http://releases.compiz.org/0.8.8/compiz-0.8.8.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5fb4aba10ce7d30aae8a626ab7473006
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.16.9999 b/metadata/md5-cache/x11-wm/enlightenment-0.16.9999
index 228aa241f08e..3441a7e47a96 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.16.9999
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.16.9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install preinst prepare unpack
-DEPEND=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 virtual/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[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/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[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Enlightenment Window Manager (e16)
 EAPI=4
 HOMEPAGE=http://www.enlightenment.org/
@@ -8,5 +8,5 @@ LICENSE=BSD
 PDEPEND=doc? ( app-doc/edox-data )
 RDEPEND=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
 SLOT=0
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b94770fb2117f389dad914bf4f13dfb1
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.17.2.1 b/metadata/md5-cache/x11-wm/enlightenment-0.17.2.1
index ad527bd1146c..90b12ebcf12a 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.17.2.1
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.17.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=pam? ( sys-libs/pam ) >=dev-libs/eet-1.7.6 >=dev-libs/efreet-1.7.6 >=dev-libs/eio-1.7.6 >=dev-libs/eina-1.7.6[mempool-chained] || ( >=dev-libs/ecore-1.7.6[X,evas,inotify] >=dev-libs/ecore-1.7.4[xcb,evas,inotify] ) >=media-libs/edje-1.7.6 >=dev-libs/e_dbus-1.7.6[libnotify,udev?] ukit? ( >=dev-libs/e_dbus-1.7.6[udev] ) enlightenment_modules_connman? ( >=dev-libs/e_dbus-1.7.6[connman] ) enlightenment_modules_shot? ( >=dev-libs/ecore-1.7.6[curl] ) || ( >=media-libs/evas-1.7.6[eet,X,jpeg,png] >=media-libs/evas-1.7.6[eet,xcb,jpeg,png] ) >=dev-libs/eeze-1.7.4 emotion? ( >=media-libs/emotion-1.7.6 ) x11-libs/xcb-util-keysyms || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
+DEPEND=pam? ( sys-libs/pam ) >=dev-libs/eet-1.7.6 >=dev-libs/efreet-1.7.6 >=dev-libs/eio-1.7.6 >=dev-libs/eina-1.7.6[mempool-chained] || ( >=dev-libs/ecore-1.7.6[X,evas,inotify] >=dev-libs/ecore-1.7.4[xcb,evas,inotify] ) >=media-libs/edje-1.7.6 >=dev-libs/e_dbus-1.7.6[libnotify,udev?] ukit? ( >=dev-libs/e_dbus-1.7.6[udev] ) enlightenment_modules_connman? ( >=dev-libs/e_dbus-1.7.6[connman] ) enlightenment_modules_shot? ( >=dev-libs/ecore-1.7.6[curl] ) || ( >=media-libs/evas-1.7.6[eet,X,jpeg,png] >=media-libs/evas-1.7.6[eet,xcb,jpeg,png] ) >=dev-libs/eeze-1.7.4 emotion? ( >=media-libs/emotion-1.7.6 ) x11-libs/xcb-util-keysyms || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
 DESCRIPTION=Enlightenment DR17 window manager
 EAPI=5
 HOMEPAGE=http://www.enlightenment.org/
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=pam? ( sys-libs/pam ) >=dev-libs/eet-1.7.6 >=dev-libs/efreet-1.7.6 >=dev-libs/eio-1.7.6 >=dev-libs/eina-1.7.6[mempool-chained] || ( >=dev-libs/ecore-1.7.6[X,evas,inotify] >=dev-libs/ecore-1.7.4[xcb,evas,inotify] ) >=media-libs/edje-1.7.6 >=dev-libs/e_dbus-1.7.6[libnotify,udev?] ukit? ( >=dev-libs/e_dbus-1.7.6[udev] ) enlightenment_modules_connman? ( >=dev-libs/e_dbus-1.7.6[connman] ) enlightenment_modules_shot? ( >=dev-libs/ecore-1.7.6[curl] ) || ( >=media-libs/evas-1.7.6[eet,X,jpeg,png] >=media-libs/evas-1.7.6[eet,xcb,jpeg,png] ) >=dev-libs/eeze-1.7.4 emotion? ( >=media-libs/emotion-1.7.6 ) x11-libs/xcb-util-keysyms nls? ( sys-devel/gettext )
 SLOT=0.17/0.17.2.1
 SRC_URI=http://download.enlightenment.org/releases/enlightenment-0.17.2.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	enlightenment	59018f068e8f700839d3c75f86495011	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	enlightenment	59018f068e8f700839d3c75f86495011	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d1c801f68fdb87d47df755d2b36bd118
diff --git a/metadata/md5-cache/x11-wm/icewm-1.2.37 b/metadata/md5-cache/x11-wm/icewm-1.2.37
index 1d3d184cc485..b3d10f9d3afa 100644
--- a/metadata/md5-cache/x11-wm/icewm-1.2.37
+++ b/metadata/md5-cache/x11-wm/icewm-1.2.37
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Ice Window Manager with Themes
 EAPI=1
 HOMEPAGE=http://www.icewm.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=mirror://sourceforge/icewm/icewm-1.2.37.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c8be8813aceab9ebb2683057ec290860
diff --git a/metadata/md5-cache/x11-wm/matchbox-panel-0.9.3-r1 b/metadata/md5-cache/x11-wm/matchbox-panel-0.9.3-r1
index 81c27c918df7..9dcd9407d239 100644
--- a/metadata/md5-cache/x11-wm/matchbox-panel-0.9.3-r1
+++ b/metadata/md5-cache/x11-wm/matchbox-panel-0.9.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=x11-libs/libmatchbox-1.5 startup-notification? ( x11-libs/startup-notification ) nls? ( sys-devel/gettext ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/libmatchbox-1.5 startup-notification? ( x11-libs/startup-notification ) nls? ( sys-devel/gettext ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The Matchbox Panel
 HOMEPAGE=http://matchbox-project.org/
 IUSE=acpi debug dnotify lowres nls startup-notification wifi
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/libmatchbox-1.5 startup-notification? ( x11-libs/startup-notification ) nls? ( sys-devel/gettext ) wifi? ( net-wireless/wireless-tools ) x11-wm/matchbox-common
 SLOT=0
 SRC_URI=http://matchbox-project.org/sources/matchbox-panel/0.9/matchbox-panel-0.9.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4c60f482b8f2dc625d4ebe07c0cc388e
diff --git a/metadata/md5-cache/x11-wm/muffin-1.1.2 b/metadata/md5-cache/x11-wm/muffin-1.1.2
index 491fc56480d7..3ac5b100f3f7 100644
--- a/metadata/md5-cache/x11-wm/muffin-1.1.2
+++ b/metadata/md5-cache/x11-wm/muffin-1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.10:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.3.7:3[X,introspection?] >=dev-libs/glib-2.25.10:2 >=media-libs/clutter-1.9.10:1.0=[introspection?] media-libs/cogl:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7:= >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) xinerama? ( x11-libs/libXinerama ) >=app-text/gnome-doc-utils-0.8 sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.5 ) xinerama? ( x11-proto/xineramaproto ) x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.10:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.3.7:3[X,introspection?] >=dev-libs/glib-2.25.10:2 >=media-libs/clutter-1.9.10:1.0=[introspection?] media-libs/cogl:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7:= >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) xinerama? ( x11-libs/libXinerama ) >=app-text/gnome-doc-utils-0.8 sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.5 ) xinerama? ( x11-proto/xineramaproto ) x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Compositing window manager forked from Mutter for use with Cinnamon
 EAPI=5
 HOMEPAGE=http://cinnamon.linuxmint.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.10:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.3.7:3[X,introspection?] >=dev-libs/glib-2.25.10:2 >=media-libs/clutter-1.9.10:1.0=[introspection?] media-libs/cogl:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7:= >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) xinerama? ( x11-libs/libXinerama ) !x11-misc/expocity
 SLOT=0
 SRC_URI=https://github.com/linuxmint/muffin/tarball/1.1.2 -> muffin-1.1.2.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8046b1af877db64c59fd70156512308e
diff --git a/metadata/md5-cache/x11-wm/openbox-3.5.0-r1 b/metadata/md5-cache/x11-wm/openbox-3.5.0-r1
index 0546961bb993..6fe8d3df0fc8 100644
--- a/metadata/md5-cache/x11-wm/openbox-3.5.0-r1
+++ b/metadata/md5-cache/x11-wm/openbox-3.5.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=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 virtual/pkgconfig x11-proto/xextproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig x11-proto/xextproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A standards compliant, fast, light-weight, extensible window manager
 EAPI=2
 HOMEPAGE=http://openbox.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=3
 SRC_URI=http://openbox.org/dist/openbox/openbox-3.5.0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bb2868b723c0aaa75fa079cad05e10d1
diff --git a/metadata/md5-cache/x11-wm/openbox-3.5.0_p20111019 b/metadata/md5-cache/x11-wm/openbox-3.5.0_p20111019
index 9a48b247951a..eb3bab40d54f 100644
--- a/metadata/md5-cache/x11-wm/openbox-3.5.0_p20111019
+++ b/metadata/md5-cache/x11-wm/openbox-3.5.0_p20111019
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 python? ( 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 virtual/pkgconfig x11-proto/xextproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 python? ( 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 virtual/pkgconfig x11-proto/xextproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A standards compliant, fast, light-weight, extensible window manager
 EAPI=2
 HOMEPAGE=http://openbox.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 python? ( 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
 SLOT=3
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/openbox-3.5.0_p20111019.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a2a9002895a33e51550b3d1c836b878c
diff --git a/metadata/md5-cache/x11-wm/openbox-3.5.0_p20121006 b/metadata/md5-cache/x11-wm/openbox-3.5.0_p20121006
index b09d5ba8b5b4..4a7c6971f452 100644
--- a/metadata/md5-cache/x11-wm/openbox-3.5.0_p20121006
+++ b/metadata/md5-cache/x11-wm/openbox-3.5.0_p20121006
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 python? ( 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 virtual/pkgconfig x11-proto/xextproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 python? ( 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 virtual/pkgconfig x11-proto/xextproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A standards compliant, fast, light-weight, extensible window manager
 EAPI=4
 HOMEPAGE=http://openbox.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 python? ( 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
 SLOT=3
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/openbox-3.5.0_p20121006.tar.gz branding? ( http://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b9629a29cb3e3901d11a493e9e70041b
diff --git a/metadata/md5-cache/x11-wm/openbox-3.5.0_p20130215 b/metadata/md5-cache/x11-wm/openbox-3.5.0_p20130215
index c04686c4bf4b..479e54144781 100644
--- a/metadata/md5-cache/x11-wm/openbox-3.5.0_p20130215
+++ b/metadata/md5-cache/x11-wm/openbox-3.5.0_p20130215
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 python? ( 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 virtual/pkgconfig x11-proto/xextproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 python? ( 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 virtual/pkgconfig x11-proto/xextproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A standards compliant, fast, light-weight, extensible window manager
 EAPI=4
 HOMEPAGE=http://openbox.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 python? ( 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
 SLOT=3
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/openbox-3.5.0_p20130215.tar.gz branding? ( http://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed0147edcc738cae7244c55509ee33bb
diff --git a/metadata/md5-cache/x11-wm/openbox-9999 b/metadata/md5-cache/x11-wm/openbox-9999
index 32c304e5029f..06deb26ccd48 100644
--- a/metadata/md5-cache/x11-wm/openbox-9999
+++ b/metadata/md5-cache/x11-wm/openbox-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 python? ( 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 app-text/docbook2X virtual/pkgconfig x11-proto/xextproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 python? ( 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 app-text/docbook2X virtual/pkgconfig x11-proto/xextproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=A standards compliant, fast, light-weight, extensible window manager
 EAPI=2
 HOMEPAGE=http://openbox.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 python? ( 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
 SLOT=3
 SRC_URI=branding? ( http://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=615efecc6d5c928f02bf7e46b9586c18
diff --git a/metadata/md5-cache/x11-wm/oroborus-2.0.18 b/metadata/md5-cache/x11-wm/oroborus-2.0.18
index 40c971a35d21..bda14e77a8fb 100644
--- a/metadata/md5-cache/x11-wm/oroborus-2.0.18
+++ b/metadata/md5-cache/x11-wm/oroborus-2.0.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libXpm x11-libs/libXext x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-proto/xproto x11-proto/xextproto || ( >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libXpm x11-libs/libXext x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-proto/xproto x11-proto/xextproto || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Small and fast window manager.
 HOMEPAGE=http://www.oroborus.org
 IUSE=gnome
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXpm x11-libs/libXext x11-libs/libSM x11-libs/libICE x11-libs/libX11
 SLOT=0
 SRC_URI=http://www.oroborus.org/debian/dists/sid/main/source/x11/oroborus_2.0.18.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
 _md5_=98af4eb094a959d2e71268f5fb818067
diff --git a/metadata/md5-cache/x11-wm/ratpoison-1.4.5 b/metadata/md5-cache/x11-wm/ratpoison-1.4.5
index 80f8930a3395..1cd4afb9647e 100644
--- a/metadata/md5-cache/x11-wm/ratpoison-1.4.5
+++ b/metadata/md5-cache/x11-wm/ratpoison-1.4.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=x11-libs/libXinerama x11-libs/libXtst virtual/perl-PodParser emacs? ( virtual/emacs ) history? ( sys-libs/readline ) xft? ( x11-libs/libXft ) || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libXinerama x11-libs/libXtst virtual/perl-PodParser emacs? ( virtual/emacs ) history? ( sys-libs/readline ) xft? ( x11-libs/libXft ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Ratpoison is an extremely light-weight and barebones wm modelled after screen
 EAPI=3
 HOMEPAGE=http://www.nongnu.org/ratpoison/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXinerama x11-libs/libXtst virtual/perl-PodParser emacs? ( virtual/emacs ) history? ( sys-libs/readline ) xft? ( x11-libs/libXft )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/ratpoison/ratpoison-1.4.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0cf92ced4e7300b34c9afd9b87a34f62
diff --git a/metadata/md5-cache/x11-wm/selectwm-0.4.1 b/metadata/md5-cache/x11-wm/selectwm-0.4.1
index 5266aa7e3475..6874247c96d4 100644
--- a/metadata/md5-cache/x11-wm/selectwm-0.4.1
+++ b/metadata/md5-cache/x11-wm/selectwm-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=window manager selector tool
 EAPI=1
 HOMEPAGE=http://ordiluc.net/selectwm
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2
 SLOT=2
 SRC_URI=http://ordiluc.net/selectwm/selectwm-0.4.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2f9867e2d3eff752acd6f85632dbdaac
diff --git a/metadata/md5-cache/x11-wm/twm-1.0.6 b/metadata/md5-cache/x11-wm/twm-1.0.6
index b7c82f72d75e..d72008cf5587 100644
--- a/metadata/md5-cache/x11-wm/twm-1.0.6
+++ b/metadata/md5-cache/x11-wm/twm-1.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libICE x11-libs/libSM sys-devel/bison || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libICE x11-libs/libSM sys-devel/bison || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org twm application
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libICE x11-libs/libSM
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/twm-1.0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=148cf7f11c3b78efb39903e334cf891f
diff --git a/metadata/md5-cache/x11-wm/twm-1.0.7 b/metadata/md5-cache/x11-wm/twm-1.0.7
index a2ecafe6de5a..17ce0f3143b3 100644
--- a/metadata/md5-cache/x11-wm/twm-1.0.7
+++ b/metadata/md5-cache/x11-wm/twm-1.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libICE x11-libs/libSM sys-devel/bison || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libICE x11-libs/libSM sys-devel/bison || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org twm application
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libICE x11-libs/libSM
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/twm-1.0.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	autotools-utils	7c1dc0608214b369c4dc38ab6427e729	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
 _md5_=5154f5a6712c9bbd6daa64ff80cd78c6
diff --git a/metadata/md5-cache/x11-wm/windowmaker-0.92.0-r11 b/metadata/md5-cache/x11-wm/windowmaker-0.92.0-r11
index c03a83f1d058..018d08dada96 100644
--- a/metadata/md5-cache/x11-wm/windowmaker-0.92.0-r11
+++ b/metadata/md5-cache/x11-wm/windowmaker-0.92.0-r11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The fast and light GNUstep window manager
 EAPI=3
 HOMEPAGE=http://www.windowmaker.info/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6c682d776e6e7e5941a9e9a341c70092
diff --git a/metadata/md5-cache/x11-wm/windowmaker-0.95.3-r1 b/metadata/md5-cache/x11-wm/windowmaker-0.95.3-r1
index f5b97b53b559..540577ffc231 100644
--- a/metadata/md5-cache/x11-wm/windowmaker-0.95.3-r1
+++ b/metadata/md5-cache/x11-wm/windowmaker-0.95.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The fast and light GNUstep window manager
 EAPI=4
 HOMEPAGE=http://www.windowmaker.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://windowmaker.org/pub/source/release/WindowMaker-0.95.3.tar.gz http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f9e6c40588ada6845493a911d07b0651
diff --git a/metadata/md5-cache/x11-wm/windowmaker-0.95.4 b/metadata/md5-cache/x11-wm/windowmaker-0.95.4
index 7589a2cedaf0..801304277707 100644
--- a/metadata/md5-cache/x11-wm/windowmaker-0.95.4
+++ b/metadata/md5-cache/x11-wm/windowmaker-0.95.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The fast and light GNUstep window manager
 EAPI=4
 HOMEPAGE=http://www.windowmaker.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://windowmaker.org/pub/source/release/WindowMaker-0.95.4.tar.gz http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=edecfab644ed4d95459cf1b4b1794cc3
diff --git a/metadata/md5-cache/x11-wm/windowmaker-0.95.4-r1 b/metadata/md5-cache/x11-wm/windowmaker-0.95.4-r1
index 07a2b9f9213f..f88879692652 100644
--- a/metadata/md5-cache/x11-wm/windowmaker-0.95.4-r1
+++ b/metadata/md5-cache/x11-wm/windowmaker-0.95.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=The fast and light GNUstep window manager
 EAPI=5
 HOMEPAGE=http://www.windowmaker.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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 )
 SLOT=0
 SRC_URI=http://windowmaker.org/pub/source/release/WindowMaker-0.95.4.tar.gz http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	eutils	36e6377b0e31856b6d62af831661c4f3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=581b6ffff5bb0fb41c8b0b2ecf0c4962
diff --git a/metadata/md5-cache/xfce-base/exo-0.10.2 b/metadata/md5-cache/xfce-base/exo-0.10.2
index bc2063729787..2170de6b397d 100644
--- a/metadata/md5-cache/xfce-base/exo-0.10.2
+++ b/metadata/md5-cache/xfce-base/exo-0.10.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30 dev-perl/URI >=x11-libs/gtk+-2.24:2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/exo/0.10/exo-0.10.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=bd98fc2c89def4cbae0db0a81cda4386
diff --git a/metadata/md5-cache/xfce-base/exo-0.8.0 b/metadata/md5-cache/xfce-base/exo-0.8.0
index 2c4b00f44fbc..159fa29f9059 100644
--- a/metadata/md5-cache/xfce-base/exo-0.8.0
+++ b/metadata/md5-cache/xfce-base/exo-0.8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.24 dev-perl/URI >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/exo/0.8/exo-0.8.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=c708fd75a3c78b6b2904f04a518760c9
diff --git a/metadata/md5-cache/xfce-base/garcon-0.2.0 b/metadata/md5-cache/xfce-base/garcon-0.2.0
index f60b232467ed..be5e6ea435f7 100644
--- a/metadata/md5-cache/xfce-base/garcon-0.2.0
+++ b/metadata/md5-cache/xfce-base/garcon-0.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 FDL-1.1
 RDEPEND=>=dev-libs/glib-2.14 >=xfce-base/libxfce4util-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/libs/garcon/0.2/garcon-0.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=2dde3f4f4529bbd43535c5717d155e7c
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.10.0 b/metadata/md5-cache/xfce-base/libxfce4ui-4.10.0
index d2d908fa1b21..6933fc632240 100644
--- a/metadata/md5-cache/xfce-base/libxfce4ui-4.10.0
+++ b/metadata/md5-cache/xfce-base/libxfce4ui-4.10.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.24 >=x11-libs/gtk+-2.20:2 x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 glade? ( dev-util/glade:3 ) startup-notification? ( x11-libs/startup-notification ) !xfce-base/xfce-utils
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/libxfce4ui/4.10/libxfce4ui-4.10.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=74ec3093383bbc7f9cd11c86b24d0d4c
diff --git a/metadata/md5-cache/xfce-base/libxfce4util-4.10.0 b/metadata/md5-cache/xfce-base/libxfce4util-4.10.0
index d9f9e61e6a1e..95d18255cc72 100644
--- a/metadata/md5-cache/xfce-base/libxfce4util-4.10.0
+++ b/metadata/md5-cache/xfce-base/libxfce4util-4.10.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.24
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/libxfce4util/4.10/libxfce4util-4.10.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=78f1e4ead00a8f512a86bd789c647eb5
diff --git a/metadata/md5-cache/xfce-base/libxfcegui4-4.10.0 b/metadata/md5-cache/xfce-base/libxfcegui4-4.10.0
index 67a3d0e9ca9d..f5f5b5f4ab77 100644
--- a/metadata/md5-cache/xfce-base/libxfcegui4-4.10.0
+++ b/metadata/md5-cache/xfce-base/libxfcegui4-4.10.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=gnome-base/libglade x11-libs/libSM x11-libs/libX11 >=x11-libs/gtk+-2.10:2 >=xfce-base/libxfce4util-4.8 glade? ( dev-util/glade:3 ) startup-notification? ( x11-libs/startup-notification )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/libxfcegui4/4.10/libxfcegui4-4.10.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=700e46d37e6f9137c9956f62ce5cf799
diff --git a/metadata/md5-cache/xfce-base/thunar-1.4.0 b/metadata/md5-cache/xfce-base/thunar-1.4.0
index 6a141911a63b..82ce52f97a4e 100644
--- a/metadata/md5-cache/xfce-base/thunar-1.4.0
+++ b/metadata/md5-cache/xfce-base/thunar-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.24 >=x11-libs/gtk+-2.20:2 >=xfce-b
 REQUIRED_USE=xfce_plugins_trash? ( dbus )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/thunar/1.4/Thunar-1.4.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=6f8ce6e8d538a34286d299efc7564542
diff --git a/metadata/md5-cache/xfce-base/thunar-1.6.2 b/metadata/md5-cache/xfce-base/thunar-1.6.2
index 0bcbc2fc1101..9483c90f345e 100644
--- a/metadata/md5-cache/xfce-base/thunar-1.6.2
+++ b/metadata/md5-cache/xfce-base/thunar-1.6.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30 >=x11-libs/gdk-pixbuf-2.14 >=x1
 REQUIRED_USE=xfce_plugins_trash? ( dbus )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/thunar/1.6/Thunar-1.6.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=e5eaa911e25902dbeb75d6df5b070c16
diff --git a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.10.0 b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.10.0
index 96a513af09bc..7baac93ca8d1 100644
--- a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.10.0
+++ b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.10.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.24 >=x11-libs/gtk+-2.20:2 >=xfce-base/garcon-0.2 >=xfce-base/libxfce4util-4.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/xfconf-4.10 !xfce-base/xfce-utils
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfce4-appfinder/4.10/xfce4-appfinder-4.10.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=fe02ea5cf3ad2319f6f33b86d52e094c
diff --git a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.10.0-r1 b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.10.0-r1
index 331dc2de9dae..ed2dc8382799 100644
--- a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.10.0-r1
+++ b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.10.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 >=x11-libs/gtk+-2.20:2 >=xfce-base/garcon-0.2 >=xfce-base/libxfce4util-4.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/xfconf-4.10 !xfce-base/xfce-utils
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfce4-appfinder/4.10/xfce4-appfinder-4.10.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=2cabd400b1f10b1cc786eb3bde023309
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.10.0 b/metadata/md5-cache/xfce-base/xfce4-panel-4.10.0
index 2855c2813c01..352720337511 100644
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.10.0
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.10.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.24 >=x11-libs/cairo-1 >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.31:1 >=xfce-base/exo-0.8 >=xfce-base/garcon-0.2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfce4-panel/4.10/xfce4-panel-4.10.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=bc784ba0943ce3c4afebfb509afddf93
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.10.0-r1 b/metadata/md5-cache/xfce-base/xfce4-panel-4.10.0-r1
index 614e0f7282e9..aacabb101cb7 100644
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.10.0-r1
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.10.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 >=x11-libs/cairo-1 >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.31:1 >=xfce-base/exo-0.8 >=xfce-base/garcon-0.2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfce4-panel/4.10/xfce4-panel-4.10.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=9dd0e048ff93ef4741d40946f961bd7f
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.10.0 b/metadata/md5-cache/xfce-base/xfce4-session-4.10.0
index a30fa7f5c16e..add852ea3b0e 100644
--- a/metadata/md5-cache/xfce-base/xfce4-session-4.10.0
+++ b/metadata/md5-cache/xfce-base/xfce4-session-4.10.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.98 x11-apps/iceauth x11-libs/libSM >=x11-libs/libwnck-2.30:1 x11-libs/libX11 >=xfce-base/libxfce4util-4.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/xfconf-4.10 gnome-keyring? ( >=gnome-base/libgnome-keyring-2.22 ) !xfce-base/xfce-utils x11-apps/xrdb x11-misc/xdg-user-dirs consolekit? ( || ( sys-auth/consolekit >=sys-apps/systemd-40 ) ) policykit? ( >=sys-auth/polkit-0.104-r1 ) udev? ( >=sys-power/upower-0.9.15 ) xscreensaver? ( || ( >=x11-misc/xscreensaver-5.15 gnome-extra/gnome-screensaver >=x11-misc/xlockmore-5.38 >=x11-misc/slock-1 ) )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfce4-session/4.10/xfce4-session-4.10.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=f162bb73e38a5cd80d62e5356d983387
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.10.0-r1 b/metadata/md5-cache/xfce-base/xfce4-session-4.10.0-r1
index dd4bf8598b3b..407f88979a3d 100644
--- a/metadata/md5-cache/xfce-base/xfce4-session-4.10.0-r1
+++ b/metadata/md5-cache/xfce-base/xfce4-session-4.10.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.98 x11-apps/iceauth x11-libs/libSM >=x11-libs/libwnck-2.30:1 x11-libs/libX11 >=xfce-base/libxfce4util-4.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/xfconf-4.10 gnome-keyring? ( >=gnome-base/libgnome-keyring-2.22 ) !xfce-base/xfce-utils x11-apps/xrdb x11-misc/xdg-user-dirs consolekit? ( || ( sys-auth/consolekit >=sys-apps/systemd-40 ) ) policykit? ( >=sys-auth/polkit-0.104-r1 ) udev? ( >=sys-power/upower-0.9.15 ) xscreensaver? ( || ( >=x11-misc/xscreensaver-5.15 gnome-extra/gnome-screensaver >=x11-misc/xlockmore-5.38 >=x11-misc/slock-1 ) )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfce4-session/4.10/xfce4-session-4.10.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=cdecc54b43bd7ce07138125bb9bc5b33
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.10.0 b/metadata/md5-cache/xfce-base/xfce4-settings-4.10.0
index 2aed59a97f57..5d6c31ac4091 100644
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.10.0
+++ b/metadata/md5-cache/xfce-base/xfce4-settings-4.10.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.24 media-libs/fontconfig >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.8 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) libnotify? ( >=x11-libs/libnotify-0.7 ) xklavier? ( >=x11-libs/libxklavier-5 )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfce4-settings/4.10/xfce4-settings-4.10.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=823c7c711e307886455a59e85af4c59d
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.10.0 b/metadata/md5-cache/xfce-base/xfconf-4.10.0
index 384c50695270..e050b9fbaabb 100644
--- a/metadata/md5-cache/xfce-base/xfconf-4.10.0
+++ b/metadata/md5-cache/xfce-base/xfconf-4.10.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.24 >=xfce-base/libxfce4util-4.10 perl? ( dev-perl/glib-perl )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfconf/4.10/xfconf-4.10.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=62dd8cfe8d68b6ec79c92261c607be64
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.10.0 b/metadata/md5-cache/xfce-base/xfdesktop-4.10.0
index 5a7338fc5cb6..fcb54e292190 100644
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.10.0
+++ b/metadata/md5-cache/xfce-base/xfdesktop-4.10.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-2.24:2 x11-libs/libSM >=x11-libs/libwnck-2.30:1 x11-libs/libX11 >=xfce-base/exo-0.8 >=xfce-base/garcon-0.2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libnotify? ( >=x11-libs/libnotify-0.7 ) thunar? ( >=xfce-base/thunar-1.4[dbus] >=dev-libs/dbus-glib-0.98 )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfdesktop/4.10/xfdesktop-4.10.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=14f8b2888dc79bf562b7954a21f4fde6
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.10.2 b/metadata/md5-cache/xfce-base/xfdesktop-4.10.2
index 03daffda737d..5f7f8220accc 100644
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.10.2
+++ b/metadata/md5-cache/xfce-base/xfdesktop-4.10.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-2.24:2 x11-libs/libSM >=x11-libs/libwnck-2.30:1 x11-libs/libX11 >=xfce-base/exo-0.8 >=xfce-base/garcon-0.2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libnotify? ( >=x11-libs/libnotify-0.7 ) thunar? ( >=xfce-base/thunar-1.6[dbus] >=dev-libs/dbus-glib-0.100 )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfdesktop/4.10/xfdesktop-4.10.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=b27d2cbd99f199e6f35cfea736cdf072
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.10.0 b/metadata/md5-cache/xfce-base/xfwm4-4.10.0
index 79a5508dfb4c..4867992acfb5 100644
--- a/metadata/md5-cache/xfce-base/xfwm4-4.10.0
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.10.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-2.24:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/pango >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4util-4.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/xfconf-4.10 startup-notification? ( x11-libs/startup-notification ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfwm4/4.10/xfwm4-4.10.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=9fc519d319beff485eed6de59276a68e
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.10.0-r1 b/metadata/md5-cache/xfce-base/xfwm4-4.10.0-r1
index af960b3b6852..7567c7bfbb02 100644
--- a/metadata/md5-cache/xfce-base/xfwm4-4.10.0-r1
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.10.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-2.24:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/pango >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4util-4.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/xfconf-4.10 startup-notification? ( x11-libs/startup-notification ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfwm4/4.10/xfwm4-4.10.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=a8bd1ec8787d01178c1a1024276546db
diff --git a/metadata/md5-cache/xfce-extra/eatmonkey-0.1.4 b/metadata/md5-cache/xfce-extra/eatmonkey-0.1.4
index a78711b9b727..1bd247a073aa 100644
--- a/metadata/md5-cache/xfce-extra/eatmonkey-0.1.4
+++ b/metadata/md5-cache/xfce-extra/eatmonkey-0.1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-2.12:2 dev-libs/libunique:1 >=xfce-base/libxfce4util-4.8 >=net-libs/libsoup-2.26:2.4 >=net-misc/aria2-1.9.0[bittorrent,xmlrpc] dev-lang/ruby dev-ruby/ruby-glib2 dev-ruby/ruby-gtk2
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/eatmonkey/0.1/eatmonkey-0.1.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=9c7d79bf9faec3985fc29bb9c5791265
diff --git a/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.0 b/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.0
index 91d680b8cad3..efaa36af5eb3 100644
--- a/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.0
+++ b/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=xfce-base/libxfce4util-4.8 >=xfce-base/exo-0.6 >=xfce-base/thunar-1.2
 SLOT=0
 SRC_URI=mirror://xfce/src/thunar-plugins/thunar-archive-plugin/0.3/thunar-archive-plugin-0.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=a1f233b7182f378e70fd667f43e0dc55
diff --git a/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.2.0 b/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.2.0
index 7d471f98a308..1d909da8f2f8 100644
--- a/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.2.0
+++ b/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=media-libs/taglib-1.6 >=x11-libs/gtk+-2.12:2 >=xfce-base/exo-0.6 >=xfce-base/thunar-1.2 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/taglib-1.6 >=x11-libs/gtk+-2.12:2 >=xfce-base/exo-0.6 >=xfce-base/thunar-1.2 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Adds special features for media files to the Thunar File Manager
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/taglib-1.6 >=x11-libs/gtk+-2.12:2 >=xfce-base/exo-0.6 >=xfce-base/thunar-1.2
 SLOT=0
 SRC_URI=mirror://xfce/src/thunar-plugins/thunar-media-tags-plugin/0.2/thunar-media-tags-plugin-0.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=9caac93499bb3ff149a017ef702193c6
diff --git a/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.2.0_p20101105 b/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.2.0_p20101105
index ad3016d3d6b5..1fa4f3b67830 100644
--- a/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.2.0_p20101105
+++ b/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.2.0_p20101105
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.18 >=x11-libs/gtk+-2.12:2 >=xfce-base/thunar-1.2 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.18 >=x11-libs/gtk+-2.12:2 >=xfce-base/thunar-1.2 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Thunar plugin to share files using Samba
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/thunar-plugins/thunar-shares-plugin
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18 >=x11-libs/gtk+-2.12:2 >=xfce-base/thunar-1.2
 SLOT=0
 SRC_URI=mirror://gentoo/thunar-shares-plugin-0.2.0_p20101105.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=7c460ad7e0c026df1228cc2745daf746
diff --git a/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.1.4 b/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.1.4
index 59a0daebb64d..ccb75a029265 100644
--- a/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.1.4
+++ b/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18 >=x11-libs/gtk+-2.14:2 >=xfce-base/exo-0.6 >=xfce-base/libxfce4util-4.8 >=xfce-base/thunar-1.2 git? ( dev-vcs/git ) subversion? ( >=dev-libs/apr-0.9.7 >=dev-vcs/subversion-1.5 )
 SLOT=0
 SRC_URI=mirror://xfce/src/thunar-plugins/thunar-vcs-plugin/0.1/thunar-vcs-plugin-0.1.4.tar.bz2 http://dev.gentoo.org/~ssuominen/thunar-vcs-plugin-0.1.4-el.po.bz2 http://dev.gentoo.org/~ssuominen/thunar-vcs-plugin-0.1.4-eu.po.bz2 mirror://gentoo/thunar-vcs-plugin-0.1.4-ru.po.bz2 http://dev.gentoo.org/~ssuominen/thunar-vcs-plugin-0.1.4-ug.po.bz2 http://dev.gentoo.org/~ssuominen/thunar-vcs-plugin-0.1.4-uk.po.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=f636ebc31f7c07b294f01d6574ddc621
diff --git a/metadata/md5-cache/xfce-extra/thunar-volman-0.8.0 b/metadata/md5-cache/xfce-extra/thunar-volman-0.8.0
index 5ae4f4bf8fc5..85075b66e63d 100644
--- a/metadata/md5-cache/xfce-extra/thunar-volman-0.8.0
+++ b/metadata/md5-cache/xfce-extra/thunar-volman-0.8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20 virtual/udev[gudev] >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.8 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libnotify? ( >=x11-libs/libnotify-0.7 ) >=xfce-base/thunar-1.4[udev]
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/thunar-volman/0.8/thunar-volman-0.8.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=2e7cfa2ae16007ae26d3ce70040e9a62
diff --git a/metadata/md5-cache/xfce-extra/transd-0_p20120503 b/metadata/md5-cache/xfce-extra/transd-0_p20120503
index 22ca7aef6d3d..e017c2a76d38 100644
--- a/metadata/md5-cache/xfce-extra/transd-0_p20120503
+++ b/metadata/md5-cache/xfce-extra/transd-0_p20120503
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=x11-libs/libX11 >=xfce-base/libxfce4util-4.8 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/libX11 >=xfce-base/libxfce4util-4.8 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A small daemon to watch for window creation and set window transparency values
 EAPI=5
 HOMEPAGE=http://spuriousinterrupt.org/projects/transd
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libX11 >=xfce-base/libxfce4util-4.8
 SLOT=0
 SRC_URI=mirror://gentoo/transd-0_p20120503.tar.xz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=c797111c736221a37231aad0ef28f5e0
diff --git a/metadata/md5-cache/xfce-extra/tumbler-0.1.25 b/metadata/md5-cache/xfce-extra/tumbler-0.1.25
index dd9d47cfdd0d..cbbc496efd0e 100644
--- a/metadata/md5-cache/xfce-extra/tumbler-0.1.25
+++ b/metadata/md5-cache/xfce-extra/tumbler-0.1.25
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.20 media-libs/freetype:2 >=media-libs/libpng-1.2:0 >=sys-apps/dbus-1.4.16 x11-libs/gdk-pixbuf:2 ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.7 ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-base-0.10* ) jpeg? ( virtual/jpeg ) odf? ( >=gnome-extra/libgsf-1.14.20 ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8[gtk] ) >=xfce-base/thunar-1.4
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/tumbler/0.1/tumbler-0.1.25.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=6c28fd03c366cd201e6156be7c60d165
diff --git a/metadata/md5-cache/xfce-extra/tumbler-0.1.27 b/metadata/md5-cache/xfce-extra/tumbler-0.1.27
index 800947209f18..8d2d8ff20df3 100644
--- a/metadata/md5-cache/xfce-extra/tumbler-0.1.27
+++ b/metadata/md5-cache/xfce-extra/tumbler-0.1.27
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.24:2= media-libs/freetype:2= >=media-libs/libpng-1.2:0= >=sys-apps/dbus-1.6:= >=x11-libs/gdk-pixbuf-2.14:2= curl? ( net-misc/curl:= ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( =media-libs/gstreamer-1.0* =media-libs/gst-plugins-base-1.0* ) jpeg? ( virtual/jpeg ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4:=[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.24:2= media-libs/freetype:2= >=media-libs/libpng-1.2:0= >=sys-apps/dbus-1.6:= >=x11-libs/gdk-pixbuf-2.14:2= curl? ( net-misc/curl:= ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( =media-libs/gstreamer-1.0* =media-libs/gst-plugins-base-1.0* ) jpeg? ( virtual/jpeg ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4:=[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A thumbnail service for the filemanager of Xfce desktop environment
 EAPI=5
 HOMEPAGE=http://www.xfce.org/projects/thunar/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.24:2= media-libs/freetype:2= >=media-libs/libpng-1.2:0= >=sys-apps/dbus-1.6:= >=x11-libs/gdk-pixbuf-2.14:2= curl? ( net-misc/curl:= ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( =media-libs/gstreamer-1.0* =media-libs/gst-plugins-base-1.0* ) jpeg? ( virtual/jpeg ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4:=[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] ) >=xfce-base/thunar-1.4
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/tumbler/0.1/tumbler-0.1.27.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=e1edd8a873b541b9c4a42362209fe388
diff --git a/metadata/md5-cache/xfce-extra/xfce-theme-manager-0.1.20 b/metadata/md5-cache/xfce-extra/xfce-theme-manager-0.1.20
index d00684fef04c..914f3aa6f902 100644
--- a/metadata/md5-cache/xfce-extra/xfce-theme-manager-0.1.20
+++ b/metadata/md5-cache/xfce-extra/xfce-theme-manager-0.1.20
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXcursor >=xfce-base/libxfce4ui-4.10
 SLOT=0
 SRC_URI=http://keithhedger.hostingsiteforfree.com/zips/xfcethememanager/Xfce-Theme-Manager-0.1.20.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=f79f54eea9a6d5a1cd8e502dea341054
diff --git a/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.0.5 b/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.0.5
index a1d84beb122f..b1dec937d781 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.0.5
+++ b/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-libs/glib-2.24 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-battery-plugin/1.0/xfce4-battery-plugin-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=086648af242ba9edc47e6297f7133aab
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cellmodem-plugin-0.0.5 b/metadata/md5-cache/xfce-extra/xfce4-cellmodem-plugin-0.0.5
index 67d08e569e05..fe2a5111c677 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-cellmodem-plugin-0.0.5
+++ b/metadata/md5-cache/xfce-extra/xfce4-cellmodem-plugin-0.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=sys-apps/pciutils virtual/libusb:0 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/pciutils virtual/libusb:0 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A panel plug-in with monitoring support for GPRS/UMTS(3G)/HSDPA(3.5G) modems
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/panel-plugins/xfce4-cellmodem-plugin
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils virtual/libusb:0 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-cellmodem-plugin/0.0/xfce4-cellmodem-plugin-0.0.5.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=94281860f342f0ea69054c168e1c7146
diff --git a/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.2.3 b/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.2.3
index d44d4cc7288a..df0d48c3f969 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.2.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18 dev-libs/libunique:1 >=x11-libs/gtk+-2.14:2 x11-libs/libXtst >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 >=xfce-base/xfconf-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-clipman-plugin/1.2/xfce4-clipman-plugin-1.2.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=6e9d4559773c42e970e5e9590a601681
diff --git a/metadata/md5-cache/xfce-extra/xfce4-composite-editor-0 b/metadata/md5-cache/xfce-extra/xfce4-composite-editor-0
index 81e8f85bf8f5..800bc0284053 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-composite-editor-0
+++ b/metadata/md5-cache/xfce-extra/xfce4-composite-editor-0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=app-shells/bash >=x11-misc/gtkdialog-0.8
 SLOT=0
 SRC_URI=http://keithhedger.hostingsiteforfree.com/zips/Xfce4-Composite-Editor.tar.gz -> Xfce4-Composite-Editor-0.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=02a2236bfb532aa12a807f086e02e87c
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.0.0 b/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.0.0
index e5c69377e425..cdc94e6c0209 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.0.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-cpufreq-plugin/1.0/xfce4-cpufreq-plugin-1.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=8b2a91d2ffbd54fd2d81841c10836fd8
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5 b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5
index ba607b71bc84..43acd09c52a6 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5
+++ b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5
@@ -9,5 +9,5 @@ LICENSE=BSD-2 GPL-2
 RDEPEND=>=x11-libs/gtk+-2.12:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-cpugraph-plugin/1.0/xfce4-cpugraph-plugin-1.0.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=0020fa2b765842abd9cc400aa682c8ef
diff --git a/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.6.1 b/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.6.1
index 0edad78e9b23..9deb1eb7f190 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.6.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.6.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.6:2 >=xfce-base/libxfce4util-4.3.99.2 >=xfce-base/libxfcegui4-4.3.99.2 >=xfce-base/xfce4-panel-4.3.99.2
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-datetime-plugin/0.6/xfce4-datetime-plugin-0.6.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=5f56a68472a850e96781f405a64cd430
diff --git a/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.6.2 b/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.6.2
index 3d85e22e2b0a..10f65d088234 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.6.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.6.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.24:2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-datetime-plugin/0.6/xfce4-datetime-plugin-0.6.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=4db614cd58ec7929b8dd5cb8097d90bc
diff --git a/metadata/md5-cache/xfce-extra/xfce4-dict-0.6.0 b/metadata/md5-cache/xfce-extra/xfce4-dict-0.6.0
index 6980ae621c8b..46372611a0b3 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-dict-0.6.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-dict-0.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.24 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.24 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A dict.org querying application and panel plug-in for the Xfce desktop
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/applications/xfce4-dict
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/xfce4-dict/0.6/xfce4-dict-0.6.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=ab8604cf54fc2b10521b15f9d5a66057
diff --git a/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.5.4 b/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.5.4
index 4b9ec8ee6088..730b4a7ec4d2 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.5.4
+++ b/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.5.4
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=xfce-base/libxfce4ui-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-diskperf-plugin/2.5/xfce4-diskperf-plugin-2.5.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=758cb33b9e44f860e2cfde70571104d3
diff --git a/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.0.0 b/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.0.0
index f36a9fca0e27..af8940e9be39 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.0.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-embed-plugin/1.0/xfce4-embed-plugin-1.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=7a66bf87f7442f26dfa869edba7715e4
diff --git a/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.2.0 b/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.2.0
index 9875b459d3a9..15ff955d68a7 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.2.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-embed-plugin/1.2/xfce4-embed-plugin-1.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=fa146616b7c3b69fdfe9423892d6dfa5
diff --git a/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.1-r1 b/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.1-r1
index ff6a42735c77..8f90e840a4ab 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.1-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=x11-libs/gtk+:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=x11-libs/gtk+:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A panel plug-in which adds classic eyes to your every step
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-eyes-plugin/4.4/xfce4-eyes-plugin-4.4.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=4b714b9fa0061fa0d0948c0aae6261f2
diff --git a/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.2 b/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.2
index f6c259d12f36..94476447190c 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-2.14:2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-eyes-plugin/4.4/xfce4-eyes-plugin-4.4.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=6f9543caebd4528107d9fade6aca51c3
diff --git a/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.0.1 b/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.0.1
index e8ad9c1cad6c..64c364d78591 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.0.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-fsguard-plugin/1.0/xfce4-fsguard-plugin-1.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=3902c710e7029040f46eb01589ce5f2d
diff --git a/metadata/md5-cache/xfce-extra/xfce4-genmon-plugin-3.4.0 b/metadata/md5-cache/xfce-extra/xfce4-genmon-plugin-3.4.0
index 97f71b059235..b496646c4e62 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-genmon-plugin-3.4.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-genmon-plugin-3.4.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=xfce-base/libxfce4ui-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-genmon-plugin/3.4/xfce4-genmon-plugin-3.4.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=e7a1147377e02ac0a50cd334292ac039
diff --git a/metadata/md5-cache/xfce-extra/xfce4-gvfs-mount-0.0.4 b/metadata/md5-cache/xfce-extra/xfce4-gvfs-mount-0.0.4
index e28fab08b0cf..c716fdc1dfd6 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-gvfs-mount-0.0.4
+++ b/metadata/md5-cache/xfce-extra/xfce4-gvfs-mount-0.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.24 >=gnome-base/libglade-2.6 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-gvfs-mount/0.0/xfce4-gvfs-mount-0.0.4-6d2684b.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=7dd52c4ac89e1efd81c4b73e616b5b31
diff --git a/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9 b/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9
index eeab3595aab8..7fea87cbb0be 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9
+++ b/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 >=app-laptop/hdapsd-20090101 >=app-laptop/tp_smapi-0.39
 SLOT=0
 SRC_URI=http://michael.orlitzky.com/code/releases/xfce4-hdaps-0.0.9.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=2f4b0e0b87bfdf9210b3fd9cb8fffe73
diff --git a/metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-0.5.0 b/metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-0.5.0
index 8e21e031fc70..c5c9db06271d 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-0.5.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-libs/libindicator-0.4:0 >=x11-libs/gtk+-2.14:2 x11-libs/libX11 >=xfce-base/exo-0.6 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 >=xfce-base/xfconf-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-indicator-plugin/0.5/xfce4-indicator-plugin-0.5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=f35dc773146a3a4fe1657c571f8d121c
diff --git a/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6 b/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6
index b38bb55f3c5d..1808f0c29e18 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6
+++ b/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 >=x11-libs/gtk+-2.20:2
 SLOT=0
 SRC_URI=http://compas.com.ua/oco/file/xfce4-kbdleds-plugin-0.0.6.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=c5533ea10add91bac0853c22c0f68af8
diff --git a/metadata/md5-cache/xfce-extra/xfce4-linelight-plugin-0.1.7 b/metadata/md5-cache/xfce-extra/xfce4-linelight-plugin-0.1.7
index cd59c3968c15..6d6d5abc9f03 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-linelight-plugin-0.1.7
+++ b/metadata/md5-cache/xfce-extra/xfce4-linelight-plugin-0.1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.12:2 >=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfcegui4-4.8 virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.12:2 >=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfcegui4-4.8 virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A simple locate based search plug-in for the Xfce panel
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/panel-plugins/xfce4-linelight-plugin
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.12:2 >=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfcegui4-4.8 sys-apps/mlocate
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xfce4-linelight-plugin/xfce4-linelight-plugin_0.1.7.orig.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=6da8fb7e40616169421fd9216c9ba598
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.1.0-r1 b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.1.0-r1
index 7b63910ee601..3847bc948d76 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.1.0-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 ssl? ( dev-libs/libgcrypt >=net-libs/gnutls-2 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 ssl? ( dev-libs/libgcrypt >=net-libs/gnutls-2 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An mail notification panel plug-in for the Xfce desktop environment
 EAPI=5
 HOMEPAGE=http://spuriousinterrupt.org/projects/xfce4-mailwatch-plugin/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 ssl? ( dev-libs/libgcrypt >=net-libs/gnutls-2 )
 SLOT=0
 SRC_URI=mirror://gentoo/xfce4-mailwatch-plugin-1.1.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=56efe3ad8d1a26da8d521013070e1d34
diff --git a/metadata/md5-cache/xfce-extra/xfce4-messenger-plugin-0.1.0 b/metadata/md5-cache/xfce-extra/xfce4-messenger-plugin-0.1.0
index cd299e7eac16..3aa4964dfe74 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-messenger-plugin-0.1.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-messenger-plugin-0.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=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 virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=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 virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A plugin that listens DBus messages and displays received messages
 EAPI=5
 HOMEPAGE=http://packages.qa.debian.org/x/xfce4-messenger-plugin.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=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
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=ba2c48aaa51822db8dc5cb9cbac5d44b
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mixer-4.10.0 b/metadata/md5-cache/xfce-extra/xfce4-mixer-4.10.0
index 35a542d89282..500b50d284ce 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-mixer-4.10.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-mixer-4.10.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24 dev-libs/libunique:1 dev-libs/keybinder:0 media-libs/gst-plugins-base:0.10 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10 alsa? ( media-plugins/gst-plugins-alsa:0.10 ) oss? ( media-plugins/gst-plugins-oss:0.10 ) !alsa? ( !oss? ( media-plugins/gst-plugins-meta:0.10 ) )
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/xfce4-mixer/4.10/xfce4-mixer-4.10.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=2a53f63a9b2ead41d312a2fca94085c0
diff --git a/metadata/md5-cache/xfce-extra/xfce4-modemlights-plugin-0.1.3.99 b/metadata/md5-cache/xfce-extra/xfce4-modemlights-plugin-0.1.3.99
index 97e35983949a..2158d8439d45 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-modemlights-plugin-0.1.3.99
+++ b/metadata/md5-cache/xfce-extra/xfce4-modemlights-plugin-0.1.3.99
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-modemlights-plugin/0.1/xfce4-modemlights-plugin-0.1.3.99.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=7d24c276d7bb82cab3a654b0c7b3bbcc
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-0.6.4 b/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-0.6.4
index 8d13f5d2b5e0..53387b10ebc9 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-0.6.4
+++ b/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-0.6.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=xfce-base/libxfce4ui-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-mount-plugin/0.6/xfce4-mount-plugin-0.6.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=dbeb597a9f966b79593b6e54116fd5d1
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.4.4 b/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.4.4
index c1a12a7fde1d..cc391a4c0355 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.4.4
+++ b/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.4.4
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=>=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.8 >=xfce-base/xfce4-panel-4.8 libmpd? ( media-libs/libmpd )
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-mpc-plugin/0.4/xfce4-mpc-plugin-0.4.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=ba3d405dd9a21b5871f7e0c8d4f48293
diff --git a/metadata/md5-cache/xfce-extra/xfce4-netload-plugin-1.2.0 b/metadata/md5-cache/xfce-extra/xfce4-netload-plugin-1.2.0
index e8c62b5062c8..669d96660b73 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-netload-plugin-1.2.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-netload-plugin-1.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=xfce-base/libxfce4ui-4.9 >=xfce-base/xfce4-panel-4.9
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-netload-plugin/1.2/xfce4-netload-plugin-1.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=5ccbd5cfe0e6fc19c8ebe5aec67c60a2
diff --git a/metadata/md5-cache/xfce-extra/xfce4-netspeed-plugin-0.3 b/metadata/md5-cache/xfce-extra/xfce4-netspeed-plugin-0.3
index b6cf3768e136..92d39efecf55 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-netspeed-plugin-0.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-netspeed-plugin-0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 >=gnome-base/libgtop-2 x11-libs/gtk+:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=http://xfce4-netspeed-plugin.googlecode.com/files/xfce4-netspeed-plugin-0.3.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=3aeb2c7d11faa364a90250b6f84913bd
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.7.7 b/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.7.7
index 26e1c0830df9..a318bcd4982b 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.7.7
+++ b/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.7.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.18:2 >=xfce-base/libxfcegui4-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 >=xfce-base/xfconf-4.8 dev-libs/libunique:1
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-notes-plugin/1.7/xfce4-notes-plugin-1.7.7.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=2ac644aeaa0ff2476ed0fdfb3da787c0
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.2.2 b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.2.2
index ce59620a7d3a..16a7c5ee7034 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.2.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=sys-apps/dbus-1.6 >=x11-libs/gtk+-2.14:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfconf-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/xfce4-notifyd/0.2/xfce4-notifyd-0.2.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=7c84809b48432d781c5546b6aaef2354
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.2.3 b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.2.3
index c8188b80bbae..5393417ee3b6 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.2.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=sys-apps/dbus-1.6 >=x11-libs/gtk+-2.14:2 >=x11-libs/libnotify-0.7 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfconf-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/xfce4-notifyd/0.2/xfce4-notifyd-0.2.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=598cedb7b4768faf5e284b05af47379b
diff --git a/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.5.0 b/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.5.0
index 2efe26455259..3c30a159a100 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.5.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.28 >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 >=xfce-base/xfconf-4.8 libnotify? ( >=x11-libs/libnotify-0.7 )
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-places-plugin/1.5/xfce4-places-plugin-1.5.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=8ed6509907d7ca72cbdc87926c06b86c
diff --git a/metadata/md5-cache/xfce-extra/xfce4-playercontrol-plugin-0.3.0 b/metadata/md5-cache/xfce-extra/xfce4-playercontrol-plugin-0.3.0
index 506e63b1da8a..364381aecd72 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-playercontrol-plugin-0.3.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-playercontrol-plugin-0.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/pango >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 mpd? ( >=media-libs/libmpd-0.12 ) audacious? ( >=media-sound/audacious-1.4 )
 SLOT=0
 SRC_URI=http://www.bilimfeneri.gen.tr/ilgar/xfce4-playercontrol-plugin-0.3.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=97f9173df46c48c12758473aaead2ba9
diff --git a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.2.0-r1 b/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.2.0-r1
index 758c49da3320..24ab2f29d5d5 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.2.0-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 >=sys-power/upower-0.9.16 >=x11-libs/gtk+-2.20:2 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext >=xfce-base/xfconf-4.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 policykit? ( >=sys-auth/polkit-0.104-r1 ) xfce_plugins_brightness? ( >=xfce-base/xfce4-panel-4.10 ) networkmanager? ( net-misc/networkmanager ) udisks? ( sys-fs/udisks:0 )
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/xfce4-power-manager/1.2/xfce4-power-manager-1.2.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=40b242f7690c9fb5169506256f88fecb
diff --git a/metadata/md5-cache/xfce-extra/xfce4-quicklauncher-plugin-1.9.4-r1 b/metadata/md5-cache/xfce-extra/xfce4-quicklauncher-plugin-1.9.4-r1
index 299a9fb99ccc..91faca5682e4 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-quicklauncher-plugin-1.9.4-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-quicklauncher-plugin-1.9.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfcegui4-4.8 dev-util/intltool >=dev-util/xfce4-dev-tools-4.8 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=>=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfcegui4-4.8 dev-util/intltool >=dev-util/xfce4-dev-tools-4.8 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A quicklauncher plug-in for the Xfce panel
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/panel-plugins/xfce4-quicklauncher-plugin
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfcegui4-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-quicklauncher-plugin/1.9/xfce4-quicklauncher-plugin-1.9.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=f91ea1df32889b1e95b447e0c51434d0
diff --git a/metadata/md5-cache/xfce-extra/xfce4-radio-plugin-0.5.1 b/metadata/md5-cache/xfce-extra/xfce4-radio-plugin-0.5.1
index 04c4b9ce49f9..9c090f957632 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-radio-plugin-0.5.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-radio-plugin-0.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-radio-plugin/0.5/xfce4-radio-plugin-0.5.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=de2f29fab0e23eba97f3aadc2fac093d
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.8.1 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.8.1
index cc43cf8cb3d5..ea0a2fba0ef4 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.8.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.16 >=net-libs/libsoup-2.26 >=x11-libs/gdk-pixbuf-2.16 >=x11-libs/gtk+-2.16:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=xfce-base/exo-0.6 >=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.16 >=net-libs/libsoup-2.26 >=x11-libs/gdk-pixbuf-2.16 >=x11-libs/gtk+-2.16:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=xfce-base/exo-0.6 >=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Xfce4 screenshooter application and panel plugin
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/applications/xfce4-screenshooter
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 >=net-libs/libsoup-2.26 >=x11-libs/gdk-pixbuf-2.16 >=x11-libs/gtk+-2.16:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=xfce-base/exo-0.6 >=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/xfce4-screenshooter/1.8/xfce4-screenshooter-1.8.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=56d854cc06fc0095e64e40a00e8c1e03
diff --git a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.2.5 b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.2.5
index d0fb9a6d7c4d..7b1d8d457cec 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.2.5
+++ b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=x11-libs/gtk+-2.14:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/xfce4-panel-4.8 hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7 ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0 ) video_cards_nvidia? ( media-video/nvidia-settings ) dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=x11-libs/gtk+-2.14:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/xfce4-panel-4.8 hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7 ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0 ) video_cards_nvidia? ( media-video/nvidia-settings ) dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A panel plug-in for different sensors using acpi, lm_sensors and hddtemp
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gtk+-2.14:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/xfce4-pane
 REQUIRED_USE=|| ( hddtemp lm_sensors acpi )
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-sensors-plugin/1.2/xfce4-sensors-plugin-1.2.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=fab382bd3d6975cae6c7a290f2bc665f
diff --git a/metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.4.4-r2 b/metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.4.4-r2
index 62544d33b0b2..f9df6be57b68 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.4.4-r2
+++ b/metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.4.4-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 >=xfce-base/exo-0.6
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-smartbookmark-plugin/0.4/xfce4-smartbookmark-plugin-0.4.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=ad6f5ae8c3f0d47480504ec26d134ca6
diff --git a/metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.4.5 b/metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.4.5
index 7dc160d19391..774eabfe57ce 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.4.5
+++ b/metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.4.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/exo-0.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-smartbookmark-plugin/0.4/xfce4-smartbookmark-plugin-0.4.5.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=b1348496a7e64caf7f81a9e381174955
diff --git a/metadata/md5-cache/xfce-extra/xfce4-soundmenu-plugin-0.4.10 b/metadata/md5-cache/xfce-extra/xfce4-soundmenu-plugin-0.4.10
index b141561ba991..ef05abe9cf18 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-soundmenu-plugin-0.4.10
+++ b/metadata/md5-cache/xfce-extra/xfce4-soundmenu-plugin-0.4.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/keybinder-0.2.2:0 >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 glyr? ( >=media-libs/glyr-0.9.9 ) lastfm? ( >=media-libs/libclastfm-0.5 )
 SLOT=0
 SRC_URI=mirror://github/matiasdelellis/xfce4-soundmenu-plugin/xfce4-soundmenu-plugin-0.4.10.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=2153d76adbb5848b0ec2c41c96597c29
diff --git a/metadata/md5-cache/xfce-extra/xfce4-soundmenu-plugin-0.6.0 b/metadata/md5-cache/xfce-extra/xfce4-soundmenu-plugin-0.6.0
index 1005fc722ff1..a9b00152d4aa 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-soundmenu-plugin-0.6.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-soundmenu-plugin-0.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-libs/glib-2.28 >=dev-libs/keybinder-0.2.2:0 >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 glyr? ( >=media-libs/glyr-1.0.0 ) lastfm? ( >=media-libs/libclastfm-0.5 )
 SLOT=0
 SRC_URI=http://dissonance.googlecode.com/files/xfce4-soundmenu-plugin-0.6.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=fc898ed77f21f177fb03b7c0a7334e40
diff --git a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.1.1 b/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.1.1
index c08e3d020d8a..24081bfef755 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.1.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=x11-libs/gtk+-2.6:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 udev? ( >=sys-power/upower-0.9.16 )
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-systemload-plugin/1.1/xfce4-systemload-plugin-1.1.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=1a2909be37f2e777b9ac48e9a19bbad7
diff --git a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.0.0 b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.0.0
index 3d108d21644b..9a4567be16ea 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.0.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/cairo-1.5 >=x11-libs/gtk+-2.12:2 x11-libs/libwnck:1
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/xfce4-taskmanager/1.0/xfce4-taskmanager-1.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=fcae633290b2feb22b169852eb993286
diff --git a/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.1 b/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.1
index 0403722a7a28..9dc1363e9abd 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-time-out-plugin/1.0/xfce4-time-out-plugin-1.0.1.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=872be65207b2cc91a9ea65deac8bc101
diff --git a/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-0.6.4 b/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-0.6.4
index f3f470101481..09edf3bd15b7 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-0.6.4
+++ b/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-0.6.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-timer-plugin/0.6/xfce4-timer-plugin-0.6.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=cc10b449fc29104c43d86d7b217ef28d
diff --git a/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.0.0 b/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.0.0
index 16aed962127d..56a2eb76a526 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.0.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-timer-plugin/1.0/xfce4-timer-plugin-1.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=8500479c46ae378459f70670b86a1f0b
diff --git a/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.2 b/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.2
index 5c195b3ca00a..36db770c55bb 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=|| ( dev-lang/vala:0.16[vapigen] ) >=xfce-base/exo-0.8 >=xfce-base/garcon-0.2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/bindings/xfce4-vala/4.10/xfce4-vala-4.10.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=434ddae3ffd130d62e38c2a81721132c
diff --git a/metadata/md5-cache/xfce-extra/xfce4-verve-plugin-1.0.0 b/metadata/md5-cache/xfce-extra/xfce4-verve-plugin-1.0.0
index 24336ffbb1a7..f2f9b4a55e88 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-verve-plugin-1.0.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-verve-plugin-1.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=xfce-base/exo-0.6 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 >=dev-libs/libpcre-5 dbus? ( >=dev-libs/dbus-glib-0.98 )
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-verve-plugin/1.0/xfce4-verve-plugin-1.0.0.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=b1386beb62995b771f2f35002fbbeae8
diff --git a/metadata/md5-cache/xfce-extra/xfce4-volumed-0.1.13 b/metadata/md5-cache/xfce-extra/xfce4-volumed-0.1.13
index 639dbd0312cb..6dea90c2eb45 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-volumed-0.1.13
+++ b/metadata/md5-cache/xfce-extra/xfce4-volumed-0.1.13
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/keybinder:0 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 >=xfce-base/xfconf-4.8 libnotify? ( x11-libs/libnotify ) alsa? ( media-plugins/gst-plugins-alsa:0.10 ) oss? ( media-plugins/gst-plugins-oss:0.10 ) !alsa? ( !oss? ( media-plugins/gst-plugins-meta:0.10 ) )
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/xfce4-volumed/0.1/xfce4-volumed-0.1.13.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=e77723a0e00f27c4bb46c6dca4208177
diff --git a/metadata/md5-cache/xfce-extra/xfce4-wavelan-plugin-0.5.11 b/metadata/md5-cache/xfce-extra/xfce4-wavelan-plugin-0.5.11
index 2a8e5a1574fd..0a795cf38cae 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-wavelan-plugin-0.5.11
+++ b/metadata/md5-cache/xfce-extra/xfce4-wavelan-plugin-0.5.11
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 kernel_linux? ( sys-apps/net-tools )
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-wavelan-plugin/0.5/xfce4-wavelan-plugin-0.5.11.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=b0872bc2e6aa8189a92c32aced70f4ac
diff --git a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.2 b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.2
index f2797dfbbf68..c2949143cf4d 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20 dev-libs/libxml2 >=x11-libs/gtk+-2.14:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-weather-plugin/0.8/xfce4-weather-plugin-0.8.2.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=69d95237da607b2b8b58a0d373de8f32
diff --git a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.3 b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.3
index aa443d04bdf2..ceabb762160c 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20 dev-libs/libxml2 >=net-libs/libsoup-2.26 >=x11-libs/gtk+-2.14:2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 udev? ( >=sys-power/upower-0.9.19 )
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-weather-plugin/0.8/xfce4-weather-plugin-0.8.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=3336cb56561eed064b98717790b1247e
diff --git a/metadata/md5-cache/xfce-extra/xfce4-wmdock-plugin-0.3.4 b/metadata/md5-cache/xfce-extra/xfce4-wmdock-plugin-0.3.4
index 8c2f96a8ae6b..138bd3d0088f 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-wmdock-plugin-0.3.4
+++ b/metadata/md5-cache/xfce-extra/xfce4-wmdock-plugin-0.3.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 >=x11-libs/libwnck-2.8.1:1
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-wmdock-plugin/0.3/xfce4-wmdock-plugin-0.3.4.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=89f8f78b730502248d17cb2f2b1b997e
diff --git a/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.5.4.3 b/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.5.4.3
index ce6165622e25..15b10b4775f9 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.5.4.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.5.4.3
@@ -9,5 +9,5 @@ LICENSE=BSD-2 GPL-2
 RDEPEND=x11-libs/gtk+:2 >=x11-libs/libwnck-2.12:1 >=x11-libs/libxklavier-5 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-xkb-plugin/0.5/xfce4-xkb-plugin-0.5.4.3.tar.bz2
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=9feea0a080089e445bb37503f051b2b0
diff --git a/metadata/md5-cache/xfce-extra/xfswitch-plugin-0.0.1-r1 b/metadata/md5-cache/xfce-extra/xfswitch-plugin-0.0.1-r1
index 2b549ef345b3..c19f3eba43bb 100644
--- a/metadata/md5-cache/xfce-extra/xfswitch-plugin-0.0.1-r1
+++ b/metadata/md5-cache/xfce-extra/xfswitch-plugin-0.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.12:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 gdm? ( gnome-base/gdm ) !gdm? ( x11-misc/lightdm )
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfswitch-plugin/0.0/xfswitch-plugin-0.0.1.tar.gz
-_eclasses_=autotools	e0c52691b90adf25cf1fe11cded8fd5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
+_eclasses_=autotools	0dc7b870a088cde4081c57cc7b394ad2	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	36e6377b0e31856b6d62af831661c4f3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	ba58c6f43e7fdfc116752aa58b488d83
 _md5_=967e894905efe113b911b2acd81600e0
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index de45c0647ae4..8daf3fc4e343 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 22 Apr 2013 20:06:58 +0000
+Wed, 24 Apr 2013 04:36:59 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 3e73cf36c557..9dd3063d0447 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Apr 22 20:06:55 UTC 2013
+Wed Apr 24 04:36:57 UTC 2013
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 7786553870e7..dbd5009e7840 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 22 Apr 2013 20:30:02 +0000
+Wed, 24 Apr 2013 05:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 7c156bb2d844..63b0ae2dba71 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1366661101 Mon Apr 22 20:05:01 2013 UTC
+1366778101 Wed Apr 24 04:35:01 2013 UTC
diff --git a/net-analyzer/egressor/egressor-1.0-r2.ebuild b/net-analyzer/egressor/egressor-1.0-r2.ebuild
index 5465b739fe33..a67608b5af2f 100644
--- a/net-analyzer/egressor/egressor-1.0-r2.ebuild
+++ b/net-analyzer/egressor/egressor-1.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/egressor/egressor-1.0-r2.ebuild,v 1.3 2012/11/20 20:09:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/egressor/egressor-1.0-r2.ebuild,v 1.5 2013/04/23 08:40:09 ago Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="${HOMEPAGE}${PN}_release${PV}.tar.gz"
 LICENSE="egressor"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="<net-libs/libnet-1.1
 	>=net-libs/libnet-1.0.2a-r3"
diff --git a/net-analyzer/ettercap/ettercap-9999.ebuild b/net-analyzer/ettercap/ettercap-9999.ebuild
index 65e469def852..a9a871fbff39 100644
--- a/net-analyzer/ettercap/ettercap-9999.ebuild
+++ b/net-analyzer/ettercap/ettercap-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ettercap/ettercap-9999.ebuild,v 1.4 2013/03/27 10:07:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ettercap/ettercap-9999.ebuild,v 1.5 2013/04/23 15:07:44 ago Exp $
 
 EAPI=5
 
@@ -45,6 +45,7 @@ src_prepare() {
 	#ettercap defaults to using mozilla so let's try to use xdg-open and pray it works
 	sed -i 's#mozilla -remote openurl(http://%host%url)#xdg-open 'http://%host%url'#' \
 	share/etter.conf || die
+	sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
 }
 
 src_configure() {
diff --git a/net-analyzer/wireshark/wireshark-1.6.14-r1.ebuild b/net-analyzer/wireshark/wireshark-1.6.14-r1.ebuild
index ee943d57e8b2..c915caf97c3d 100644
--- a/net-analyzer/wireshark/wireshark-1.6.14-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.6.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.14-r1.ebuild,v 1.2 2013/04/02 21:04:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.14-r1.ebuild,v 1.4 2013/04/23 20:55:57 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
@@ -15,13 +15,14 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
-	adns crypt doc doc-pdf +filecaps geoip gtk ipv6 kerberos libadns lua +pcap
+	adns +caps crypt doc doc-pdf geoip gtk ipv6 kerberos libadns lua +pcap
 	portaudio profile python selinux smi ssl threads zlib
 "
 RDEPEND="
 	>=dev-libs/glib-2.14:2
 	adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) )
 	crypt? ( dev-libs/libgcrypt )
+	caps? ( sys-libs/libcap )
 	geoip? ( dev-libs/geoip )
 	gtk? (
 		>=x11-libs/gtk+-2.4.0:2
@@ -124,14 +125,14 @@ src_configure() {
 
 	# dumpcap requires libcap, setuid-install requires dumpcap
 	econf \
-		$(use pcap && use_enable !filecaps setuid-install) \
-		$(use pcap && use_enable filecaps setcap-install) \
+		$(use pcap && use_enable !caps setuid-install) \
+		$(use pcap && use_enable caps setcap-install) \
 		$(use_enable gtk wireshark) \
 		$(use_enable ipv6) \
 		$(use_enable profile profile-build) \
 		$(use_enable threads) \
 		$(use_with crypt gcrypt) \
-		$(use_with filecaps libcap) \
+		$(use_with caps libcap) \
 		$(use_with geoip) \
 		$(use_with kerberos krb5) \
 		$(use_with lua) \
diff --git a/net-analyzer/wireshark/wireshark-1.6.14.ebuild b/net-analyzer/wireshark/wireshark-1.6.14.ebuild
index 8ab34a2c17d3..22238835b5a7 100644
--- a/net-analyzer/wireshark/wireshark-1.6.14.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.6.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.14.ebuild,v 1.10 2013/04/02 21:04:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.14.ebuild,v 1.12 2013/04/23 20:55:57 jer Exp $
 
 EAPI=5
 PYTHON_DEPEND="python? 2"
@@ -15,13 +15,14 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="
-	adns crypt doc doc-pdf +filecaps geoip gtk ipv6 kerberos libadns lua +pcap
+	adns +caps crypt doc doc-pdf geoip gtk ipv6 kerberos libadns lua +pcap
 	portaudio profile python selinux smi ssl threads zlib
 "
 RDEPEND="
 	>=dev-libs/glib-2.14:2
 	adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) )
 	crypt? ( dev-libs/libgcrypt )
+	caps? ( sys-libs/libcap )
 	geoip? ( dev-libs/geoip )
 	gtk? (
 		>=x11-libs/gtk+-2.4.0:2
@@ -119,14 +120,14 @@ src_configure() {
 
 	# dumpcap requires libcap, setuid-install requires dumpcap
 	econf \
-		$(use pcap && use_enable !filecaps setuid-install) \
-		$(use pcap && use_enable filecaps setcap-install) \
+		$(use pcap && use_enable !caps setuid-install) \
+		$(use pcap && use_enable caps setcap-install) \
 		$(use_enable gtk wireshark) \
 		$(use_enable ipv6) \
 		$(use_enable profile profile-build) \
 		$(use_enable threads) \
 		$(use_with crypt gcrypt) \
-		$(use_with filecaps libcap) \
+		$(use_with caps libcap) \
 		$(use_with geoip) \
 		$(use_with kerberos krb5) \
 		$(use_with lua) \
diff --git a/net-analyzer/wireshark/wireshark-1.8.6-r1.ebuild b/net-analyzer/wireshark/wireshark-1.8.6-r1.ebuild
index 9f02f7498974..88c4deeb1448 100644
--- a/net-analyzer/wireshark/wireshark-1.8.6-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.8.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.6-r1.ebuild,v 1.2 2013/04/02 21:04:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.6-r1.ebuild,v 1.4 2013/04/23 20:55:57 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
@@ -15,12 +15,13 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
-	adns crypt doc doc-pdf +filecaps geoip gtk ipv6 kerberos libadns lua +pcap
+	adns +caps crypt doc doc-pdf geoip gtk ipv6 kerberos libadns lua +pcap
 	portaudio profile python selinux smi ssl zlib
 "
 RDEPEND="
 	>=dev-libs/glib-2.14:2
 	adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) )
+	caps? ( sys-libs/libcap )
 	crypt? ( dev-libs/libgcrypt )
 	geoip? ( dev-libs/geoip )
 	gtk? (
@@ -124,13 +125,13 @@ src_configure() {
 
 	# dumpcap requires libcap, setuid-install requires dumpcap
 	econf \
-		$(use pcap && use_enable !filecaps setuid-install) \
-		$(use pcap && use_enable filecaps setcap-install) \
+		$(use pcap && use_enable !caps setuid-install) \
+		$(use pcap && use_enable caps setcap-install) \
 		$(use_enable gtk wireshark) \
 		$(use_enable ipv6) \
 		$(use_enable profile profile-build) \
 		$(use_with crypt gcrypt) \
-		$(use_with filecaps libcap) \
+		$(use_with caps libcap) \
 		$(use_with geoip) \
 		$(use_with kerberos krb5) \
 		$(use_with lua) \
diff --git a/net-analyzer/wireshark/wireshark-1.8.6.ebuild b/net-analyzer/wireshark/wireshark-1.8.6.ebuild
index 82b245bfede2..1ceee40c4487 100644
--- a/net-analyzer/wireshark/wireshark-1.8.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.6.ebuild,v 1.10 2013/04/02 21:04:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.6.ebuild,v 1.12 2013/04/23 20:55:57 jer Exp $
 
 EAPI=5
 PYTHON_DEPEND="python? 2"
@@ -15,13 +15,14 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="
-	adns crypt doc doc-pdf +filecaps geoip gtk ipv6 kerberos libadns lua +pcap
+	adns +caps crypt doc doc-pdf geoip gtk ipv6 kerberos libadns lua +pcap
 	portaudio profile python selinux smi ssl zlib
 "
 RDEPEND="
 	>=dev-libs/glib-2.14:2
 	adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) )
 	crypt? ( dev-libs/libgcrypt )
+	caps? ( sys-libs/libcap )
 	geoip? ( dev-libs/geoip )
 	gtk? (
 		>=x11-libs/gtk+-2.4.0:2
@@ -119,13 +120,13 @@ src_configure() {
 
 	# dumpcap requires libcap, setuid-install requires dumpcap
 	econf \
-		$(use pcap && use_enable !filecaps setuid-install) \
-		$(use pcap && use_enable filecaps setcap-install) \
+		$(use pcap && use_enable !caps setuid-install) \
+		$(use pcap && use_enable caps setcap-install) \
 		$(use_enable gtk wireshark) \
 		$(use_enable ipv6) \
 		$(use_enable profile profile-build) \
 		$(use_with crypt gcrypt) \
-		$(use_with filecaps libcap) \
+		$(use_with caps libcap) \
 		$(use_with geoip) \
 		$(use_with kerberos krb5) \
 		$(use_with lua) \
diff --git a/net-analyzer/wireshark/wireshark-1.9.2.ebuild b/net-analyzer/wireshark/wireshark-1.9.2.ebuild
index da8aa65deca0..7ef4d31e7a67 100644
--- a/net-analyzer/wireshark/wireshark-1.9.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.9.2.ebuild,v 1.3 2013/04/03 19:04:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.9.2.ebuild,v 1.5 2013/04/23 20:55:57 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
-	adns crypt doc doc-pdf +filecaps geoip gtk ipv6 kerberos libadns lua
+	adns +caps crypt doc doc-pdf geoip gtk ipv6 kerberos libadns lua
 	+netlink +pcap portaudio profile python selinux smi ssl zlib
 "
 RDEPEND="
@@ -23,6 +23,7 @@ RDEPEND="
 	netlink? ( dev-libs/libnl )
 	adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) )
 	crypt? ( dev-libs/libgcrypt )
+	caps? ( sys-libs/libcap )
 	geoip? ( dev-libs/geoip )
 	gtk? (
 		>=x11-libs/gtk+-2.4.0:2
@@ -125,14 +126,14 @@ src_configure() {
 
 	# dumpcap requires libcap, setuid-install requires dumpcap
 	econf \
-		$(use pcap && use_enable !filecaps setuid-install) \
-		$(use pcap && use_enable filecaps setcap-install) \
+		$(use pcap && use_enable !caps setuid-install) \
+		$(use pcap && use_enable caps setcap-install) \
 		$(use_enable gtk wireshark) \
 		$(use_enable ipv6) \
 		$(use_enable profile profile-build) \
 		$(use_with netlink libnl) \
 		$(use_with crypt gcrypt) \
-		$(use_with filecaps libcap) \
+		$(use_with caps libcap) \
 		$(use_with geoip) \
 		$(use_with kerberos krb5) \
 		$(use_with lua) \
diff --git a/net-ftp/proftpd/proftpd-1.3.4c.ebuild b/net-ftp/proftpd/proftpd-1.3.4c.ebuild
index 2026180fe13c..70b84a038d99 100644
--- a/net-ftp/proftpd/proftpd-1.3.4c.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.4c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4c.ebuild,v 1.2 2013/04/08 18:13:35 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4c.ebuild,v 1.5 2013/04/23 21:39:57 ago Exp $
 
 EAPI=4
 inherit eutils multilib systemd
@@ -25,7 +25,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso exec ifsession ifversion ident ipv6
 	kerberos ldap linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
 	linguas_ru_RU linguas_zh_CN linguas_zh_TW memcache mysql ncurses nls openssl pam +pcre postgres qos radius
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index a51e91946b81..8d6de18df882 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,3 +1 @@
-DIST gajim-0.15.2.tar.bz2 4473077 SHA256 7e71ee82e44303992792644803c749cb89ecad7ec7547db4f9841fcbeec49940 SHA512 ea1e64de54bd15a5af40e3fdfcc46808467555e671a8a86708f22400f7a329290d9d921d9e3ae56e7f47b90842c49b4f8d432d0df4fed7471d457ed2092f552a WHIRLPOOL 0faec1b189d48d83beed5aaf89a1a9d6351e30fda5b86abc8c57ffaf6c867d1a6531318c30c66a0b280899cef584068c7a684286d0be78c118fa528f54f6afbf
 DIST gajim-0.15.3.tar.bz2 4473787 SHA256 4848e98b25b523e28014528a8b89289bf987d5ce9419dd78ccff74a35aa583f4 SHA512 2315a281945b31a0fcfea0892fcdea72b79b4b85f75f4a810fb2d1530585c3325648562d546c3aa26e36f3153da1c96bc7123b255fca691e8d22e02a457b5049 WHIRLPOOL e5efed228b4c9704c00deb0fd68e6601a69a04ca7e18ee9348e729609eb87bf034f5fe23259b50806b7a6002f5155765562772077cfc4c8f430a7a9599e6800a
-DIST gajim-tests-0.15.2.tar.xz 22228 SHA256 9b972efa685ed854cfbaadb37f3fe5629fac65995100e20c3ca8294a4e0ee756 SHA512 0f5a6233be1db55e9cc7dab7f638d503b6ea71237c4039d43b8ff69421742c5c92034cdd40dd662f57a8a519e088b98b1c30040c30c3fec1546e10a4b41d301d WHIRLPOOL ddb53abd70533a60e62ae317864d5b396820373a9822f17f175c885dc9bd31f20ac1653ddc637e569141f3ab31283865114255095dd973ebf0826dd34ff8d3ca
diff --git a/net-im/gajim/gajim-0.15.2-r3.ebuild b/net-im/gajim/gajim-0.15.2-r3.ebuild
deleted file mode 100644
index a8a47c81e39c..000000000000
--- a/net-im/gajim/gajim-0.15.2-r3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.2-r3.ebuild,v 1.2 2013/02/23 10:32:18 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="sqlite xml"
-
-inherit autotools eutils python versionator
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="avahi crypt dbus gnome kde idle jingle libnotify networkmanager nls spell +srv X xhtml"
-
-REQUIRED_USE="
-	libnotify? ( dbus )
-	avahi? ( dbus )"
-
-COMMON_DEPEND="
-	dev-python/pygtk:2
-	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pyasn1
-	dev-python/pyopenssl
-	crypt? (
-		app-crypt/gnupg
-		dev-python/pycrypto
-		)
-	dbus? (
-		dev-python/dbus-python
-		dev-libs/dbus-glib
-		libnotify? ( dev-python/notify-python )
-		avahi? ( net-dns/avahi[dbus,gtk,python] )
-		)
-	gnome? (
-		dev-python/libgnome-python
-		dev-python/gnome-keyring-python
-		dev-python/egg-python
-		)
-	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farstream:0.1[python] )
-	kde? ( kde-base/kwallet )
-	networkmanager? (
-			dev-python/dbus-python
-			net-misc/networkmanager
-		)
-	spell? ( app-text/gtkspell:2 )
-	srv? (
-		|| (
-			dev-python/libasyncns-python
-			net-dns/bind-tools )
-		)
-	xhtml? ( dev-python/docutils )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	echo "src/command_system/mapping.py" >> po/POTFILES.in
-	epatch \
-		"${FILESDIR}"/0.14-python-version.patch \
-		"${FILESDIR}"/0.14.1-testing.patch \
-		"${FILESDIR}"/${P}-CVE-2012-5524.patch
-	echo '#!/bin/sh' > config/py-compile
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with X x) \
-		--docdir="/usr/share/doc/${PF}" \
-		--libdir="$(python_get_sitedir)" \
-		--enable-site-packages
-}
-
-src_install() {
-	default
-
-	rm "${D}/usr/share/doc/${PF}/README.html" || die
-	dohtml README.html
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/net-im/gajim/gajim-0.15.2-r4.ebuild b/net-im/gajim/gajim-0.15.2-r4.ebuild
deleted file mode 100644
index 98a4b6d9db1d..000000000000
--- a/net-im/gajim/gajim-0.15.2-r4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.2-r4.ebuild,v 1.1 2013/02/23 10:32:18 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="sqlite xml"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils python-r1 versionator
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="
-	http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2
-	test? ( http://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="avahi crypt dbus gnome kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
-
-REQUIRED_USE="
-	libnotify? ( dbus )
-	avahi? ( dbus )"
-
-COMMON_DEPEND="
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	crypt? (
-		app-crypt/gnupg
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		)
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-libs/dbus-glib
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-		avahi? ( net-dns/avahi[dbus,gtk,python] )
-		)
-	gnome? (
-		dev-python/libgnome-python
-		dev-python/gnome-keyring-python
-		dev-python/egg-python
-		)
-	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farstream:0.1[python] )
-	kde? ( kde-base/kwallet )
-	networkmanager? (
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			net-misc/networkmanager
-		)
-	spell? ( app-text/gtkspell:2 )
-	srv? (
-		|| (
-			dev-python/libasyncns-python
-			net-dns/bind-tools )
-		)
-	xhtml? ( dev-python/docutils )"
-
-RESTRICT="test"
-
-PATCHES=(
-		"${FILESDIR}"/${P}-CVE-2012-5524.patch
-	)
-
-src_prepare() {
-	echo "src/command_system/mapping.py" >> po/POTFILES.in
-	echo '#!/bin/sh' > config/py-compile
-	autotools-utils_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myeconfargs=(
-			$(use_enable nls)
-			$(use_with X x)
-			--docdir="/usr/share/doc/${PF}"
-			--libdir="$(python_get_sitedir)"
-			--enable-site-packages
-		)
-		run_in_build_dir autotools-utils_src_configure
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	compilation() {
-		run_in_build_dir autotools-utils_src_compile
-	}
-	python_foreach_impl compilation
-}
-
-src_test() {
-	testing() {
-		run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
-	}
-	python_foreach_impl testing
-}
-
-src_install() {
-	installation() {
-		run_in_build_dir autotools-utils_src_install
-		python_optimize "${ED}"/$(python_get_sitedir)
-	}
-	python_foreach_impl installation
-
-	rm "${D}/usr/share/doc/${PF}/README.html" || die
-	dohtml README.html
-}
diff --git a/net-im/gajim/gajim-0.15.3.ebuild b/net-im/gajim/gajim-0.15.3.ebuild
deleted file mode 100644
index 673b089f31be..000000000000
--- a/net-im/gajim/gajim-0.15.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.3.ebuild,v 1.1 2013/03/18 08:45:41 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="sqlite xml"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils python-r1 versionator
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="
-	http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
-#	test? ( http://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="avahi crypt dbus gnome kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
-
-REQUIRED_USE="
-	libnotify? ( dbus )
-	avahi? ( dbus )"
-
-COMMON_DEPEND="
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	crypt? (
-		app-crypt/gnupg
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		)
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-libs/dbus-glib
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-		avahi? ( net-dns/avahi[dbus,gtk,python] )
-		)
-	gnome? (
-		dev-python/libgnome-python
-		dev-python/gnome-keyring-python
-		dev-python/egg-python
-		)
-	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farstream:0.1[python] )
-	kde? ( kde-base/kwallet )
-	networkmanager? (
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			net-misc/networkmanager
-		)
-	spell? ( app-text/gtkspell:2 )
-	srv? (
-		|| (
-			dev-python/libasyncns-python
-			net-dns/bind-tools )
-		)
-	xhtml? ( dev-python/docutils )"
-
-RESTRICT="test"
-
-PATCHES=(
-		"${FILESDIR}"/${P}-roster.patch
-	)
-
-src_prepare() {
-	echo "src/command_system/mapping.py" >> po/POTFILES.in
-	echo '#!/bin/sh' > config/py-compile
-	autotools-utils_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myeconfargs=(
-			$(use_enable nls)
-			$(use_with X x)
-			--docdir="/usr/share/doc/${PF}"
-			--libdir="$(python_get_sitedir)"
-			--enable-site-packages
-		)
-		run_in_build_dir autotools-utils_src_configure
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	compilation() {
-		run_in_build_dir autotools-utils_src_compile
-	}
-	python_foreach_impl compilation
-}
-
-src_test() {
-	testing() {
-		run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
-	}
-	python_foreach_impl testing
-}
-
-src_install() {
-	installation() {
-		run_in_build_dir autotools-utils_src_install
-		python_optimize "${ED}"/$(python_get_sitedir)
-	}
-	python_foreach_impl installation
-
-	rm "${D}/usr/share/doc/${PF}/README.html" || die
-	dohtml README.html
-}
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 43463b9b67d0..72409d742511 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,4 +1,4 @@
-DIST glib-networking-2.30.2.tar.xz 297336 SHA256 9f7542500939ca25896f0a74955cd3889758524583f6a15d02e00c9b815559bc SHA512 052e9d806b38983112fec5c64fc34ef254ff746056ada3e1ccc0e0a895fdddb54704150913c2c41de8ea3895cdb23bbc67ce6039c67664729d9fc361add389b3 WHIRLPOOL 9ecf68746e9e6046c2e871d5c5f3f9736e285befce719c350839d6e8136938cd6ec5d0e52bdfae88d832026171d9e66f12a70f1264f05c43c1d902a6c11a1a91
 DIST glib-networking-2.32.3.tar.xz 331996 SHA256 39fe23e86a57bb7a8a67c65668394ad0fbe2d43960c1f9d68311d5d13ef1e5cf SHA512 33e29a31b0c62c8413f40d2c562c3ec0580c374a16052d174ceb703ef0c9e91145953b4377547ae2184d60d24b01c1b7694b99c94221d8d0f16d5ef7ab21f72d WHIRLPOOL 3fbc3fdd0c800483d0cefe37511f8a61dc60526b5dcd68dbeea033d5c3229f8357af16a0c32389f7462ae6f97153597784fd59fcd3eeaced5fe6d9a2f9865c8d
 DIST glib-networking-2.34.2.tar.xz 346828 SHA256 00a92ec7b31f03a2fc1eeff568c0f1664e109b3add8c7042d2d420953f49dfde SHA512 e9474e340c928adc67d777108a8cd0a001584fce433bcd27d2b52bb946bd341fade3a89b41e07759ef666d48eb3ed73bab87df0e37dfbaa71606f18b31fdee1b WHIRLPOOL 9e085df94075e11abaa0d79c34267add5221ce7c94597e58edf9ad3b3cd19dd25369e69ab0f67b43f54828433c75b3de0035d87d028895fd6ca5da5b9b252032
 DIST glib-networking-2.36.0.tar.xz 351080 SHA256 190d66fbaeb023ba4f43c315f23c5372c43be6cbe857596e00990211514650d9 SHA512 663395d3a564ff7c536b740f5daf8c6ef31f66877515afa1c02785f6f636139d545ba153e191ee23107cea8c8af2b4c1d87716f106c910f60feef52aff1fbbfd WHIRLPOOL e726ede3b0812b910c078698bab12273825af47a52fa226a5bb8c7afca5368d21c8cea3dd0fccc384f39612b462c6a3d4369f897b7867c5f488397ce941e6631
+DIST glib-networking-2.36.1.tar.xz 351892 SHA256 e2df2d1943a6193ca471addc58539895da1ae96fdba305dedb937ef56adb57ea SHA512 bd76f418b7d9ac77e82f63308e1a35e56d5a2bcdc7096f5ef122afda491914e893b2d7e75c2d85d40a75dce6218c7fadf7c8c5459ea8a2a68d2016275db5e09b WHIRLPOOL b3588a7dad70fd51b87d6ad1ba7d951068562649a4fd630eca9983698c1e5dda34ae2498a1e086102164b66eafea6ebc7de787a1986b6018b222f1cc4e441abf
diff --git a/net-libs/glib-networking/glib-networking-2.30.2.ebuild b/net-libs/glib-networking/glib-networking-2.30.2.ebuild
deleted file mode 100644
index 6c2ce7638c2c..000000000000
--- a/net-libs/glib-networking/glib-networking-2.30.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.2.ebuild,v 1.12 2012/09/25 11:53:27 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-# tests need virtualx
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+gnome +libproxy +ssl" # test
-
-RDEPEND=">=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
-		dev-libs/libgcrypt
-		>=net-libs/gnutls-2.1.7 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	sys-devel/gettext"
-#	test? ( sys-apps/dbus[X] )"
-# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
-
-# FIXME: tls tests often fail, figure out why, bug #387799
-# ERROR:tls.c:265:on_input_read_finish: assertion failed (error == NULL): Error performing TLS handshake: The request is invalid. (g-tls-error-quark, 1)
-RESTRICT="test"
-
-pkg_setup() {
-	# AUTHORS, ChangeLog are empty
-	DOCS="NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-		$(use_with gnome gnome-proxy)
-		$(use_with libproxy)
-		$(use_with ssl gnutls)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Drop DEPRECATED flags
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
-		proxy/libproxy/Makefile.am proxy/libproxy/Makefile.in \
-		proxy/gnome/Makefile.am proxy/gnome/Makefile.in \
-		tls/gnutls/Makefile.am tls/gnutls/Makefile.in || die
-}
-
-#src_test() {
-	# global make check fails if gnome-proxy test is not built
-#	use gnome || cd tls/tests
-#	Xemake check
-#}
diff --git a/net-libs/glib-networking/glib-networking-2.36.1.ebuild b/net-libs/glib-networking/glib-networking-2.36.1.ebuild
new file mode 100644
index 000000000000..5fe398dc8b94
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.36.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.36.1.ebuild,v 1.1 2013/04/23 19:10:15 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 virtualx
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE="+gnome +libproxy smartcard +ssl test"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.35.8:2
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+	libproxy? ( >=net-libs/libproxy-0.4.6-r3:= )
+	smartcard? (
+		>=app-crypt/p11-kit-0.8
+		>=net-libs/gnutls-2.12.8:=[pkcs11] )
+	ssl? (
+		app-misc/ca-certificates
+		>=net-libs/gnutls-2.11.0:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( sys-apps/dbus[X] )
+"
+# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
+
+src_prepare() {
+	# Failing tests, upstream #695062 (will be fixed in 2.38)
+	sed -e '/tls.connection.simultaneous-async-rehandshake/,+1 d' \
+		-e '/tls.connection.simultaneous-sync-rehandshake/,+1 d' \
+		-i tls/tests/connection.c || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# AUTHORS, ChangeLog are empty
+	DOCS="NEWS README"
+	gnome2_src_configure \
+		--disable-static \
+		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+		$(use_with gnome gnome-proxy) \
+		$(use_with libproxy) \
+		$(use_with smartcard pkcs11) \
+		$(use_with ssl gnutls)
+}
+
+src_test() {
+	Xemake check
+}
diff --git a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild
index 120e821472bc..581250840fbb 100644
--- a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild
+++ b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild,v 1.4 2013/04/22 16:02:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild,v 1.5 2013/04/23 08:42:09 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~ia64 ppc x86 ~amd64-linux"
 IUSE="examples"
 
 RDEPEND="net-libs/libmnl"
diff --git a/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild b/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild
index 4eba18ff3ffd..4edac311ae21 100644
--- a/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild
+++ b/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild,v 1.6 2013/04/22 16:02:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild,v 1.7 2013/04/23 08:41:48 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=net-libs/libnfnetlink-1.0.0"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 16a6b4b0a49d..71aa9e9741c7 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,7 +1,5 @@
-DIST node-v0.10.1.tar.gz 12790341 SHA256 2628dbf42fb3ec3927e595dc66f2f96e3c23455990dea690e300296d92afe4d3 SHA512 552223c7e8664e199574affb77f504ad5d4f4f092edb12df10fa013ac6af5a9a45e30f334e0255a256eb0a9604bc697f74b039e9e4e6f7453ea3f0c781c03fbe WHIRLPOOL f5dda85c10e04ef7999882bb76c0e6ea36198cc551bfcdb8a2079145e626442aabcb18440cf5fdbabac30ff066f24ecca0f1010606b13e6b1cdc803d4c73cafe
-DIST node-v0.10.2.tar.gz 12813547 SHA256 4eb642897fdb945b49720f2604afc493587aec7a9ff1537e882df659e4dd8aa2 SHA512 88615b4450ff10e70f4f53ec159518c1385da747e44dfb6c42dcf386c41b62048a9b77838036cf620202da1812c60893809f6aca2202e90b20158eb0f00aa60a WHIRLPOOL d46c2b11d98b32872fe40e748cdabba365afa754e5108b1ee9fecc0990e9f3878a47558a66e4b909e10792e162fcbb7ddff9a380042eb49b93f8a18534df9f35
-DIST node-v0.10.3.tar.gz 12818307 SHA256 bc8796ff6414231fa0603e0383404f14648dfd2fe9fb0fa4d4a6043dfddbb328 SHA512 7b6720346acd576fa03359a4f630502bc3b18f91c61d1d25d74cfac1e62b5fe370a064530aee02ac2b78523529a0b3f850d88fdc8c7eb1a93fcf2e8ca4e363da WHIRLPOOL 95348e727f40ecb69ec7023bb36eb9d7e0d22d9ef54d1b5796b8179779ec1c6d7c180ce4a73297430ca2c81fa061d92faf4e71435fca4e8204417ef1d134330d
 DIST node-v0.10.4.tar.gz 13246857 SHA256 1c960d2822447a9e4f7c46b832ff05e86743033c6643d644975af1cbf6a44fb8 SHA512 ba29e0799e96c0cb1c359645bca07144eb919ae964a94e05957e82e79f515d13f5817afb21226939f49960f41c9a10fbe889d00365d15e6864eec8d1139a3790 WHIRLPOOL 0020b71808ba85637ae6297edf63f1cbc73ca37e30ca926a6cbbf2f18ea34cafcd068d7e520cd2f427e8d2d0c9e55c72e873fcbf078be6bc8785850b035b64fa
+DIST node-v0.10.5.tar.gz 13250913 SHA256 1c22bd15cb13b1109610ee256699300ec6999b335f3bc85dc3c0312ec9312cfd SHA512 bc79dec6f0a139062490b18adf0985f4e70f8d6f6476c53443ef9e312a7aef4ded679680f6d33d1aecda23e7802d2fa2fd8130b62e4889c70ff4f46a34909ceb WHIRLPOOL ebf78cbb2497ff355a5d2b7f18292c2cbd2c04baa00f81c48294254369f8b33f08095d91745a037e6fcba5353eb8d5781f37863f7bfc9488e98aab44355812ab
 DIST node-v0.11.0.tar.gz 12956118 SHA256 a1887957fd6f0091379d1317f1daeb791bbf4301e58d693d17ad1d0fdbfa7898 SHA512 1c3d3445edf8600a1bf60b7be69e22bbfc74c3c076b92bcd71168c0f830aa42ba0ef7a0a63d9663b35e480d2da9694b8620e3db11be1c1f7e78a24a90bf3f20e WHIRLPOOL 7378e8b0d695425b475c5711b7f4ba2b8bbe72e4317c5a18f8ccf6386d51f61718c6b3ee68d64c2e95552dccd5ca86a8b8ca96c279e9cae2899c9cbf8e18eac7
 DIST node-v0.8.21.tar.gz 12191813 SHA256 e526f56d22bb2ebee5a607bd1e7a16dcc8530b916e3a372192e6cd5fa97d08e6 SHA512 10a305d5d798703144a4d4a29878b261be516f29a0bfe349e73879b81e16db89a6fabfce43a6b1abef2f085aa2cf884bde310b9feeb377083c43f674492f5d99 WHIRLPOOL f44085bb6710289adc85653f39073d17527bbe2bd27d9a998376a3eeab9fea462fb8f9d0f3baab4bda28d3046d3920a58ab14cfaa9eb1d20bb66cfdc1c71cc72
 DIST node-v0.8.23.tar.gz 12630347 SHA256 382432638aedc25495e655dda338adcf41c6fa1d35f355936d659784c1deed9d SHA512 d5dbd3eebf8c1b09af4ff437f2368ffaeb4db6127d99893db6181d39e3f5b176f1ec39519ed0fe536f4fce75852c149792a89fcb0947331969ce40a2503039b4 WHIRLPOOL 14a47c9ba868312ed3f2e61a69d03b841da385fc059c0706d05a0430721fdbb7581e398d495cdc4fe3050670295e448e9c6eeeaa80b01b2e9c6aa0120b6d7e3a
diff --git a/net-libs/nodejs/nodejs-0.10.2.ebuild b/net-libs/nodejs/nodejs-0.10.2.ebuild
deleted file mode 100644
index 70c950d76188..000000000000
--- a/net-libs/nodejs/nodejs-0.10.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.10.2.ebuild,v 1.1 2013/04/01 05:09:29 patrick Exp $
-
-EAPI=5
-
-# has known failures. sigh.
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_{5,6,7} )
-
-inherit python-any-r1 pax-utils
-
-DESCRIPTION="Evented IO for V8 Javascript"
-HOMEPAGE="http://nodejs.org/"
-SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-IUSE=""
-
-RDEPEND="dev-libs/openssl"
-DEPEND="${RDEPEND}
-	virtual/python-json"
-
-S=${WORKDIR}/node-v${PV}
-
-src_prepare() {
-	# fix compilation on Darwin
-	# http://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e  "s/python/python2/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-}
-
-src_configure() {
-	"${PYTHON}" configure --prefix="${EPREFIX}"/usr --openssl-use-sys --shared-zlib || die
-}
-
-src_compile() {
-	emake out/Makefile
-	emake -C out mksnapshot
-	pax-mark m out/Release/mksnapshot
-	emake
-}
-
-src_install() {
-	"${PYTHON}" tools/install.py install "${ED}"
-
-	dohtml -r "${ED}"/usr/lib/node_modules/npm/html/*
-	rm -rf "${ED}"/usr/lib/node_modules/npm/doc "${ED}"/usr/lib/node_modules/npm/html
-	rm -rf "${ED}"/usr/lib/dtrace
-
-	pax-mark -m "${ED}"/usr/bin/node
-}
-
-src_test() {
-	"${PYTHON}" tools/test.py --mode=release simple message || die
-}
diff --git a/net-libs/nodejs/nodejs-0.10.3.ebuild b/net-libs/nodejs/nodejs-0.10.3.ebuild
deleted file mode 100644
index aa6a415a197a..000000000000
--- a/net-libs/nodejs/nodejs-0.10.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.10.3.ebuild,v 1.1 2013/04/05 08:56:27 patrick Exp $
-
-EAPI=5
-
-# has known failures. sigh.
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_{5,6,7} )
-
-inherit python-any-r1 pax-utils
-
-DESCRIPTION="Evented IO for V8 Javascript"
-HOMEPAGE="http://nodejs.org/"
-SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-IUSE=""
-
-RDEPEND="dev-libs/openssl"
-DEPEND="${RDEPEND}
-	virtual/python-json"
-
-S=${WORKDIR}/node-v${PV}
-
-src_prepare() {
-	# fix compilation on Darwin
-	# http://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e  "s/python/python2/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-}
-
-src_configure() {
-	"${PYTHON}" configure --prefix="${EPREFIX}"/usr --openssl-use-sys --shared-zlib || die
-}
-
-src_compile() {
-	emake out/Makefile
-	emake -C out mksnapshot
-	pax-mark m out/Release/mksnapshot
-	emake
-}
-
-src_install() {
-	"${PYTHON}" tools/install.py install "${ED}"
-
-	dohtml -r "${ED}"/usr/lib/node_modules/npm/html/*
-	rm -rf "${ED}"/usr/lib/node_modules/npm/doc "${ED}"/usr/lib/node_modules/npm/html
-	rm -rf "${ED}"/usr/lib/dtrace
-
-	pax-mark -m "${ED}"/usr/bin/node
-}
-
-src_test() {
-	"${PYTHON}" tools/test.py --mode=release simple message || die
-}
diff --git a/net-libs/nodejs/nodejs-0.10.1.ebuild b/net-libs/nodejs/nodejs-0.10.5.ebuild
similarity index 93%
rename from net-libs/nodejs/nodejs-0.10.1.ebuild
rename to net-libs/nodejs/nodejs-0.10.5.ebuild
index fc5011579c31..94a90da905a5 100644
--- a/net-libs/nodejs/nodejs-0.10.1.ebuild
+++ b/net-libs/nodejs/nodejs-0.10.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.10.1.ebuild,v 1.1 2013/03/22 03:48:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.10.5.ebuild,v 1.1 2013/04/24 02:26:12 patrick Exp $
 
 EAPI=5
 
diff --git a/net-mail/mpop/Manifest b/net-mail/mpop/Manifest
index e6100f268c12..b7fe65ec8895 100644
--- a/net-mail/mpop/Manifest
+++ b/net-mail/mpop/Manifest
@@ -1,2 +1,3 @@
-DIST mpop-1.0.26.tar.bz2 292270 RMD160 6cd5baa086aed186c5e7b22c3bb5e3bb66e6a227 SHA1 01657d2b5e47fd401b7b9047762eb1aaa0a1ad08 SHA256 c24b493a245550119d73be78a8f82aff414ddb6c0a3b7c7bfe0843941ff68018
-DIST mpop-1.0.27.tar.bz2 288817 RMD160 7f4b37c40d76ed3bcd4e19f6f003d5b4eaac7506 SHA1 ea9e190d8b7172e8c4c100e3f90d1840f3f8a259 SHA256 aac265d3e27378a48d8a63bd6d086db9b6142e07e6bb0460ffa99b3ff32de3c3
+DIST mpop-1.0.26.tar.bz2 292270 SHA256 c24b493a245550119d73be78a8f82aff414ddb6c0a3b7c7bfe0843941ff68018
+DIST mpop-1.0.27.tar.bz2 288817 SHA256 aac265d3e27378a48d8a63bd6d086db9b6142e07e6bb0460ffa99b3ff32de3c3 SHA512 54eebab94fb36dc148714808e3b323b0a46300af9c5dff590ee5c15f752634ad5064f9689557d566a68d2b495c7afc942ef59145f26942fbae09f257b7fc8587 WHIRLPOOL 7e1c4f3842a172965697a08dded0f76757def596bb2f4cebab6108d194c301c718729c670c03fff88a8e28f017a7f440b312c8b901818112b45f30afbb059f78
+DIST mpop-1.0.28.tar.bz2 289664 SHA256 e7e397c932285abc1aa65ce416679217a45d688dc8ea7f5912c6c49a8056b7ea SHA512 419ef8bf1e06f5a3c824abc61559c4906488eefb46058801a907b67e6b7ab3cbaa558f8a23653f1c557f8d1e17ffd66aed9ea2b6979c65e2a21a0a58f5470305 WHIRLPOOL d24b0ddb0ed1224068f6b2d45131fb68f7f47c381c6b4e7c11b94c3446682546797ce6d90f220cd52c0970c9ba09d35419a7cee6f38c01555f384c6ea8cad264
diff --git a/net-mail/mpop/mpop-1.0.28.ebuild b/net-mail/mpop/mpop-1.0.28.ebuild
new file mode 100644
index 000000000000..c4588e987eeb
--- /dev/null
+++ b/net-mail/mpop/mpop-1.0.28.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mpop/mpop-1.0.28.ebuild,v 1.1 2013/04/23 00:19:13 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit python-single-r1
+
+DESCRIPTION="A small, fast, and portable POP3 client"
+HOMEPAGE="http://mpop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome-keyring gnutls idn nls sasl ssl vim-syntax"
+
+RDEPEND="
+	gnome-keyring? (
+		${PYTHON_DEPS}
+		dev-python/gnome-keyring-python
+		gnome-base/libgnome-keyring
+	)
+	idn? ( net-dns/libidn )
+	nls? ( virtual/libintl )
+	sasl? ( virtual/gsasl )
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( dev-libs/openssl )
+	)"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+DOCS="AUTHORS ChangeLog NEWS NOTES README THANKS"
+
+src_configure() {
+	econf \
+		$(use_with gnome-keyring ) \
+		$(use_with idn libidn) \
+		$(use_enable nls) \
+		$(use_with sasl libgsasl) \
+		$(use_with ssl ssl $(usex gnutls "gnutls" "openssl"))
+}
+
+src_install() {
+	default
+
+	if use gnome-keyring ; then
+		src_install_contrib mpop-gnome-tool mpop-gnome-tool.py README
+		python_fix_shebang "${D}"/usr/share/${PN}/mpop-gnome-tool/mpop-gnome-tool.py
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/vim/mpop.vim
+	fi
+}
+
+src_install_contrib() {
+	subdir="$1"
+	bins="$2"
+	docs="$3"
+	local dir=/usr/share/${PN}/$subdir
+	insinto ${dir}
+	exeinto ${dir}
+	for i in $bins ; do
+		doexe scripts/$subdir/$i
+	done
+	for i in $docs ; do
+		newdoc scripts/$subdir/$i $subdir.$i
+	done
+}
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 9c46f5f70ebd..66097194aac6 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,2 +1,3 @@
 DIST dhcpcd-5.6.4.tar.bz2 85671 SHA256 4072999704585c16ac45458d459eb50186c3de91c3c14c3288896963cc30b594 SHA512 eb3892604b2f889b4f34835f4d8e0bb2d129f7d0d91da39760eeaf3f75883a6db0e1397ac65084a3ddc4a2968a389fc723e9f031a844ef5333451527be8cb7a2 WHIRLPOOL f8fba52a6f6d4e1822175069f6a636e83b09a1532bd258a4ec9b610e9eb196d35f1cfa0e855521f5d37edb840fb2dd4d46bffc8bf86ded0b205367711f4484ff
 DIST dhcpcd-5.6.7.tar.bz2 85983 SHA256 102cc37596216c0e2c0b230fe58bf880e993ec8663c7c2178fb2a06c25938c90 SHA512 6fdb3716c2e09208e9813642ab275f26f2a2fd96065531408e8ce33179398405c35f7d91c0f10cef71a2ece8b5179c6dcf9887eb6e59e2599be46ea338dc1023 WHIRLPOOL 8b5fb218b0f67777b4b1e0b2b71bfc9b0eb3bfcb1e3646891d481b39d907aef7fd9a867aa79d301699de8618af32fb7329c179bc96db1004af84ac444a80dd3e
+DIST dhcpcd-5.6.8.tar.bz2 86968 SHA256 a3b15da770623774f4e659bf3239fca50f03594207bca3a2ad011f0b68d8eec4 SHA512 20e51d19d2a45101fa28322be3f17aec081ec9ed026b07d24fc45e090135bcf2422e3d1d2a62f60a90714babd036faef2fa1f251dd69cfeb1cce021b56485fae WHIRLPOOL 246bfbd3ee56ac95ec86e02b50735b261b804647f995426e0a8c726e2dfa2609645a6c1ad34f297f7a8f89094689d03146ed8a73810fb8bcd91839fcf2f72cb0
diff --git a/net-misc/dhcpcd/dhcpcd-5.6.8.ebuild b/net-misc/dhcpcd/dhcpcd-5.6.8.ebuild
new file mode 100644
index 000000000000..355a9274dd5d
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-5.6.8.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.6.8.ebuild,v 1.1 2013/04/23 22:58:25 williamh Exp $
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://roy.marples.name/${PN}.git"
+	inherit git-2
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="+zeroconf elibc_glibc"
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare()
+{
+	epatch_user
+	if ! use zeroconf; then
+		elog "Disabling zeroconf support"
+		{
+			echo
+			echo "# dhcpcd ebuild requested no zeroconf"
+			echo "noipv4ll"
+		} >> dhcpcd.conf
+	fi
+}
+
+src_configure()
+{
+	local hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	econf \
+			--prefix="${EPREFIX}" \
+			--libexecdir="${EPREFIX}/lib/dhcpcd" \
+			--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_preinst()
+{
+	has_version 'net-misc/dhcpcd[zeroconf]' && prev_zero=true || prev_zero=false
+}
+
+pkg_postinst()
+{
+	# Upgrade the duid file to the new format if needed
+	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local new_duid="${ROOT}"/etc/dhcpcd.duid
+	if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
+		sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
+	fi
+
+	# Move the duid to /etc, a more sensible location
+	if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
+		cp -p "${old_duid}" "${new_duid}"
+	fi
+
+	if use zeroconf && ! $prev_zero; then
+		elog "You have installed dhcpcd with zeroconf support."
+		elog "This means that it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the -L flag."
+		elog "See the dhcpcd man page for more details."
+	fi
+}
diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
index 158786be53aa..aad73f10e29d 100644
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-9999.ebuild,v 1.2 2013/02/22 23:34:33 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-9999.ebuild,v 1.3 2013/04/23 22:58:25 williamh Exp $
 
 EAPI=5
 
@@ -8,11 +8,11 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://roy.marples.name/${PN}.git"
 	inherit git-2
 else
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/gwibber/Manifest b/net-misc/gwibber/Manifest
deleted file mode 100644
index 0fc94dfc1e7a..000000000000
--- a/net-misc/gwibber/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gwibber-3.1.0.tar.gz 614601 SHA256 1d46a98fe1c57e264b6815904d2d7965dc73794c6bc622db1b649098f7eef5f8 SHA512 5b7f15d3cc51c157927de23c125db1f0040e93d61ab2d145a32fe7f56942080c90ecba6fce05a96974c7d36103bad206b0a4b450d5aacd6c4e835132ffb7880e WHIRLPOOL bd6d485c854a86233972f0468251ccf8a03ac16b40a925f6aaef6b26f7fdc7ebd8218532848c15bd7094554dfa866bcbd1dc47b9734f4da629a4aac80c0335ce
diff --git a/net-misc/gwibber/files/gwibber-fix-uuid-import.patch b/net-misc/gwibber/files/gwibber-fix-uuid-import.patch
deleted file mode 100644
index 914dcef83edb..000000000000
--- a/net-misc/gwibber/files/gwibber-fix-uuid-import.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# workaround bug #351897 for gwibber
---- gwibber/accounts.py_old	2011-07-06 15:02:46.843404291 +0200
-+++ gwibber/accounts.py	2011-07-06 15:02:57.894782684 +0200
-@@ -29,7 +29,7 @@
-   gettext.bind_textdomain_codeset('gwibber','UTF-8')
- gettext.textdomain('gwibber')
- 
--import gtk, pango, gconf, os, json, uuid
-+import uuid, gtk, pango, gconf, os, json
- from gwibber.lib import GwibberPublic
- import util
- from microblog.util import resources
---- bin/gwibber-accounts_old	2011-07-07 09:48:01.786740055 +0200
-+++ bin/gwibber-accounts	2011-07-07 09:48:13.957633450 +0200
-@@ -19,6 +19,7 @@
- # Launch script for Gwibber Accounts
- #
- 
-+import uuid
- import sys
- from os.path import join, dirname, exists, realpath, abspath
- import gtk, gobject, wnck
diff --git a/net-misc/gwibber/files/gwibber-twitter-api-key.patch b/net-misc/gwibber/files/gwibber-twitter-api-key.patch
deleted file mode 100644
index e93fa22ec576..000000000000
--- a/net-misc/gwibber/files/gwibber-twitter-api-key.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gwibber/microblog/util/const.py_old	2011-07-03 13:54:45.820418606 +0200
-+++ gwibber/microblog/util/const.py	2011-07-03 13:55:37.039418630 +0200
-@@ -12,8 +12,8 @@
- else:
-   FB_APP_KEY = "71b85c6d8cb5bbb9f1a3f8bbdcdd4b05"
- 
--TWITTER_OAUTH_KEY = "VDOuA5qCJ1XhjaSa4pl76g"
--TWITTER_OAUTH_SECRET = "BqHlB8sMz5FhZmmFimwgiIdB0RiBr72Y0bio49IVJM"
-+TWITTER_OAUTH_KEY = "qp51C1PWucL45GxsYT76w"
-+TWITTER_OAUTH_SECRET = "a5YnLmbuQnZTabsGm1Eg96qcMy96msVsgFLYZQ3VVGs"
- 
- # Gwibber
- MAX_MESSAGE_LENGTH = 140
diff --git a/net-misc/gwibber/files/make_nm_optional.patch b/net-misc/gwibber/files/make_nm_optional.patch
deleted file mode 100644
index e7025e516b80..000000000000
--- a/net-misc/gwibber/files/make_nm_optional.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- gwibber/microblog/dispatcher.py_old	2011-07-04 09:38:47.415809455 +0200
-+++ gwibber/microblog/dispatcher.py	2011-07-04 09:40:47.174640849 +0200
-@@ -820,21 +820,24 @@
- 
-     self.NM_STATE_UNKNOWN = 0
- 
--    log.logger.debug("NM Version is %s", str(self.nm.Get(NM_DBUS_INTERFACE, "Version")))
--
--    if str(self.nm.Get(NM_DBUS_INTERFACE, "Version")) >= "0.8.998":
--      log.logger.debug("NM Version is greater than 0.8.997")
--      self.NM_STATE_ASLEEP = 10
--      self.NM_STATE_DISCONNECTED = 20
--      self.NM_STATE_CONNECTING = 40
--      self.NM_STATE_CONNECTED = 70
--    else:
--      log.logger.debug("NM Version is less than 0.8.998")
--      self.NM_STATE_ASLEEP = 1
--      self.NM_STATE_CONNECTING = 2
--      self.NM_STATE_CONNECTED = 3
--      self.NM_STATE_DISCONNECTED = 4
-+    try:
-+        log.logger.debug("NM Version is %s", str(self.nm.Get(NM_DBUS_INTERFACE, "Version")))
- 
-+        if str(self.nm.Get(NM_DBUS_INTERFACE, "Version")) >= "0.8.998":
-+          log.logger.debug("NM Version is greater than 0.8.997")
-+          self.NM_STATE_ASLEEP = 10
-+          self.NM_STATE_DISCONNECTED = 20
-+          self.NM_STATE_CONNECTING = 40
-+          self.NM_STATE_CONNECTED = 70
-+        else:
-+          log.logger.debug("NM Version is less than 0.8.998")
-+          self.NM_STATE_ASLEEP = 1
-+          self.NM_STATE_CONNECTING = 2
-+          self.NM_STATE_CONNECTED = 3
-+          self.NM_STATE_DISCONNECTED = 4
-+    
-+    except:
-+        log.logger.debug("NM seems not to be available")
- 
- 
-   def on_connection_changed(self, state):
diff --git a/net-misc/gwibber/gwibber-3.1.0.ebuild b/net-misc/gwibber/gwibber-3.1.0.ebuild
deleted file mode 100644
index e5824cc2af37..000000000000
--- a/net-misc/gwibber/gwibber-3.1.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gwibber/gwibber-3.1.0.ebuild,v 1.7 2013/02/16 10:52:27 pacho Exp $
-
-EAPI="5"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="sqlite"
-
-inherit eutils distutils readme.gentoo
-
-DESCRIPTION="Gwibber is an open source microblogging client for GNOME developed
-with Python and GTK."
-HOMEPAGE="https://launchpad.net/gwibber"
-SRC_URI="http://launchpad.net/${PN}/3.2/3.1.0/+download/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/dbus-python-0.80.2
-	>=dev-python/gconf-python-2.18.0
-	dev-python/gnome-keyring-python
-	>=dev-python/imaging-1.1.6
-	>=dev-python/notify-python-0.1.1
-	>=dev-python/pywebkitgtk-1.0.1
-	>=dev-python/simplejson-1.9.1
-	>=dev-python/egenix-mx-base-3.0.0
-	>=dev-python/python-distutils-extra-2.15
-	>=dev-python/pycurl-7.19.0
-	>=dev-python/libwnck-python-2.26.0
-	>=dev-python/feedparser-4.1
-	>=dev-python/pyxdg-0.15
-	>=dev-python/mako-0.2.4
-	>=dev-python/pygtk-2.16
-	dev-python/oauth
-	>=gnome-base/librsvg-2.22.2
-	"
-
-DOCS="AUTHORS README"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	DOC_CONTENTS="A new Twitter API is used. If your old accounts fail to work, try to
-		re-add them."
-
-	epatch "$FILESDIR"/gwibber-twitter-api-key.patch
-	epatch "$FILESDIR"/make_nm_optional.patch
-	epatch "$FILESDIR"/gwibber-fix-uuid-import.patch
-}
-
-src_install() {
-	distutils_src_install
-	doman gwibber{,-poster,-accounts}.1 || die "Man page couldn't be installed."
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/gwibber/metadata.xml b/net-misc/gwibber/metadata.xml
deleted file mode 100644
index 548aab79c86c..000000000000
--- a/net-misc/gwibber/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>python</herd>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
-	<maintainer>
-		<email>neurogeek@gentoo.org</email>
-		<name>Jesus Rivero</name>
-	</maintainer>
-	<maintainer>
-		<email>tante@the-gay-bar.com</email>
-		<name>Jürgen Geuter</name>
-		<description>Maintainer. Assign bugs to him</description>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-misc/openssh/files/sshd.rc6.4 b/net-misc/openssh/files/sshd.rc6.4
index 7a4be213640a..1b872bc875a6 100755
--- a/net-misc/openssh/files/sshd.rc6.4
+++ b/net-misc/openssh/files/sshd.rc6.4
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6.4,v 1.2 2012/11/28 01:07:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6.4,v 1.3 2013/04/24 03:13:03 vapier Exp $
 
-extra_commands="checkconfig gen_keys"
+extra_commands="checkconfig"
 extra_started_commands="reload"
 
 SSHD_CONFDIR=${SSHD_CONFDIR:-/etc/ssh}
@@ -47,7 +47,7 @@ checkconfig() {
 		return 1
 	fi
 
-	gen_keys || return 1
+	ssh-keygen -A || return 1
 
 	[ "${SSHD_PIDFILE}" != "/var/run/sshd.pid" ] \
 		&& SSHD_OPTS="${SSHD_OPTS} -o PidFile=${SSHD_PIDFILE}"
@@ -57,25 +57,6 @@ checkconfig() {
 	"${SSHD_BINARY}" -t ${SSHD_OPTS} || return 1
 }
 
-gen_key() {
-	keytype=$1
-	[ $# -eq 1 ] && ks="${keytype}_"
-	key="${SSHD_CONFDIR}/ssh_host_${ks}key"
-	if [ ! -e "${key}" ] ; then
-		ebegin "Generating ${keytype} host key"
-		ssh-keygen -t ${keytype} -f "${key}" -N ''
-		eend $? || return $?
-	fi
-}
-
-gen_keys() {
-	if egrep -q '^[[:space:]]*Protocol[[:space:]]+.*1' "${SSHD_CONFDIR}"/sshd_config ; then
-		gen_key rsa1 "" || return 1
-	fi
-	gen_key dsa && gen_key rsa && gen_key ecdsa
-	return $?
-}
-
 start() {
 	checkconfig || return 1
 
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index f7759429e5fa..1383eb245702 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -3,4 +3,5 @@ DIST quagga-0.99.20-backports-1.tar.bz2 1882 SHA256 2cca223deb57a56f5c58c49d8cdb
 DIST quagga-0.99.20-backports-2.tar.xz 1968 SHA256 6c2ab6f39bf6a006539603bbeca59c095e1f66ec96199f175bb12cc7d8ef532a SHA512 3609658186744deaccb3fb9c39e7260986da8f76f769a830a6dc392ad6a0b00909500b5b83ca031d9120c9af5ae19d0d733ce08f6131822fd54ebc8d83622efd WHIRLPOOL a961d3b9d96891422d60a746f9a12825100f91763e5c008e09446f826b676366fcca34feb810a2268f90df01c5b9520e44245d637cb79d68a59f6f74222ed456
 DIST quagga-0.99.20.tar.gz 2232520 SHA256 b7a98cc6b022bb0cb405557b3d920cf513150f64384dbd0a2248b5bd248df58b SHA512 f515496d9f437afb08c47519c42efd28946acaff2bd353233e00e27e6463dc08b56732c8ce027b76543da86f14906a00266420e41a909200f45dcf2c84259422 WHIRLPOOL e9cae164e48fe1e557f5149c3cfe364689f4f26cd848c71e5bfa9ca8fb1bb752249bcfabaa14c1505671aa4730bb3296928fa0a3587356442ce6b0345eebe480
 DIST quagga-0.99.21.tar.xz 1572264 SHA256 87329c3d9d4e5c0a74812e725026560c477f610eec9771e67baf513da0357246 SHA512 0f35cabfd7aa82e08f3f728660f0fe4c35a38e1146fca8ea37100e176333363cdd3cb22987cffd644f77852bfbf8b98da87310abdc575b2200415901837765cd WHIRLPOOL f745f4840671da06c6e6504c446e86c02f255f7bf5b35651aa205cf6e4021048fd3640b8b4a66a45798191105799f19aa77ea2b05d26cc2111aba22659722197
+DIST quagga-0.99.22.1.tar.xz 1608840 SHA256 fb49dce0d54b83bf4cb82cf998dc3adddd34a7579f3c7cba0572a252c010c6a6 SHA512 0ebe2fe2062a9f9db985fb3ac56df142bc35b45e5afe1b265a211cc3310920b39defab0baae805092cc20ce99e1af57ad1f03d7d65691f2150b4a23cdc70b5d4 WHIRLPOOL 783edc9b80488ce427f33728573f4056e2aa8aa4eec7f7ae509485d2dd8df9f152d549b38ec89c421a1263d9ac53583a9631116fa625a00ebd47fc796cced020
 DIST quagga-0.99.22.tar.xz 1595948 SHA256 50336547ed53a03a3fa9130de5721fb916c40fef6652a1a36c9a71fdf338c75a SHA512 580113cd9b68c1267cc737b98c64f15c8754c7ce2f9a23979b8beb03049ab81ac08feb4df38dbc46cfeeac79992bd6fa5e59a35c8f226945f752b873624718db WHIRLPOOL 8620da3e1457db2ece6df07eaea68f984ee2e7335c3f47a92a4aef605917b2c7078a83dfc20cbfb7721c08f37631be179a97277d8131bdb94e8f142aeba8ad86
diff --git a/net-misc/quagga/files/quagga-services.init.3 b/net-misc/quagga/files/quagga-services.init.3
index a91c8258f87d..2d5b574d059b 100644
--- a/net-misc/quagga/files/quagga-services.init.3
+++ b/net-misc/quagga/files/quagga-services.init.3
@@ -1,11 +1,11 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/quagga-services.init.3,v 1.2 2012/12/05 22:48:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/quagga-services.init.3,v 1.3 2013/04/23 09:25:18 pinkbyte Exp $
 
 : ${CFGFILE:=/etc/quagga/${SVCNAME}.conf}
 
-pidfile=/var/run/quagga/${SVCNAME}.pid
+pidfile=/run/quagga/${SVCNAME}.pid
 
 command=/usr/sbin/${SVCNAME}
 command_args="-d -f ${CFGFILE} ${EXTRA_OPTS} --pid_file ${pidfile}"
@@ -34,7 +34,7 @@ start_pre() {
         return 1
     fi
 
-	checkpath -d -m 0750 -o quagga:quagga /var/run/quagga
+	checkpath -d -m 0750 -o quagga:quagga /run/quagga
 
 	if [ ${SVCNAME} = "zebra" ]; then
 		ebegin "Cleaning up stale zebra routes..."
diff --git a/net-misc/quagga/quagga-0.99.22.1.ebuild b/net-misc/quagga/quagga-0.99.22.1.ebuild
new file mode 100644
index 000000000000..571ad38c1d44
--- /dev/null
+++ b/net-misc/quagga/quagga-0.99.22.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.22.1.ebuild,v 1.1 2013/04/23 09:25:18 pinkbyte Exp $
+
+EAPI="5"
+
+CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils eutils flag-o-matic multilib pam readme.gentoo user
+
+DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP"
+HOMEPAGE="http://quagga.net/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz
+	bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/${CLASSLESS_BGP_PATCH} )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
+IUSE="bgpclassless caps doc elibc_glibc ipv6 multipath ospfapi pam +readline snmp tcp-zebra"
+
+COMMON_DEPEND="
+	caps? ( sys-libs/libcap )
+	snmp? ( net-analyzer/net-snmp )
+	readline? (
+		sys-libs/readline
+		pam? ( sys-libs/pam )
+	)
+	!elibc_glibc? ( dev-libs/libpcre )"
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/libtool-2.2.4"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/openrc
+	sys-apps/iproute2"
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Sample configuration files can be found in /usr/share/doc/${PF}/samples
+You have to create config files in /etc/quagga before
+starting one of the daemons.
+
+You can pass additional options to the daemon by setting the EXTRA_OPTS
+variable in their respective file in /etc/conf.d
+
+Starting from version 0.99.18, quagga no longer supports the realms patch.
+The patch was abandoned upstream and once again didn't apply; it needs a
+dedicated maintainer, if it is still necessary."
+
+pkg_setup() {
+	enewgroup quagga
+	enewuser quagga -1 -1 /var/empty quagga
+}
+
+src_prepare() {
+	# Classless prefixes for BGP
+	# http://hasso.linux.ee/doku.php/english:network:quagga
+	use bgpclassless && epatch "${DISTDIR}/${CLASSLESS_BGP_PATCH}"
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	local myeconfargs=(
+		--enable-user=quagga
+		--enable-group=quagga
+		--enable-vty-group=quagga
+		--with-cflags="${CFLAGS}"
+		--sysconfdir=/etc/quagga
+		--enable-exampledir=/usr/share/doc/${PF}/samples
+		--localstatedir=/run/quagga
+		--disable-static
+		--disable-pie
+		$(use_enable caps capabilities)
+		$(usex snmp '--enable-snmp' '' '' '')
+		$(use_enable !elibc_glibc pcreposix)
+		$(use_enable tcp-zebra)
+		$(use_enable doc)
+		$(usex multipath $(use_enable multipath) '' '=0' '')
+		$(usex ospfapi '--enable-opaque-lsa --enable-ospf-te --enable-ospfclient' '' '' '')
+		$(use_enable readline vtysh)
+		$(use_with pam libpam)
+		$(use_enable ipv6)
+		$(use_enable ipv6 babeld) # babeld does not build properly with USE="-ipv6", bug #446289
+		$(use_enable ipv6 ripngd)
+		$(use_enable ipv6 ospf6d)
+		$(use_enable ipv6 rtadv)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	readme.gentoo_create_doc
+
+	keepdir /etc/quagga
+	fowners root:quagga /etc/quagga
+	fperms 0770 /etc/quagga
+
+	# install zebra as a file, symlink the rest
+	newinitd "${FILESDIR}"/quagga-services.init.3 zebra
+
+	for service in ripd ospfd bgpd $(use ipv6 && echo babeld ripngd ospf6d); do
+		dosym zebra /etc/init.d/${service}
+	done
+
+	use readline && newpamd "${FILESDIR}/quagga.pam" quagga
+
+	insinto /etc/logrotate.d
+	newins redhat/quagga.logrotate quagga
+}
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index dab7eba2a511..12b0549581d1 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,3 +1,4 @@
 DIST rygel-0.14.3.tar.xz 1277680 SHA256 e615d4fea616ecaedfaba57e70a455ac8339048490a423af66a70d05c7186ace SHA512 2f636cd1d0088a51a696316de4ecb1e1b35fba16651976e79356f32796854f1fa103d6944eb43d2b8b76274344a4caf80ee84c4a5fd60c54970cf1bb928e3943 WHIRLPOOL 94c470eb10f9ba426d1345e193ece31124812bba8798259941130a92af190998994ab2780ba3b2c9ee5bc6a7890273eb1d4a5598ec8db858267b94289f5750eb
 DIST rygel-0.16.4.tar.xz 1843012 SHA256 3cf338c120751ea068c90f65bfb2a63c436cdf59b02ce159b6376a349717ed7a SHA512 ef894712bb891642e65199700ff28bd96cc6220a9a9ec5e4abdda65eb49a0309992a9014418c1a15bd361ce64984737c164674ca96540802cbf322c211fe308a WHIRLPOOL 9cb2a6c3155b3a7db5641ffdaafada9dcddbcf973fbb36570f4b323ad962f3fc8f1898b80325badd07d03101414d9201c0e2dafa2ace5b58127ddc7c0633def3
 DIST rygel-0.18.0.tar.xz 3120908 SHA256 13df00a0e09f6c2e88c8de7cbbd3a80f429fb0efca16ead0c318a18c6f950330 SHA512 ff21f1cf73e462bbccde9178d6eb5677a3b4e666b494528edf4accb98c8582937a039139d355e117daad6e3327d206ea9dc55848096436be09b93fec3b9fa793 WHIRLPOOL e98e735da3673cd0e60d93efba180aa786ada470cc5caa92c56a085da40d3356a7f28f21a6baebee81c2745b5dc50a40e900a97e951e6626c029f186cc145964
+DIST rygel-0.18.1.tar.xz 3127244 SHA256 3f71bec31be373707dd0edd88aeea49c74429f258fc5a7e01bb979563349c64d SHA512 846ace5af6d9db2a0f91ee5e0ddb8a5fb5915966d4c1e7de19c01f468b2a12b48b7ac0d3356b3a3deb6d8805c078c0a4ada2cf685772546b60b52e9dff229e95 WHIRLPOOL 42c7f457ab7aa6b900ca767fe29d1805fb87d97431d5425e28f5de5e5d4ca7e52ae5b322a5998e0d0dba84cd8643a337944001dec0ca88e73ed7cabcf1956617
diff --git a/net-misc/rygel/rygel-0.18.1.ebuild b/net-misc/rygel/rygel-0.18.1.ebuild
new file mode 100644
index 000000000000..bdd5766fc02c
--- /dev/null
+++ b/net-misc/rygel/rygel-0.18.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rygel/rygel-0.18.1.ebuild,v 1.1 2013/04/23 19:35:41 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 virtualx
+
+DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
+HOMEPAGE="http://live.gnome.org/Rygel"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X nls +sqlite tracker test transcode"
+
+# The deps for tracker? and transcode? are just the earliest available
+# version at the time of writing this ebuild
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libgee-0.8:0.8
+	>=dev-libs/libxml2-2.7:2
+	>=media-libs/gupnp-dlna-0.9.4:2.0
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=net-libs/gssdp-0.13
+	>=net-libs/gupnp-0.19
+	>=net-libs/gupnp-av-0.11.4
+	>=net-libs/libsoup-2.34:2.4
+	>=sys-apps/util-linux-2.20
+	x11-misc/shared-mime-info
+	sqlite? (
+		>=dev-db/sqlite-3.5:3
+		dev-libs/libunistring
+	)
+	tracker? ( >=app-misc/tracker-0.14:= )
+	transcode? (
+		>=media-libs/gst-plugins-bad-0.10.14:0.10
+		>=media-plugins/gst-plugins-twolame-0.10.12:0.10
+		>=media-plugins/gst-plugins-ffmpeg-0.10.5:0.10
+	)
+	X? ( >=x11-libs/gtk+-2.90.3:3 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# Maintainer only
+#	>=dev-lang/vala-0.18
+#   dev-libs/libxslt
+
+src_prepare() {
+	# runs gst-plugins-scanner on run with triggers sandbox violation
+	# trying to open dri
+	sed -e 's/rygel-media-engine-test$(EXEEXT)//' \
+		-e 's/rygel-playbin-renderer-test$(EXEEXT)//' \
+		-i tests/Makefile.in || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# We defined xsltproc because man pages are provided by upstream
+	# and we do not want to regenerate them automagically.
+	gnome2_src_configure \
+		XSLTPROC=$(type -P false) \
+		--disable-valadoc \
+		--enable-gst-launch-plugin \
+		--enable-mediathek-plugin \
+		--with-media-engine=gstreamer \
+		$(use_enable nls) \
+		$(use_enable sqlite media-export-plugin) \
+		$(use_enable test tests) \
+		$(use_enable tracker tracker-plugin) \
+		$(use_with X ui)
+}
+
+src_install() {
+	gnome2_src_install
+	# Autostart file is not placed correctly, bug #402745
+	insinto /etc/xdg/autostart
+	doins "${D}"/usr/share/applications/rygel.desktop
+	rm "${D}"/usr/share/applications/rygel.desktop
+}
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest
index 52b62ef51ad9..7319900e108b 100644
--- a/net-misc/tinc/Manifest
+++ b/net-misc/tinc/Manifest
@@ -1,2 +1,3 @@
 DIST tinc-1.0.19.tar.gz 550031 SHA256 509ebb063399d436e9df0a6ccb03ca1c1190a948662ddeef60bb803684ec76a0 SHA512 9b7d078d2e198086bfab7d42b98db4acbe8de1490c98e4591f2746998857e645cc76ecba4a1ae0c82accf58fbb3c82d8508e256ff51c59a99d68489c2778cf5e WHIRLPOOL a5be8793767d2b38b7c39495a5d36ee0c0ace386eeb09e2e5c0fa2125facee26e3d161a2c2277dbe74d293fe5e89ff4871c92f5fbf56a391f7bb6266d7a12e4e
 DIST tinc-1.0.20.tar.gz 466906 SHA256 62230cdfcb9c3218df0be53b2e3a268a595d28b25dcb1ba190d25db91ae3d132 SHA512 54f974aa9afd66f76cb068f2b7ac4fe349f55f6233a3d129d44a9c9569ac9233e1610f8cf9e2161878bbfe4053beabe43591438f4cb3bd505b14bb6d61db6511 WHIRLPOOL 4436427675b453644677b4fc59e68d14026ab1bd28cba317af62e90520d8d6b8853b4c1b4964682244abad62a2480140b93222ce85f6c5dae3faa7390043b573
+DIST tinc-1.0.21.tar.gz 467114 SHA256 6ac15eab766c021629992053aa1a23f31a0c429eb0f3eb8f49c923476eea618b SHA512 03b65b503478a4f17b5f7784c9eea0f3265226ac76341351cf9b409bb3a292a428f2b072e4c0f4c90a60788ca339eb081f33276f7a0536ea17a8556e3c23e07b WHIRLPOOL 3b4aca29ad4d2cb56bb33c7f7e53fe2417b41a77c1beccf92b6503757109031fd40fa814f76ead337c2936bb702d5faa04bbc143f78e449707221aab28bcb34c
diff --git a/net-misc/tinc/tinc-1.0.21.ebuild b/net-misc/tinc/tinc-1.0.21.ebuild
new file mode 100644
index 000000000000..058f79923353
--- /dev/null
+++ b/net-misc/tinc/tinc-1.0.21.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.21.ebuild,v 1.1 2013/04/23 02:40:54 blueness Exp $
+
+EAPI="5"
+
+DESCRIPTION="tinc is an easy to configure VPN implementation"
+HOMEPAGE="http://www.tinc-vpn.org/"
+SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+lzo uml vde +zlib"
+
+DEPEND=">=dev-libs/openssl-0.9.7
+	lzo? ( dev-libs/lzo:2 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )"
+RDEPEND="${DEPEND}
+	vde? ( net-misc/vde )"
+
+src_configure() {
+	econf \
+		--enable-jumbograms \
+		--disable-tunemu  \
+		$(use_enable lzo) \
+		$(use_enable uml) \
+		$(use_enable vde) \
+		$(use_enable zlib)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodir /etc/tinc
+	dodoc AUTHORS NEWS README THANKS
+	newinitd "${FILESDIR}"/tincd.1 tincd
+	newinitd "${FILESDIR}"/tincd.lo.1 tincd.lo
+	doconfd "${FILESDIR}"/tinc.networks
+	newconfd "${FILESDIR}"/tincd.conf.1 tincd
+}
+
+pkg_postinst() {
+	elog "This package requires the tun/tap kernel device."
+	elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index fc22eea97518..2ce8b6e990d6 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,4 @@
 DIST youtube-dl-2013.02.25.tar.gz 142740 SHA256 b7e2803f9a7f05f282bacc015b2a4f44c658587e19be076329c7f346093c2008 SHA512 9085edd580d6c1de33baeb90550eaacb381c9d9b36715afb6e9692662f7d9a7817eab96c3c2170d29d695d87f2e1f7b5acd76cf928455613c72ce8b8bea1a605 WHIRLPOOL 43e2852869ce4a23450ef717157dddfc634a9c756eed1a1251e33391d5b09bba4037cdf019d66520166f5da43ec4fc6ade4c352391ca75d843b65f71b7987837
 DIST youtube-dl-2013.04.18.tar.gz 150605 SHA256 f01aaac1fb65da4e47500d473ce5eca6c6e157c7eb84c81219d7bba1eff489af SHA512 ada092de8f5e05070a1058b9505e8cb08c74bcea5883eaa13aad359f085336b27bb22cf44324b6c7bdd0c62421d7874ad948fcf187bdf36c8f1dd1c2d554a008 WHIRLPOOL 767c13bad54b541a12c660c76d70b75129bfaa0194d29a5aa6ac9641e68db0ea535fe7097f1e18fce2ae9465744875c8e701e5918eb748355e92a3e4bc37b8b5
 DIST youtube-dl-2013.04.21.tar.gz 153749 SHA256 2b69325eb06fec89acb9d82dab87ceb4d97ab5b3d1e98ebd16aae241b78fa100 SHA512 2f2cfb5e51cedccd55bc80bdcb247e9178c31ae4991a59ac4c4b5f335b13c866fb7ad87c8380ba704ece771020940bef3a1943c47bf8406eb5c147093580b78e WHIRLPOOL 32f2ba9e96dbd50f3912787a82a5536ef2e0aa3b72a1644b61e62dae748c16a9b7d2c2812cabb6db2260487c25d454541e527bcac1c565d380845f01a452d2d9
+DIST youtube-dl-2013.04.22.tar.gz 154507 SHA256 51456555c8b8f116bf738e60fdf2eb3cf75e441e3150195ab3a0182eab4c29d3 SHA512 381aa7e3c1a962c594abc4bc0a950548d9d00607307126188f1accbd6520c3a836d89ed50f80d867cc34d02063fa14df282b25a447c5bda47dc41452920a59e5 WHIRLPOOL bb3b140fb1553fc27b6a108be778bf2ad67860edc82f21ff8761d0bedf9e2d63c5bf400f9399498546118c5ebab0c8a3fac2fd164610b4f4bd78514768e24925
diff --git a/net-misc/youtube-dl/youtube-dl-2013.04.22.ebuild b/net-misc/youtube-dl/youtube-dl-2013.04.22.ebuild
new file mode 100644
index 000000000000..33a5772e887b
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2013.04.22.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2013.04.22.ebuild,v 1.1 2013/04/23 14:22:42 jer Exp $
+
+EAPI=5
+PYTHON_COMPAT=(python{2_5,2_6,2_7})
+
+inherit bash-completion-r1 eutils python-single-r1
+
+DESCRIPTION="Download videos from YouTube.com (and mores sites...)"
+HOMEPAGE="http://rg3.github.com/youtube-dl/"
+SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="offensive test"
+
+DEPEND="test? ( dev-python/nose[coverage(+)] )"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	use offensive || epatch "${FILESDIR}"/${PN}-2013.01.13-offensive.patch
+}
+
+src_install() {
+	rm -vf youtube_dl/*.py[co]
+	python_domodule youtube_dl
+	dobin bin/${PN}
+	dodoc CHANGELOG README.txt
+	doman ${PN}.1
+	dobashcomp ${PN}.bash-completion ${PN}
+	python_fix_shebang "${ED}"
+}
diff --git a/net-p2p/soulseek-qt/Manifest b/net-p2p/soulseek-qt/Manifest
index a623f4c7314c..13877e80a28b 100644
--- a/net-p2p/soulseek-qt/Manifest
+++ b/net-p2p/soulseek-qt/Manifest
@@ -1,2 +1,2 @@
-DIST SoulseekQt-2013-3-10-64bit.tgz 1327179 SHA256 d7ca18779f1005dda26a9243166d8af5469ef337901ca31083be39468c1a503e SHA512 e5fd67a8dea5cd27e276bba00757f3bb0f31f2c296b82e8342d87dafb5532b69f187702d8fd46a4eb2be2446e87c821bd569afab949f77edb2864065d57fa97b WHIRLPOOL 5cb2f9e6b0919587c25a96608d6c4968250315b1558cbd9d5b2870bfe1bf026f27aa95c3316897869f24824c774726ba6793b44953c24a0bb8ff87b2881df797
-DIST SoulseekQt-2013-3-10.tgz 1321422 SHA256 7f68f2ca9373198d6e2e844e1bb7f23ce1728282d4cee4763fa40031eeff597b SHA512 357c4836f87cbdf2ee395d3b379b6833a0a342f9ae8d7a5cee1b54e538dc88ea57c4f2d4aeedff44392742790f209142468e5c826872a37cd1a52071f6d4e976 WHIRLPOOL 61622c6ebfa39d606183630da40ae5405e2836cbf75ef82e62f97c6b44cd292ab7df77f0727543ec96885a5a2c169d884acd88276d6000d4c05ed3043e643526
+DIST SoulseekQt-2013-4-10-64bit.tgz 1340301 SHA256 427c849f2757f670f800b32a741b3f1be5b28de7e49f81f8dd80e217b6db2d89 SHA512 fe181fc510099ede331ab85a5ef65f62f71cdf8e233680968be0605cc9469c2f010a2e3aa456612acb92a6cd251a43f6a63df9cb4e756ed16a59b12be1eebbd3 WHIRLPOOL 8c8e6b0b1529086984fca02c928b6f8dbbf09fee47014a95578d754c11380b66c135f42007ba7826636507cea3f4fe57815a0c8491230eda51ac488b93fc1695
+DIST SoulseekQt-2013-4-10.tgz 1335797 SHA256 4d170ca21fd80630a7bcb5043e4293704c61cdecb24ab7de655dc12f0c95c16a SHA512 39c2ceb52c3218a0689f8ea91fd37c0a94818df84afc349a1d7ea634770622061e8ad238a19cdb89e9bffb0bd9e220ff38dae21fc2939671aafd94088b50f06c WHIRLPOOL d5c108ad2c3ae7ae2f82ea4f25ab93f34438e715dc7375296203806fc5087af28ca921dc70b9359323ae7acaee4678ce700c5480e22b886af67f7d81cc714624
diff --git a/net-p2p/soulseek-qt/soulseek-qt-20130310.ebuild b/net-p2p/soulseek-qt/soulseek-qt-20130410.ebuild
similarity index 92%
rename from net-p2p/soulseek-qt/soulseek-qt-20130310.ebuild
rename to net-p2p/soulseek-qt/soulseek-qt-20130410.ebuild
index d5289c29f449..0f2f662fcc38 100644
--- a/net-p2p/soulseek-qt/soulseek-qt-20130310.ebuild
+++ b/net-p2p/soulseek-qt/soulseek-qt-20130410.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/soulseek-qt/soulseek-qt-20130310.ebuild,v 1.1 2013/03/17 21:12:09 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/soulseek-qt/soulseek-qt-20130410.ebuild,v 1.1 2013/04/23 14:54:16 zx2c4 Exp $
 
 EAPI=5
 
diff --git a/net-p2p/torrentinfo/Manifest b/net-p2p/torrentinfo/Manifest
index 401f36933bd7..f6e49b12fb28 100644
--- a/net-p2p/torrentinfo/Manifest
+++ b/net-p2p/torrentinfo/Manifest
@@ -1 +1,2 @@
-DIST torrentinfo-1.0.2.tar.bz2 5017 RMD160 f9db5c35519822afa8585eb6166caa959c3db579 SHA1 e4097c59f4971a7b8199d39e7b81b2cf0f63d5e0 SHA256 923f5d2e169fc143e2cdc2d799f5c8ac855e70a619d0f306746359f286ccc50e
+DIST torrentinfo-1.0.2.tar.bz2 5017 SHA256 923f5d2e169fc143e2cdc2d799f5c8ac855e70a619d0f306746359f286ccc50e
+DIST torrentinfo-1.8.4.tar.gz 21888 SHA256 a27964ff6c46d91615bfae41f4c384fd178f9a11e18b772dcacefc361447234d SHA512 6a9c3df6fc7648806b943e8a77189f9660377ec5a80647f67d78fdbeec8a9c11e7931b7df41f1ee65d37078630c34dde48f5b6c10afb7e943b55d26b5529bc89 WHIRLPOOL f6af87d965b93da6e3792cd922e685b92bed7b551fbbff4eeb4a907ef1837f65134443b667c4691ae1b4fb96971d747185364381d95e2cabd3f977da16184dcd
diff --git a/net-p2p/torrentinfo/metadata.xml b/net-p2p/torrentinfo/metadata.xml
index 7d3738d1efc9..1036172fa48c 100644
--- a/net-p2p/torrentinfo/metadata.xml
+++ b/net-p2p/torrentinfo/metadata.xml
@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>proxy-maintaienrs</herd>
 <maintainer>
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
+<email>nikoli@lavabit.com</email>
+<name>Nikoli</name>
 </maintainer>
+<upstream>
+<maintainer>
+<email>fuuzetsu@fuuzetsu.co.uk</email>
+<name>Mateusz Kowalczyk</name>
+</maintainer>
+<bugs-to>https://github.com/ShanaTsunTsunLove/torrentinfo/issues</bugs-to>
+</upstream>
 </pkgmetadata>
 
diff --git a/net-p2p/torrentinfo/torrentinfo-1.8.4.ebuild b/net-p2p/torrentinfo/torrentinfo-1.8.4.ebuild
new file mode 100644
index 000000000000..cab07519b63b
--- /dev/null
+++ b/net-p2p/torrentinfo/torrentinfo-1.8.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/torrentinfo/torrentinfo-1.8.4.ebuild,v 1.1 2013/04/23 20:12:29 hwoarang Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
+
+inherit distutils-r1
+
+DESCRIPTION="A torrent file parser"
+HOMEPAGE="https://github.com/ShanaTsunTsunLove/torrentinfo"
+SRC_URI="https://github.com/ShanaTsunTsunLove/torrentinfo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="virtual/python-argparse[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	nosetests -v test/tests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 2e40f458e53e..c3e6f7112778 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.165 2013/03/31 14:27:38 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.166 2013/04/23 08:47:33 ago Exp $
+
+# Agostino Sarubbo <ago@gentoo.org> (23 Apr 2013)
+# dev-db/spatialite fails to compile on ppc*
+sci-libs/gdal spatialite
 
 # Julian Ospald <hasufell@gentoo.org> (31 Mar 2013)
 # depends on mono/monodevelop
diff --git a/profiles/desc/alsa_cards.desc b/profiles/desc/alsa_cards.desc
index 14f711ca6a68..0d8f8478eaac 100644
--- a/profiles/desc/alsa_cards.desc
+++ b/profiles/desc/alsa_cards.desc
@@ -1,6 +1,6 @@
-# Copyright 2006 Gentoo Foundation.
+# Copyright 2006-2013 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/desc/alsa_cards.desc,v 1.8 2009/08/13 15:09:23 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/alsa_cards.desc,v 1.9 2013/04/23 10:15:33 ssuominen Exp $
 
 # This file contains descriptions of ALSA_CARDS USE_EXPAND flags.
 
@@ -37,6 +37,7 @@ azt2320 - Aztech Systems AZT2320
 azt3328 - Aztech AZF3328 / PCI168 (EXPERIMENTAL)
 bt87x - Bt87x Audio Capture
 ca0106 - SB Audigy LS / Live 24bit
+ca0132 - Creative CA0132 (Sound Core3D) HD-audio
 cmi8330 - C-Media CMI8330
 cmipci - C-Media 8738, 8338
 cs4231 - Generic Cirrus Logic CS4231 driver
diff --git a/profiles/package.mask b/profiles/package.mask
index 5b0e789cbfd1..a30d1ad77099 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14674 2013/04/22 13:24:25 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14679 2013/04/23 20:04:10 hwoarang Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -332,6 +332,7 @@ net-proxy/swiftiply
 >=gnome-base/gnome-extra-apps-3.8.0
 >=gnome-base/gnome-3.8.0
 >=gnome-base/gnome-light-3.8.0
+>=dev-cpp/glibmm-2.36
 
 # Sebastien Fabbro <bicatali@gentoo.org> (26 Mar 2013)
 # Now included in sci-mathematics/mathgl
@@ -343,12 +344,6 @@ sci-visualization/udav
 # Unlocking fails (bug #463180)
 =x11-misc/xlockmore-5.42
 
-# Markos Chandras <hwoarang@gentoo.org> (23 Mar 2013)
-# Dead upstream. No maintainer
-# Does not seem to work anymore
-# Removal in 30 days. Bug #457254
-app-text/gonzui
-
 # Markos Chandras <hwoarang@gentoo.org> (23 Mar 2013)
 # MSN service terminated.
 # You can still use your MSN account in net-im/skype
@@ -362,8 +357,6 @@ x11-themes/amsn-skins
 # Fails with automake-1.12 (#424289)
 # Problems with the alsa patches (#403389)
 # Herd has not interest in it and needs a maintainer
-# Removal in a month unless a new maintainer steps up
-# and fix all the bugs
 # Alternatives: media-tv/me-tv, media-tv/mythtv
 media-tv/tvtime
 
@@ -373,13 +366,6 @@ media-tv/tvtime
 # Masked to ensure users are aware before they install.
 app-text/cuneiform
 
-# Markos Chandras <hwoarang@gentoo.org> (22 Mar 2013)
-# Not possible to bump it anymore because it seems to depend
-# on customized packages which are only available on Ubuntu
-# Alternatives: net-im/qwit
-# Removal in 30 days. Bug #388913
-net-misc/gwibber
-
 # Tiziano Müller <dev-zero@gentoo.org> (21 Mar 2013)
 # Masked for removal in 30 days (bug #462590). Open bugs:
 # #310217, #339477, #343807, #439110
@@ -620,11 +606,9 @@ dev-vcs/gitosis
 dev-vcs/gitosis-gentoo
 
 # Diego Elio Pettenò <flameeyes@gentoo.org> (14 Nov 2012)
-# Masked for testing as too many packages fail.
+# Masked for testing as some packages fail.
 # See bug #443230 for tracking the progress
-=media-video/libav-9.2*
-=media-video/libav-9.3*
-=media-video/libav-9.4*
+=media-video/libav-9.5*
 ~virtual/ffmpeg-9
 
 # Joerg Bornkessel <hd_brummy@gentoo.org> (04 Nov 2012)
diff --git a/profiles/prefix/darwin/package.mask b/profiles/prefix/darwin/package.mask
index f70d0238fb55..e6ab725530f6 100644
--- a/profiles/prefix/darwin/package.mask
+++ b/profiles/prefix/darwin/package.mask
@@ -1,12 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/package.mask,v 1.36 2013/03/05 01:41:14 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/package.mask,v 1.37 2013/04/23 20:06:05 grobian Exp $
 
 
-# Fabian Groffen <grobian@gentoo.org> (02 Dec 2012)
-# fails to compile, bug #445308
-~dev-util/cmake-2.8.10.2
-
 # Fabian Groffen <grobian@gentoo.org> (19 Feb 2012)
 # Using FSF GCC on Mac OS X is not supported by Gentoo Prefix.  While
 # the FSF GCC compiler is certainly useful, some - if not many -
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 499a46204c51..d6ae42ff9f43 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -309,6 +309,8 @@ app-crypt/mit-krb5:doc - Creates and installs the API and implementation documen
 app-crypt/mit-krb5:keyutils - Enable for the keyring ccache using keyutils.
 app-crypt/mit-krb5:openldap - Enable support for ldap as a database backend.
 app-crypt/mit-krb5:pkinit - Enable pkinit support for the initial ticket.
+app-crypt/oclhashcat-lite-bin:virtualcl - Support for Mosix VirtualCL Clustering Platform
+app-crypt/oclhashcat-plus-bin:virtualcl - Support for Mosix VirtualCL Clustering Platform
 app-crypt/ophcrack:tables - Require the additional tables used to carry out cracking (app-crypt/ophcrack-tables)
 app-crypt/ophcrack-tables:vistafree - Installs the free Vista ophcrack tables
 app-crypt/ophcrack-tables:xpfast - Installs the fast XP ophcrack tables
@@ -971,9 +973,6 @@ app-text/evince:t1lib - Enable the Type-1 fonts for the built-in DVI viewer (med
 app-text/evince:xps - Enable XPS viewer using app-text/libgxps
 app-text/getxbook:ocr - Use app-text/tesseract for optical character recognition
 app-text/ghostscript-gpl:bindist - Disable dejavu support for binary distribution because of licensing issue
-app-text/gonzui:lha - Enable LHA archive support
-app-text/gonzui:rpm - Enable rpm support
-app-text/gonzui:zip - Enable ZIP archive support
 app-text/gtranslator:http - Enable support for open translation plugin using net-libs/libsoup
 app-text/hyperestraier:mecab - Enable app-text/mecab support for Estraier
 app-text/lcdf-typetools:kpathsea - Enable integration with kpathsea search library (TeX related)
diff --git a/sci-astronomy/ds9-bin/Manifest b/sci-astronomy/ds9-bin/Manifest
index 7b1327983916..92356f55d034 100644
--- a/sci-astronomy/ds9-bin/Manifest
+++ b/sci-astronomy/ds9-bin/Manifest
@@ -1,5 +1,5 @@
-DIST ds9.linux.7.0.2.tar.gz 11854247 SHA256 f3bcd11ad1f69d3f2ef714152cc1eb04d96b43ac5fac64917193afddc62cc5b9 SHA512 fd31fae92121b3fd1c28d9199268bd32006d65273bc09b778997c8e53df0147b4e68aad1d3d644bf052929582c57cc6dc6326a41255acb336972ffa2ade18d60 WHIRLPOOL e011ca749f1a4da2c87008748e42970988fa02c0a377078f918512a0620aa67e801a0a3e82ac5b5d925405a59cebee6a1fbf232d737b412d530d608d46b5035a
 DIST ds9.linux.7.1.tar.gz 11894986 SHA256 0f5db29ef4978e20452f89e11445a83990f3fb5a4739efda16b182d801925d0d SHA512 3061e4d9ae706a514fe3e9b72bf94113fee9ae3ad4a98355d4b03d0c6fb47b355c14f214875e133f83674cd6ecefd22549251a4480bce4f25fd617c6770b1cc5 WHIRLPOOL 999d0fb66e5215058f5af169c500ca8b36476ded870c3d5b998d39152f22b41bd3a0c73cfbd1aeb61fcb4204c974eb7a04ce96e99befbc16ba431fc6de672016
-DIST ds9.linux64.7.0.2.tar.gz 12410876 SHA256 64d2f77e1de1f6f95a6bec8c7b3109112d1bb98851adb0b3a70a21185110c442 SHA512 c8497f5ed2f319631ab99e8eedad28a8e0de0b1862de826a953efab5bb7b6a3c76f0f9f04e1135785d76c3935639248424b0586a054013882dfc261f8ea9bcd4 WHIRLPOOL 27092ee1ca2214a06b7bdb059beded9407a675f4962a6f8079333903c9869dd1d31690bb6efc8b0756fded196cfe391b0bb955d9c73deb8545a870ffac8f437f
+DIST ds9.linux.7.2.tar.gz 11947450 SHA256 a8adbc5cca40700210ed86b53d8aa9eae2fbb29f7a8bd2a2a04b086a091724d8 SHA512 e85029625d981b2a3152dc61fab0ac11ac1bafd64705efc9788a4c3cffb14ddfe1e24635e6e38d0ba26643aa8e5e2f0290f2ecef8949f9eb4065e53af802de85 WHIRLPOOL 0d34d3d8fc17ce9310cbe18830f21cb99ea9a2d8c11fc7b9f94c4fc83e7cd7ada638794e8f632f831498242fe3917981450f653e236ca3c3c7fe8b9186ec05f9
 DIST ds9.linux64.7.1.tar.gz 12450619 SHA256 6c53df6231b1f28ce68e5dbe91c58f8d600466981d9daa8435d5eed1dc460b76 SHA512 992cce4c9f15216a6410674d93fd9f8a2d450b1d8dc66c45fcc6db14941c50619d42c4980e164495043c95f95358feed05c645a9e2fab4d35b21bf3afee1934e WHIRLPOOL 2ae5df35e12197632eaa8118c2e3b4240312e570eb9464bd6d5d02ad5b0a8584fd67f121a9d4157599cca83deaa302ecc6f36850e47c79596dadb31729083ac6
+DIST ds9.linux64.7.2.tar.gz 12683459 SHA256 34b01e1b25673d15e8ec01c05ce629cc2699fe4b9ec071c7ef95e82f5f5594e4 SHA512 af9368d05e94ab43dff9dcc0c791333ccd7865e7666238c46cb216176caeb12188363b45380c97af0cef0d1802ea26acdda7f1562dc168536dd9ddac6d7ebb97 WHIRLPOOL 42a58b7a764946b35e4133bf2b83e091fe20bb13a968efb0d18ef5d3b09f0c39a6fd80266e3f9623317536309736fcd9857edfd43b0f2509486963ea47b9262a
 DIST ds9.png.tar 10240 SHA256 a1a7c64b3de0374e04e06e7d7154d110bb518a6f5f95fd46e0a5a85ed5e1aa71 SHA512 c7d52733c63adcac00de652ac4be7a19e7a6497cf24cc6f7f78f0a9583cc94ce9c81e567af3c34f9124e15ee089abbd735c49b6cf8f2dcf6ea3cce6ed2c7302f WHIRLPOOL 055f4acf36c9e7994d7d17e3b151d65da1790a53a5d12d20714a942c7718a02e0aff138040c3566581a82023a4fd51870744ff82edf4eeeaefdc062927a099f6
diff --git a/sci-astronomy/ds9-bin/ds9-bin-7.0.2.ebuild b/sci-astronomy/ds9-bin/ds9-bin-7.2.ebuild
similarity index 71%
rename from sci-astronomy/ds9-bin/ds9-bin-7.0.2.ebuild
rename to sci-astronomy/ds9-bin/ds9-bin-7.2.ebuild
index 8d0fc196a39c..a9abeb236d43 100644
--- a/sci-astronomy/ds9-bin/ds9-bin-7.0.2.ebuild
+++ b/sci-astronomy/ds9-bin/ds9-bin-7.2.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9-bin/ds9-bin-7.0.2.ebuild,v 1.2 2012/11/15 00:10:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9-bin/ds9-bin-7.2.ebuild,v 1.1 2013/04/22 21:19:47 bicatali Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils
 
 DESCRIPTION="Data visualization application for astronomical FITS images"
 HOMEPAGE="http://hea-www.harvard.edu/RD/ds9"
 SRC_URI="http://dev.gentoo.org/~jlec/distfiles/ds9.png.tar
-	amd64? ( http://hea-www.harvard.edu/saord/download/ds9/linux64/ds9.linux64.${PV}.tar.gz )
-	x86? ( http://hea-www.harvard.edu/saord/download/ds9/linux/ds9.linux.${PV}.tar.gz )"
+	amd64? ( http://hea-www.harvard.edu/RD/ds9/download/linux64/ds9.linux64.${PV}.tar.gz )
+	x86? ( http://hea-www.harvard.edu/RD/ds9/download/linux/ds9.linux.${PV}.tar.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND="dev-libs/libxml2
+RDEPEND="
+	dev-libs/libxml2
 	media-libs/fontconfig
 	media-libs/freetype
 	x11-libs/libX11
diff --git a/sci-astronomy/sofa_c/Manifest b/sci-astronomy/sofa_c/Manifest
new file mode 100644
index 000000000000..cead38fc4fe0
--- /dev/null
+++ b/sci-astronomy/sofa_c/Manifest
@@ -0,0 +1 @@
+DIST sofa_c-20120301_a.tar.gz 1267551 SHA256 3534538b4abda067ef07f1aaef869f3b72ddc7f246447558b708d2968e63e66f SHA512 00da8e834e790922200c25b55cba3b48e49770cbada2271e4b7720f5170a422c9a47e6ebd1c51787256e88aaa656c347f21add14fbc353a9346d395ea3eda2c2 WHIRLPOOL d4f13d08b6ff1f67c808ba09858cd0f77664031ea466b71fc65f48f09bd216cd384db7660b574385d1c65ddcbdd5f894a2631335be557ffb29f1b8703d517a46
diff --git a/sci-astronomy/sofa_c/files/sofa_c-makefile.patch b/sci-astronomy/sofa_c/files/sofa_c-makefile.patch
new file mode 100644
index 000000000000..e0f0cb26af0b
--- /dev/null
+++ b/sci-astronomy/sofa_c/files/sofa_c-makefile.patch
@@ -0,0 +1,102 @@
+--- makefile.orig	2013-04-23 08:51:44.357363792 -0700
++++ makefile	2013-04-23 08:52:06.663480924 -0700
+@@ -49,7 +49,7 @@
+ 
+ # Specify the installation home directory.
+ 
+-INSTALL_DIR = $(HOME)
++INSTALL_DIR = $(DESTDIR)/usr
+ 
+ # Specify the installation directory for the library.
+ 
+@@ -63,9 +63,10 @@
+ # of your preferred C compiler (CCOMPC) and compilation flags (CFLAGF
+ # for functions, CFLAGX for executables) here.
+ 
+-CCOMPC = gcc
+-CFLAGF = -c -pedantic -Wall -W -O
+-CFLAGX = -pedantic -Wall -W -O
++CCOMPC = $(CC)
++CFLAGF = -c -pedantic -Wall -W -fPIC $(CFLAGS)
++CFLAGX = -pedantic -Wall -W $(CFLAGS)
++
+ 
+ #----YOU SHOULDN'T HAVE TO MODIFY ANYTHING BELOW THIS LINE---------
+ 
+@@ -80,6 +81,12 @@
+ SOFA_LIB_NAME = libsofa_c.a
+ SOFA_LIB = $(SOFA_LIB_DIR)$(SOFA_LIB_NAME)
+ 
++ 
++# Name the SOFA/C library in its source and target locations.
++
++SOFA_SHLIB_NAME = libsofa_c.so
++SOFA_SHLIB = $(SOFA_LIB_DIR)$(SOFA_SHLIB_NAME)
++
+ # Name the SOFA/C testbed in its source and target locations.
+ 
+ SOFA_TEST_NAME = t_sofa_c.c
+@@ -285,29 +292,31 @@
+ #-----------------------------------------------------------------------
+ 
+ # Build (but do not install) the library.
+-all : $(SOFA_LIB_NAME)
++all : $(SOFA_SHLIB_NAME)
+ 	-@ echo ""
+ 	-@ echo "*** Now type 'make test'" \
+                 " to install the library and run tests ***"
+ 	-@ echo ""
+ 
+ # Install the library and header files.
+-install $(SOFA_LIB) : $(INSTALL_DIRS) $(SOFA_LIB_NAME) $(SOFA_INC)
+-	cp $(SOFA_LIB_NAME) $(SOFA_LIB_DIR)
++install: $(INSTALL_DIRS) $(SOFA_SHLIB_NAME) $(SOFA_INC)
++	cp $(SOFA_SHLIB_NAME).0.0 $(SOFA_LIB_DIR)
++	ln -s $(SOFA_SHLIB_NAME).0.0 $(SOFA_SHLIB).0
++	ln -s $(SOFA_SHLIB_NAME).0 $(SOFA_SHLIB)
+ 
+ # Deinstall the library and header files.
+ deinstall:
+-	rm -f $(SOFA_LIB) $(SOFA_INC)
++	rm -f $(SOFA_LIB) $(SOFA_SHLIB)* $(SOFA_INC)
+ 
+ # Test the build.
+ check: $(SOFA_TEST_NAME) $(SOFA_INC_NAMES) $(SOFA_LIB_NAME)
+-	$(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) $(SOFA_LIB_NAME) \
++	$(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) $(SOFA_SHLIB_NAME).0.0 \
+         -lm -o $(SOFA_TEST)
+-	./$(SOFA_TEST)
++	LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(SOFA_LIB_DIR) ./$(SOFA_TEST)
+ 	rm -f $(SOFA_TEST)
+ 
+ # Test the installed library.
+-installcheck test: $(SOFA_TEST_NAME) $(SOFA_INC) $(SOFA_LIB)
++installcheck: $(SOFA_TEST_NAME) $(SOFA_INC) $(SOFA_LIB)
+ 	$(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) -I$(SOFA_INC_DIR) \
+         -L$(SOFA_LIB_DIR) -lsofa_c -lm -o $(SOFA_TEST)
+ 	./$(SOFA_TEST)
+@@ -315,11 +324,11 @@
+ 
+ # Local clean up.
+ clean realclean:
+-	rm -f $(SOFA_OBS) $(SOFA_LIB_NAME)
++	rm -f $(SOFA_OBS) $(SOFA_LIB_NAME) $(SOFA_SHLIB_NAME)
+ 
+ # Clean up and deinstall.
+ distclean:
+-	rm -f $(SOFA_OBS) $(SOFA_LIB_NAME) $(SOFA_INC) $(SOFA_LIB)
++	rm -f $(SOFA_OBS) $(SOFA_LIB_NAME) $(SOFA_INC) $(SOFA_LIB) $(SOFA_SHLIB_NAME)
+ 
+ # Create the installation directories if not already present.
+ $(INSTALL_DIRS):
+@@ -329,6 +338,10 @@
+ $(SOFA_LIB_NAME): $(SOFA_OBS)
+ 	ar ru $(SOFA_LIB_NAME) $?
+ 
++$(SOFA_SHLIB_NAME): $(SOFA_OBS)
++	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(SOFA_SHLIB_NAME).0 -lm -o $(SOFA_SHLIB_NAME).0.0 $? 
++
++
+ # Install the header files.
+ $(SOFA_INC) : $(INSTALL_DIRS) $(SOFA_INC_NAMES)
+ 	cp $(SOFA_INC_NAMES) $(SOFA_INC_DIR)
diff --git a/sci-astronomy/sofa_c/metadata.xml b/sci-astronomy/sofa_c/metadata.xml
new file mode 100644
index 000000000000..17260472bb98
--- /dev/null
+++ b/sci-astronomy/sofa_c/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci-astronomy</herd>
+<longdescription lang="en">
+ This is a suite of vector/matrix routines and various utilities that
+ underpin the astronomy algorithms, which include routines for the
+ following:
+  * Calendars
+  * Time Scales
+  * Earth rotation and sidereal time
+  * Ephemerides (medium precision)
+  * Geocentric/geodetic transformations
+  * Precession, nutation, polar motion
+  * Star space motion
+  * Star catalogue conversion
+ This is the ANSI C version of the library.
+ The International Astronomical Union's SOFA service has the task of
+ establishing and maintaining an accessible and authoritative set of
+ algorithms and procedures that implement standard models used in
+ fundamental astronomy.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-astronomy/sofa_c/sofa_c-20120301a.ebuild b/sci-astronomy/sofa_c/sofa_c-20120301a.ebuild
new file mode 100644
index 000000000000..f10a1ee114c9
--- /dev/null
+++ b/sci-astronomy/sofa_c/sofa_c-20120301a.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/sofa_c/sofa_c-20120301a.ebuild,v 1.1 2013/04/23 15:57:06 bicatali Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib
+
+YYYY=${PV:0:4}
+MMDD=${PV:4:4}
+MYPV=${YYYY}${MMDD}_${PV:8:1}
+
+DESCRIPTION="Library for algorithms for models in fundamental astronomy"
+HOMEPAGE=" http://www.iausofa.org/current_C.html"
+SRC_URI="http://www.iausofa.org/${YYYY}_${MMDD}_C/${PN}-${MYPV}.tar.gz"
+
+LICENSE="SOFA"
+SLOT=0
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND=""
+
+S="${WORKDIR}/sofa/${MYPV}/c/src"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-makefile.patch
+	sed -i -e "s:/lib:/$(get_libdir):" makefile || die
+	replace-flags -O? -O1
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	cd ..
+	dodoc 00READ.ME
+	use doc && dodoc doc/*.lis doc/*.pdf
+}
diff --git a/sci-chemistry/apbs/apbs-1.2.1b-r4.ebuild b/sci-chemistry/apbs/apbs-1.2.1b-r4.ebuild
index 834dcbcf671d..d083881ab707 100644
--- a/sci-chemistry/apbs/apbs-1.2.1b-r4.ebuild
+++ b/sci-chemistry/apbs/apbs-1.2.1b-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r4.ebuild,v 1.16 2013/02/27 14:06:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r4.ebuild,v 1.17 2013/04/23 14:01:32 jlec Exp $
 
 EAPI="3"
 
@@ -11,8 +11,8 @@ inherit autotools eutils flag-o-matic fortran-2 python toolchain-funcs versionat
 MY_PV=$(get_version_component_range 1-3)
 MY_P="${PN}-${MY_PV}"
 
-DESCRIPTION="Software for evaluating the electrostatic properties of nanoscale biomolecular systems"
-HOMEPAGE="http://apbs.sourceforge.net/"
+DESCRIPTION="Evaluation of electrostatic properties of nanoscale biomolecular systems"
+HOMEPAGE="http://www.poissonboltzmann.org/apbs/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz"
 
 SLOT="0"
diff --git a/sci-chemistry/apbs/apbs-1.3-r3.ebuild b/sci-chemistry/apbs/apbs-1.3-r3.ebuild
index 987f83fb7455..4ebdf13e538e 100644
--- a/sci-chemistry/apbs/apbs-1.3-r3.ebuild
+++ b/sci-chemistry/apbs/apbs-1.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r3.ebuild,v 1.3 2013/02/27 14:06:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r3.ebuild,v 1.4 2013/04/23 14:01:33 jlec Exp $
 
 EAPI=4
 
@@ -11,8 +11,8 @@ inherit autotools-utils eutils fortran-2 python toolchain-funcs versionator
 MY_PV=$(get_version_component_range 1-3)
 MY_P="${PN}-${MY_PV}"
 
-DESCRIPTION="For evaluation of electrostatic properties of nanoscale biomolecular systems"
-HOMEPAGE="http://apbs.sourceforge.net/"
+DESCRIPTION="Evaluation of electrostatic properties of nanoscale biomolecular systems"
+HOMEPAGE="http://www.poissonboltzmann.org/apbs/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz"
 
 SLOT="0"
diff --git a/sci-electronics/magic/magic-7.5.202-r1.ebuild b/sci-electronics/magic/magic-7.5.202-r1.ebuild
index 687f71a3367a..72a986262a69 100644
--- a/sci-electronics/magic/magic-7.5.202-r1.ebuild
+++ b/sci-electronics/magic/magic-7.5.202-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.5.202-r1.ebuild,v 1.3 2013/04/22 13:46:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.5.202-r1.ebuild,v 1.4 2013/04/23 08:40:56 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.opencircuitdesign.com/magic/archive/${P}.tgz \
 
 LICENSE="HPND GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses
diff --git a/sci-libs/gdal/gdal-1.9.2.ebuild b/sci-libs/gdal/gdal-1.9.2.ebuild
index e9527b51b08d..ca35a45e51e3 100644
--- a/sci-libs/gdal/gdal-1.9.2.ebuild
+++ b/sci-libs/gdal/gdal-1.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.9.2.ebuild,v 1.3 2013/04/07 09:59:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.9.2.ebuild,v 1.5 2013/04/23 08:50:04 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="armadillo +aux_xml curl debug doc ecwj2k fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc opencl ogdi pdf perl png postgres python ruby spatialite sqlite threads xls"
 
 RDEPEND="
diff --git a/sys-apps/baselayout/baselayout-2.2.ebuild b/sys-apps/baselayout/baselayout-2.2.ebuild
index 5127292e963c..b3b4bdea62db 100644
--- a/sys-apps/baselayout/baselayout-2.2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.2.ebuild,v 1.3 2012/10/13 19:18:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.2.ebuild,v 1.11 2013/04/23 15:12:15 jer Exp $
 
 inherit eutils multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="build kernel_linux"
 
 PDEPEND="sys-apps/openrc"
diff --git a/sys-apps/iotools/Manifest b/sys-apps/iotools/Manifest
index df5d5013ce34..d12e009bef08 100644
--- a/sys-apps/iotools/Manifest
+++ b/sys-apps/iotools/Manifest
@@ -1 +1,2 @@
 DIST iotools-1.4.tar.gz 22217 SHA256 56e7348bb5b91f6b93a9b2759993545575eeb3fa5f9203a9cbb95dad9883807b SHA512 10b5f5c4183fb78900c254359b1d40d681519d4b0a79d10795c44d6f1691d73b93d02ede57cf84b5bac67e6083bc5a0de45c464caccbad8b2127a2c53cd7e94b WHIRLPOOL 808ba3b70c602ff0cdfe38ffcf7c1a3c4ab72cacf977ee8db34049159f20b034b48949f0bd70f1b27436f1183dda5cb677338f80afaf65ba1e1a0ec96a973418
+DIST iotools-1.5.tar.gz 23422 SHA256 3186ba296072f644dda881b78d77e3774b79e8cef3e828fffc947d558b08830d SHA512 d298343ee814c8b7d8404bc6af4050df730e89963a7c53798b3d251e94fd2b13e04c36e6da7ec5fd4126ea3a961be26a937910f791844e1b1d5b7dc5aa638c44 WHIRLPOOL 52d5aedf0ae4ee3257e19a6868f792e54b6ac9d79c0816c934b714811e4da0bc288a7f597098fd9ff2ed65f11cf486db1e2db76c85c0ecde0a095e09f24b2fbe
diff --git a/sys-apps/iotools/iotools-1.5.ebuild b/sys-apps/iotools/iotools-1.5.ebuild
new file mode 100644
index 000000000000..bab503af02d8
--- /dev/null
+++ b/sys-apps/iotools/iotools-1.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iotools/iotools-1.5.ebuild,v 1.1 2013/04/23 18:31:41 vapier Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Simple commands to access hardware device registers"
+HOMEPAGE="http://code.google.com/p/iotools/"
+SRC_URI="http://iotools.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static make-symlinks"
+
+src_prepare() {
+	sed -i 's:-Werror::' Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		STATIC=$(usex static 1 0) \
+		IOTOOLS_DEBUG="${CFLAGS}"
+}
+
+src_install() {
+	dosbin iotools
+
+	# Note: This is done manually because invoking the iotools binary
+	# when cross-compiling will likely fail.
+	local known_cmds="and btr bts busy_loop cmos_read cmos_write cpu_list cpuid io_read16 io_read32 io_read8 io_write16 io_write32 io_write8 mem_dump mem_read16 mem_read32 mem_read64 mem_read8 mem_write16 mem_write32 mem_write64 mem_write8 mmio_dump mmio_read16 mmio_read32 mmio_read64 mmio_read8 mmio_write16 mmio_write32 mmio_write64 mmio_write8 not or pci_list pci_read16 pci_read32 pci_read8 pci_write16 pci_write32 pci_write8 rdmsr rdtsc runon shl shr smbus_quick smbus_read16 smbus_read8 smbus_readblock smbus_receive_byte smbus_send_byte smbus_write16 smbus_write8 smbus_writeblock wrmsr xor"
+	if ! tc-is-cross-compiler ; then
+		local check_cmds=$(echo $(./iotools --list-cmds 2>/dev/null | grep '^  ' | LC_ALL=C sort))
+		if [[ ${known_cmds} != "${check_cmds:-${known_cmds}}" ]] ; then
+			eerror "known_cmds = ${known_cmds}"
+			eerror "check_cmds = ${check_cmds}"
+			die "need to update known_cmds cache in the ebuild"
+		fi
+	fi
+
+	if use make-symlinks ; then
+		local cmd
+		for cmd in ${known_cmds} ; do
+			dosym iotools /usr/sbin/${cmd}
+		done
+	fi
+}
diff --git a/sys-apps/iproute2/iproute2-3.8.0.ebuild b/sys-apps/iproute2/iproute2-3.8.0.ebuild
index 80f43dff1b1a..b8ef276e3695 100644
--- a/sys-apps/iproute2/iproute2-3.8.0.ebuild
+++ b/sys-apps/iproute2/iproute2-3.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.8.0.ebuild,v 1.1 2013/02/28 19:19:37 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.8.0.ebuild,v 1.9 2013/04/23 15:15:10 jer Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/usbutils/usbutils-006-r1.ebuild b/sys-apps/usbutils/usbutils-006-r1.ebuild
index 707b34f6f35c..5d6d806d0e6d 100644
--- a/sys-apps/usbutils/usbutils-006-r1.ebuild
+++ b/sys-apps/usbutils/usbutils-006-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-006-r1.ebuild,v 1.10 2013/04/22 17:09:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-006-r1.ebuild,v 1.12 2013/04/23 15:13:51 jer Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="python zlib"
 
 RDEPEND="virtual/libusb:1=
diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index 744e1e7cec18..e152568cd7d6 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -7,3 +7,4 @@ DIST nbd-2.9.25.tar.bz2 500483 SHA256 179548406aa2bcb0c6bff3aa0484dbb04136ec055a
 DIST nbd-3.0.tar.bz2 505274 SHA256 f7210edfa858f5ae69bdbf76f5467ac9dcaa97074d945e55e2a683e7aa228b93 SHA512 1226ec9bee0148d6af7b6f6dd46382916045a71d87554aab20903aff040a2214286b7b7071f7f34fce12ffde82e660992cd8b75f43864ede64cbfb604ed1248e WHIRLPOOL 1a1567a9d477d60ae91addfcd262418689ff9801a7d801d20ba122bd2116ddeab11046abb99f69bb653d3f9e4797880d0d9a722eff39a1e620bd2d4a990f0757
 DIST nbd-3.1.1.tar.bz2 508444 SHA256 5cd150b874f966aacf4a9dfe1e9de9b2139b295241ce89bae9f70f9aa844220b SHA512 937db191b3cc0800c5a0c31b0d2b634059768f133d42bfd8b13628bb5d6de766b51c5ccc82726b5756e4f7c67878bb36307e04597d8891d175f5334a1b998386 WHIRLPOOL 2a376219f2be2689cccc6ce8277e541ed2154e4dbdd424a6482241b468d432c712b248db0971a7d99dd9aeeb3bd80f6e6b0460ebd824cb53a7c8127a0ec1ffbe
 DIST nbd-3.2.tar.bz2 508734 SHA256 e297c1883133f04a55d8e9527a2e4344e577a54046cf81694ffabe13f73793db SHA512 dbb751ec74784d8ea89d4df273ba239d66cf1d6fca16fea44a77502d6241132b960bd41dfdde844854e2df68bf27763b215207c0518bde943a2f3c631e4f76ec WHIRLPOOL b863eb8cc0ef7368ac92b8f58748197bf10c93cad06741491cd2ca29eb1d3cab4947272f6a30ac360a054f641dad67f93031f05a609ffaf8636b9a8f34288946
+DIST nbd-3.3.tar.bz2 515909 SHA256 83105718dcab9eee7ea152d6e5f4928095f0d3e21dcf92e43eef183e29a80c19 SHA512 9e43f0f751172a18e9edf0e312ff4e8aee3b0ce303ed6f69308312a4565fb06d4b9e9e528f11470031c6490a8416d41266e18a0d6e249749305e01f200d0b608 WHIRLPOOL 97e994d953c046492216fcc09333b158304df80a310a28e3dceba581d3098962079af82fd3cf7d4816168a06e987b823bb1759be4afab35bd679ad5d4ac3ee91
diff --git a/sys-block/nbd/nbd-3.3.ebuild b/sys-block/nbd/nbd-3.3.ebuild
new file mode 100644
index 000000000000..6053c55f5bd1
--- /dev/null
+++ b/sys-block/nbd/nbd-3.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/nbd-3.3.ebuild,v 1.1 2013/04/22 21:42:17 radhermit Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Userland client/server for kernel network block device"
+HOMEPAGE="http://nbd.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nbd/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug zlib"
+
+RDEPEND=">=dev-libs/glib-2.0
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--enable-lfs \
+		--enable-syslog \
+		$(use_enable debug)
+}
+
+src_compile() {
+	default
+	use zlib && emake -C gznbd CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+	use zlib && dobin gznbd/gznbd
+}
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.10_rc1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.10_rc1.ebuild
index 940dfd707b56..d71e41626476 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.10_rc1.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.10_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.10_rc1.ebuild,v 1.1 2013/04/17 12:53:39 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.10_rc1.ebuild,v 1.2 2013/04/23 08:04:02 ultrabug Exp $
 
 EAPI="5"
 PYTHON_DEPEND="2"
@@ -34,7 +34,6 @@ DEPEND="
 	snmp? ( net-analyzer/net-snmp )
 "
 RDEPEND="${DEPEND}"
-PDEPEND="sys-cluster/crmsh"
 
 S="${WORKDIR}/${PN}-${MY_P}"
 
@@ -85,3 +84,9 @@ src_install() {
 		newins "${FILESDIR}/${PN}.service" ${PN} || die
 	fi
 }
+
+pkg_postinst() {
+	elog " "
+	elog "Looking for the crm CLI ? emerge sys-cluster/crmsh !"
+	elog " "
+}
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.8-r1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.8-r2.ebuild
similarity index 92%
rename from sys-cluster/pacemaker/pacemaker-1.1.8-r1.ebuild
rename to sys-cluster/pacemaker/pacemaker-1.1.8-r2.ebuild
index acaf352b11dd..bd5c9d9a41b6 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.8-r1.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.8-r1.ebuild,v 1.3 2013/03/13 13:48:26 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.8-r2.ebuild,v 1.1 2013/04/23 08:04:02 ultrabug Exp $
 
 EAPI=4
 
@@ -35,7 +35,6 @@ DEPEND="
 	snmp? ( net-analyzer/net-snmp )
 "
 RDEPEND="${DEPEND}"
-PDEPEND="sys-cluster/crmsh"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-backwards_compatibility.patch
@@ -88,3 +87,9 @@ src_install() {
 		newins "${FILESDIR}/${PN}.service" ${PN} || die
 	fi
 }
+
+pkg_postinst() {
+	elog " "
+	elog "Looking for the crm CLI ? emerge sys-cluster/crmsh !"
+	elog " "
+}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 1c96c9acfb33..53b332022ef7 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -102,6 +102,10 @@ DIST gcc-4.6.3-patches-1.13.tar.bz2 24076 SHA256 ecd7370a6d8e26c90997f879c1f4b93
 DIST gcc-4.6.3-piepatches-v0.5.2.tar.bz2 15002 SHA256 6606d47a8bbaa9cba0dd3b022cbf6ed14325b8560dd17f7601dbaa4697df3691 SHA512 21ec5bcd43ec0075f8885ef6f567fd9ffd0a64f4c4f9340262900b91a8f22f73a22cd320d6c5a9211083a0a4d21f61ff42e4d9368b5768b395d6ec1b17fc47eb WHIRLPOOL f38666e7c47d9e10b96a22b85c90659800ecfa86d7cf9d5ff69385dc5584fc6ea4b90265ec62d8066adab63a647c1a4bd0f0d1cc69057fcc08c4aa6856cd5766
 DIST gcc-4.6.3-uclibc-patches-1.0.tar.bz2 3023 SHA256 4219a3582c5f98bf8437bfc3feb8c264f8aabd8078caaddef46dd38be33f089f SHA512 e0763dc7f3f94cb9ba6e34233d1a2fa6913918a5100dd029ae76b3b086529b8fafae3086dc22f3294f7d378e5548294264cb2faa80866e8a1ecc666bf60fe010 WHIRLPOOL 1744810d5928b1869929ebd608e1d817e4bcb4f666647bc873e9bdb41c65833a40745e58de5ef4beb98ef4ac539c8560733100a3bbee280c76525ee518ae88c8
 DIST gcc-4.6.3.tar.bz2 71999439 SHA256 e8f5853d4eec2f5ebaf8a72ae4d53c436aacf98153b2499f8635b48c4718a093 SHA512 efedecc1a6d1c36eb91cbecfae9a4414d01051e99965de8a284d1164df3cad13fa99a6dd5a4ceaa03ef63a66884eaf729b49d602ac82088f788bab045ce1eb26 WHIRLPOOL a50059cc5ec5bcf7c7d7108e38087c2168ff0c6817d06b709be901a87007f84cd231ebae0752cdc94fa99c93ecd30ba810d3213aba9f3639292b1e831818ec0c
+DIST gcc-4.6.4-patches-1.0.tar.bz2 18687 SHA256 f751e2e701c48bc30d3047b87b5d08fb15095de3bb5b83c9662c08f5e5449a92 SHA512 8dd580faa9bcffcdeb1843a8d3d3bd8db492891d855c17bba3cc019673d814a5d24a927055694307be6438cb2c041bc799646a483c019f3840e4e1ca33b7ccb5 WHIRLPOOL 695fd821f347062bed01305fa1aca8c0cf4085391ad63f31df4afa3f4eaeb57eba7cebae02caac788dc9b290a57d675e66667ee3e15522d7d2909cbcbf1e6982
+DIST gcc-4.6.4-piepatches-v0.5.2.tar.bz2 14888 SHA256 a6a853197fb0de66c07e6183e686dbdb1f4b55108efd4c8363662cb2b971f43c SHA512 2fd1993b0dc7fc2096e17198f70ff6328ac4d3b7c0db597e3bc119df10eb0b9744f8e6cc659ae1ddd8afdb14f94cb85fdd12033a5d76026c7f84aca44ce9c9b8 WHIRLPOOL 61babd71167114a3f8579e8fb4bba5ed0c217cff4f3760b89de8a67d69c05de43b49bd9f567e6417b69874a878ecdc0e98d807a0e25a9dc80ef5c67594e15a0d
+DIST gcc-4.6.4-uclibc-patches-1.0.tar.bz2 3010 SHA256 946334cc62c0afa2f50a435dffbed12fd32c170f0850bbdce47df188a1eb8918 SHA512 fd289089a30c768b0ec4e3459cf494bc5e9d4ecf87056dc183277c712f7d69ac4cf900950270d8eacfe686b4aa906e1ece87cae52f2cb00642e96c0b95dcf133 WHIRLPOOL 2ce7f308a21fb5072d08a640390eb3f453ad8d811df897b0f9d3e917eef4680fce6cce231159ffe96e371f3c299264eaa51cd110124a3a126f04fb6d8531639e
+DIST gcc-4.6.4.tar.bz2 72006076 SHA256 35af16afa0b67af9b8eb15cafb76d2bc5f568540552522f5dc2c88dd45d977e8 SHA512 b5a5395782e0b9e61cda052f6e00c8575d1aa0b7e8db9e34c06e4e45f12ff37b436018536b7fa69a04a4235b5b368895652e3ed8fab2fe11763f9782ed9161dc WHIRLPOOL ab1b035f43aec669640b36037e65ae0edceb3b13b1ce4f7900aeff5ee06686dc2d66c3dd81156f53c4e9a9a806e4becd4462f72a6c4ad7e646b632c10c23356c
 DIST gcc-4.7.0-patches-1.2.tar.bz2 36167 SHA256 dd8d19f91a9481736f3506f367ed2e7233ee39edf969cf30a71c0dd3b05fab2c SHA512 fc7e1f9b620d6393c2ca4f8eeb3a4d8bcde2dc1071bb13d4ce89107dbd37edae4f657f0b84d58ee4bb45db0422172421aee09ebfadc502fd7dcb6655678ccebe WHIRLPOOL d9246a5946be0c636ec784d28f02f1afc6782586e06b042b932aadb316ccc369989e6aa9444b6f1650a9a385ffda815b142007fedf9c5474a2c23d6badfc274b
 DIST gcc-4.7.0-piepatches-v0.5.3.tar.bz2 14635 SHA256 8ae1d16dbb782b551a197c07c3cc12eb0ccd5d0e0c8f02c92bd678c3d96b62dd SHA512 69d9900d4edb01ac6278090f97186200625bb14f2fc0900f556cbea6d7c6d4732f56d453d3833fabf310846650657f00a46e75ea89bb441818ea50bfdd4ffc1f WHIRLPOOL 1d9c9c9c08ae4f143d9ee8abbf4ee7936a0acd085a4470bb25e923e2f2329a2860120e9516e66a277415541d441ebb0eea26d31971e1f9428da665ded6811b24
 DIST gcc-4.7.0-uclibc-patches-1.0.tar.bz2 3009 SHA256 a961197c952731cc6dec7b1467ec28ceab532b21b6406d4a87542ad678fd9066 SHA512 788625b58e0ff93f8b8f11ce11cd76f32123583e77a0c5f71bd46d56d30a4c8cd0bc1d8b9a549ebb27a13160982791d750145c68a96d9beaf7557a373068eeca WHIRLPOOL 4dc018a8a444db96e090498afd7e324393745bd8e5cf5428dc0accecf49545f1d9eba906036a103ec5ce37a06e2f9458b3129228e818b82750feb6c327f5bb61
diff --git a/sys-devel/gcc/gcc-4.6.4.ebuild b/sys-devel/gcc/gcc-4.6.4.ebuild
new file mode 100644
index 000000000000..c1c138bdb662
--- /dev/null
+++ b/sys-devel/gcc/gcc-4.6.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.4.ebuild,v 1.1 2013/04/23 06:32:01 dirtyepic Exp $
+
+PATCH_VER="1.0"
+UCLIBC_VER="1.0"
+
+# Hardened gcc 4 stuff
+PIE_VER="0.5.2"
+SPECS_VER="0.2.0"
+SPECS_GCC_VER="4.4.3"
+# arch/libc configurations known to be stable with {PIE,SSP}-by-default
+PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
+PIE_UCLIBC_STABLE="x86 arm amd64 ppc ppc64"
+SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
+# uclibc need tls and nptl support for SSP support
+# uclibc need to be >= 0.9.32
+SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
+#end Hardened stuff
+
+inherit toolchain
+
+DESCRIPTION="The GNU Compiler Collection"
+
+LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.8 )
+	>=${CATEGORY}/binutils-2.18"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
+fi
+
+src_unpack() {
+	if has_version '<sys-libs/glibc-2.12' ; then
+		ewarn "Your host glibc is too old; disabling automatic fortify."
+		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
+		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
+	fi
+
+	toolchain_src_unpack
+
+	use vanilla && return 0
+
+	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
+}
+
+pkg_setup() {
+	toolchain_pkg_setup
+
+	ewarn
+	ewarn "LTO support is still experimental and unstable."
+	ewarn "Any bugs resulting from the use of LTO will not be fixed."
+	ewarn
+}
diff --git a/sys-firmware/alsa-firmware/Manifest b/sys-firmware/alsa-firmware/Manifest
index ee6bc341a49e..b7a6696c3a8c 100644
--- a/sys-firmware/alsa-firmware/Manifest
+++ b/sys-firmware/alsa-firmware/Manifest
@@ -1 +1,2 @@
 DIST alsa-firmware-1.0.24.1.tar.bz2 3845175 SHA256 fe9d8b4c0ff57b882875b2fe0b5a985e0ba63534b6a3eb868619c90d6a04bf14 SHA512 e45d74e50c626fa4d09b62c2ca777710234d66fab58e51ed3f1c083fe41fb61b99fb4557be10da2ff0289b4c6fccc062e2d7f9c818fdd95072a77d699badf1f8 WHIRLPOOL 4ae2bc5eba36543df5fa59590b9bc19f0a32e5d38d835f176dc52100a8c6dcffb22b00d696a84869780de1ca4173d2e7db4aa74668bb03c9e44fd73ac44f4d58
+DIST alsa-firmware-1.0.27.tar.bz2 3935104 SHA256 34cde0e67fba1c86cbee5c219b91c0a245da01d268dfa7623b1a73430fd16e5b SHA512 4b1f722d75e7e74eb1eca767af491eca4a52807fad1d4fc28cbc1fce4c5a2a92b5e30a3b72d6ad01724902040be4176b8a786c6c55b617cf977f80f43477c6fb WHIRLPOOL d3af61b5256574c072179bb1b05b00b6fb81965456ec90c4b36386108f25017ee14066f24f10cd71bd01fb7d82786c8856c5be5777298b44529a9831912b743a
diff --git a/sys-firmware/alsa-firmware/alsa-firmware-1.0.24.1.ebuild b/sys-firmware/alsa-firmware/alsa-firmware-1.0.24.1.ebuild
index 1d6a6b3e267d..ea6bb7fdd802 100644
--- a/sys-firmware/alsa-firmware/alsa-firmware-1.0.24.1.ebuild
+++ b/sys-firmware/alsa-firmware/alsa-firmware-1.0.24.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/alsa-firmware/alsa-firmware-1.0.24.1.ebuild,v 1.1 2013/04/16 05:15:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/alsa-firmware/alsa-firmware-1.0.24.1.ebuild,v 1.3 2013/04/23 10:26:50 ssuominen Exp $
 
 EAPI=5
 inherit udev
@@ -30,10 +30,7 @@ alsa_cards_aica ${ECHOAUDIO_CARDS} ${EMU_CARDS}"
 DEPEND=""
 RDEPEND="alsa_cards_usb-usx2y? ( sys-apps/fxload )
 	alsa_cards_hdsp? ( media-sound/alsa-tools )
-	alsa_cards_hdspm? ( media-sound/alsa-tools )
-	alsa_cards_mixart? ( || ( virtual/udev media-sound/alsa-tools ) )
-	alsa_cards_vx222? ( || ( virtual/udev media-sound/alsa-tools ) )
-	alsa_cards_pcxhr? ( || ( virtual/udev media-sound/alsa-tools ) )"
+	alsa_cards_hdspm? ( media-sound/alsa-tools )"
 
 DOCS="README"
 
diff --git a/sys-firmware/alsa-firmware/alsa-firmware-1.0.27.ebuild b/sys-firmware/alsa-firmware/alsa-firmware-1.0.27.ebuild
new file mode 100644
index 000000000000..22caa9e8deab
--- /dev/null
+++ b/sys-firmware/alsa-firmware/alsa-firmware-1.0.27.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/alsa-firmware/alsa-firmware-1.0.27.ebuild,v 1.1 2013/04/23 10:26:50 ssuominen Exp $
+
+EAPI=5
+inherit udev
+
+DESCRIPTION="Advanced Linux Sound Architecture firmware"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/firmware/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+ECHOAUDIO_CARDS="alsa_cards_darla20 alsa_cards_gina20 alsa_cards_layla20
+alsa_cards_darla24 alsa_cards_gina24 alsa_cards_layla24 alsa_cards_mona
+alsa_cards_mia alsa_cards_indigo alsa_cards_indigoio alsa_cards_echo3g"
+
+EMU_CARDS="alsa_cards_emu1212 alsa_cards_emu1616 alsa_cards_emu1820
+alsa_cards_emu10k1"
+
+IUSE="alsa_cards_pcxhr alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_hdsp
+alsa_cards_hdspm alsa_cards_mixart alsa_cards_asihpi alsa_cards_sb16
+alsa_cards_korg1212 alsa_cards_maestro3 alsa_cards_ymfpci alsa_cards_wavefront
+alsa_cards_msnd-pinnacle alsa_cards_aica alsa_cards_ca0132 ${ECHOAUDIO_CARDS}
+${EMU_CARDS}"
+
+RDEPEND="alsa_cards_usb-usx2y? ( sys-apps/fxload )
+	alsa_cards_hdsp? ( media-sound/alsa-tools )
+	alsa_cards_hdspm? ( media-sound/alsa-tools )"
+
+DOCS="README"
+
+src_configure() {
+	econf --with-hotplug-dir=/lib/firmware
+}
+
+src_install() {
+	default
+
+	use alsa_cards_pcxhr || rm -rf "${ED}"/usr/share/alsa/firmware/pcxhrloader "${ED}"/lib/firmware/pcxhr
+	use alsa_cards_vx222 || rm -rf "${ED}"/usr/share/alsa/firmware/vxloader "${ED}"/lib/firmware/vx
+	use alsa_cards_usb-usx2y || rm -rf "${ED}"/usr/share/alsa/firmware/usx2yloader "${ED}"/lib/firmware/vx
+	use alsa_cards_mixart || rm -rf "${ED}"/usr/share/alsa/firmware/mixartloader "${ED}"/lib/firmware/mixart
+	use alsa_cards_hdsp || use alsa_cards_hdspm || rm -rf "${ED}"/usr/share/alsa/firmware/hdsploader
+	use alsa_cards_asihpi || rm -rf "${ED}"/lib/firmware/asihpi
+	use alsa_cards_sb16 || rm -rf "${ED}"/lib/firmware/sb16
+	use alsa_cards_korg1212 || rm -rf "${ED}"/lib/firmware/korg
+	use alsa_cards_maestro3 || rm -rf "${ED}"/lib/firmware/ess
+	use alsa_cards_ymfpci || rm -rf "${ED}"/lib/firmware/yamaha
+	use alsa_cards_wavefront || rm -rf "${ED}"/lib/firmware/wavefront
+	use alsa_cards_msnd-pinnacle || rm -rf "${ED}"/lib/firmware/turtlebeach
+	use alsa_cards_aica || rm -rf "${ED}"/lib/firmware/aica_firmware.bin
+	use alsa_cards_ca0132 || rm -rf "${ED}"/lib/firmware/c{tefx,tspeq}.bin
+
+	local ea="no"
+	for card in ${ECHOAUDIO_CARDS}; do
+		use ${card} && ea="yes" && break
+	done
+
+	local emu="no"
+	for card in ${EMU_CARDS}; do
+		use ${card} && emu="yes" && break
+	done
+
+	[[ ${ea} == "no" ]] && rm -rf "${ED}"/lib/firmware/ea
+	[[ ${emu} == "no" ]] && rm -rf "${ED}"/lib/firmware/emu
+
+	use alsa_cards_usb-usx2y && udev_dorules "${FILESDIR}"/52-usx2yaudio.rules
+}
diff --git a/sys-libs/talloc/talloc-2.0.8.ebuild b/sys-libs/talloc/talloc-2.0.8.ebuild
index ae280d9d3f7e..236162312b02 100644
--- a/sys-libs/talloc/talloc-2.0.8.ebuild
+++ b/sys-libs/talloc/talloc-2.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.0.8.ebuild,v 1.2 2013/02/25 08:41:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.0.8.ebuild,v 1.4 2013/04/23 21:40:26 ago Exp $
 
 EAPI=3
 PYTHON_DEPEND="python? 2:2.6"
@@ -13,7 +13,7 @@ SRC_URI="http://samba.org/ftp/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris"
 IUSE="compat python"
 
 RDEPEND="!!<sys-libs/talloc-2.0.5"
diff --git a/sys-power/cpupower/Manifest b/sys-power/cpupower/Manifest
index 8f1b66611ace..35538a7f67c8 100644
--- a/sys-power/cpupower/Manifest
+++ b/sys-power/cpupower/Manifest
@@ -1 +1 @@
-DIST linux-3.8-rc4.tar.bz2 84590599 SHA256 8d843b1f64fd5f01f0bedf3f41bd89e978fbb2153c8ac0fec2191a2e84f41b01 SHA512 29c9ec7bea457bab0858d28e658e30b5bfdc6d7d95dfaaf7625a608d2bf5a20d5366b24b79a7276dd28e4fea78f0413eac9989feb99bcc0051fa4b2f702a415b WHIRLPOOL 9f6c3e1d0ddc2138db0d7997ed1d14cd60178bcc1820abf3e15d597c62941bc1759bad901af02258f5c41605a110518e413bcf5181d063da0f0b0ff71395b768
+DIST linux-3.8.tar.xz 70989468 SHA256 e070d1bdfbded5676a4f374721c63565f1c969466c5a3e214004a136b583184b SHA512 10a7983391af907d8aec72bdb096d1cabd4911985715e9ea13d35ff09095c035db15d4ab08b92eda7c10026cc27348cb9728c212335f7fcdcda7c610856ec30f WHIRLPOOL 0c633854ad9c06df1b1d832aea9bbef76144ba88c8fccf6a3f8729101dc36838bcda6ccd444451cab19177608e7f7866f4f79cff1a8ef2bd0c893933d7f1f44c
diff --git a/sys-power/cpupower/cpupower-3.8_rc4.ebuild b/sys-power/cpupower/cpupower-3.8.ebuild
similarity index 81%
rename from sys-power/cpupower/cpupower-3.8_rc4.ebuild
rename to sys-power/cpupower/cpupower-3.8.ebuild
index a8b1e15d4323..96d21f5f1136 100644
--- a/sys-power/cpupower/cpupower-3.8_rc4.ebuild
+++ b/sys-power/cpupower/cpupower-3.8.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/cpupower-3.8_rc4.ebuild,v 1.3 2013/01/24 14:05:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/cpupower-3.8.ebuild,v 1.3 2013/04/23 03:23:12 patrick Exp $
 
 EAPI=5
 inherit multilib toolchain-funcs
 
 DESCRIPTION="Shows and sets processor power related values"
 HOMEPAGE="http://www.kernel.org/"
-SRC_URI="mirror://kernel/linux/kernel/v3.0/testing/linux-${PV/_/-}.tar.bz2"
+SRC_URI="mirror://kernel/linux/kernel/v3.x/linux-${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,13 +19,16 @@ IUSE="cpufreq_bench debug nls"
 # there in favour of this one which i'll push to users are replacement
 # for the dead cpufreq tools in tree
 # !sys-apps/linux-misc-apps[cpupower]
+
+# header collision with cpufrequtils
 RDEPEND="sys-apps/pciutils
-	!sys-apps/linux-misc-apps"
+	!sys-apps/linux-misc-apps
+	!sys-power/cpufrequtils"
 DEPEND="${RDEPEND}
 	virtual/os-headers
 	nls? ( sys-devel/gettext )"
 
-S=${WORKDIR}/linux-${PV/_/-}/tools/power/${PN}
+S=${WORKDIR}/linux-${PV}/tools/power/${PN}
 
 pkg_setup() {
 	myemakeargs=(
@@ -61,4 +64,7 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" "${myemakeargs[@]}" install
 	dodoc README ToDo
+
+	newconfd "${FILESDIR}"/conf.d ${PN}
+	newinitd "${FILESDIR}"/init.d ${PN}
 }
diff --git a/sys-power/cpupower/files/conf.d b/sys-power/cpupower/files/conf.d
new file mode 100644
index 000000000000..ee10216ec13f
--- /dev/null
+++ b/sys-power/cpupower/files/conf.d
@@ -0,0 +1,7 @@
+# /etc/conf.d/cpupower: config file for /etc/init.d/cpupower
+
+# Options when starting cpufreq (given to the `cpupower` program)
+#START_OPTS=""
+
+# Options when stopping cpufreq (given to the `cpupower` program)
+#STOP_OPTS=""
diff --git a/sys-power/cpupower/files/init.d b/sys-power/cpupower/files/init.d
new file mode 100644
index 000000000000..01ef556bb71e
--- /dev/null
+++ b/sys-power/cpupower/files/init.d
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/files/init.d,v 1.1 2013/04/23 01:48:26 ssuominen Exp $
+
+change() {
+	local c ret=0 opts="$1"
+	shift
+	ebegin "Running cpupower -c all frequency-set ${opts}"
+		cpupower -c all frequency-set ${opts} >/dev/null 2>&1
+		: $(( ret += $? ))
+	eend ${ret}
+
+	if [ $# -gt 0 ] ; then
+		c=1
+		einfo "Setting extra options: $*"
+		if cd /sys/devices/system/cpu/cpufreq ; then
+			local o v
+			for o in "$@" ; do
+				v=${o#*=}
+				o=${o%%=*}
+				echo ${v} > ${o} || break
+			done
+			c=0
+		fi
+		eend ${c}
+		: $(( ret += c ))
+	fi
+
+	return ${ret}
+}
+
+start() {
+	change "${START_OPTS}"
+}
+
+stop() {
+	change "${STOP_OPTS}"
+}
diff --git a/www-apps/gallery/Manifest b/www-apps/gallery/Manifest
index 69e135f3a96d..b827ba4105b1 100644
--- a/www-apps/gallery/Manifest
+++ b/www-apps/gallery/Manifest
@@ -2,3 +2,4 @@ DIST gallery-2.3.1-full.tar.gz 14564660 SHA256 ca07b03ba3c300cdb3ece36350547ecb6
 DIST gallery-2.3.2-full.tar.gz 14569436 SHA256 810ed73c456a3299ba50d9fcca6725d0654641c078c9d7c278d4875bad2af3fc SHA512 e4ee2007018ecdc6df2cb715798f57a94d2fcf5618a06812d704b45ba398cc9f52465d4ea1d830f2b99611c85d8853d7639059b3761f3b5d77ccc16d1e4ae0ad WHIRLPOOL 4591f8d69d173f01108fec5c21c7bde3f519c44177ef268866031e0c1cc021c452415b73950011e2f1cd46ee314d2741260bcd4ba80bdee56ca5b119a2452975
 DIST gallery-3.0.5.zip 2035940 SHA256 d720cf8a78ecd659ca95f845a2c0f7e0e9db3255bc9c7ffa575e9cbc074efb38 SHA512 a10f7758e5bd8ee2e59e469633c16e675be103589cd528e7e2294667b3892ca3117273a7c13f24cdb19cf1400739043121d961efd5031b5411080f55b2fb78e1 WHIRLPOOL f51e619262d67c61b83b5ab4bbb8dd52291f196dff5d423945586431713e14a393d1d1981a913e4fb09813a256b494f5dfdf02b6b872f31a21bf1c68ad4211e6
 DIST gallery-3.0.6.zip 2036483 SHA256 bba0a532bf99b046bf0c099eda38b1a2bd7aa67667880afb6927aed3100d0f44 SHA512 b7091e6d01ade0e314a7047adccaa16eb8bc366898a08aa09ffaca1a62a11d7c89841cc3ef2b2d6316e254d4fcaa072111c90c5009fb978e37bf76b0173a56f4 WHIRLPOOL 676e380669daf826addf7fb00266adce31e0a0ccea69a278d78fa94e124d51b798823f03ceb250cafa029b900bb40f0f44e38eb7d93a3a5c21a8690083b22401
+DIST gallery-3.0.7.zip 2036494 SHA256 c8960051853ef8c60c22cf3c446d48d30844319765164dd397405bb2d83ef98d SHA512 7a625e3627d1a2bb2185a60d643ece264258c7f4e8050370a14219200a7ad8c37284991fe88eff9c5c8cb2d71f172d35c59592e06df614fc4a6dd56d3c737ec1 WHIRLPOOL f3f42592d6d434c8ab0b8ebe762d77b362e17e7eae9da0756957430c7933c23b6789d0a6eeee8b6d92b9309b3b553a3e4d3eb4f7959fec6dffa51158cc9e805a
diff --git a/www-apps/gallery/gallery-3.0.7.ebuild b/www-apps/gallery/gallery-3.0.7.ebuild
new file mode 100644
index 000000000000..3598a5004108
--- /dev/null
+++ b/www-apps/gallery/gallery-3.0.7.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-3.0.7.ebuild,v 1.1 2013/04/23 02:26:47 blueness Exp $
+
+EAPI="5"
+
+inherit webapp
+
+DESCRIPTION="Web based (PHP Script) photo album viewer/creator"
+HOMEPAGE="http://gallery.menalto.com/"
+SRC_URI="mirror://sourceforge/gallery/${PN}/${P}.zip"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="ffmpeg +gd imagemagick mysql mysqli"
+
+# Build depend is on unzip
+DEPEND="app-arch/unzip"
+
+#PHP flags
+PHP_REQUIRED_FLAGS="ctype,filter,iconv,json,simplexml,tokenizer,unicode"
+PHP_OPTIONAL_FLAGS="gd?,mysql?,mysqli?"
+
+# No forced dependency on
+#  mysql? ( virtual/mysql )
+# which may live on another server
+RDEPEND="
+	imagemagick? ( || (
+			media-gfx/imagemagick
+			media-gfx/graphicsmagick[imagemagick]
+	) )
+	ffmpeg? ( virtual/ffmpeg )
+	>=dev-lang/php-5.2.3[${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}]
+	virtual/httpd-php"
+
+REQUIRED_USE="
+	|| ( gd imagemagick )
+	|| ( mysql mysqli )"
+
+S="${WORKDIR}/${PN}3"
+
+src_install() {
+	webapp_src_preinst
+
+	rm LICENSE
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	keepdir "${MY_HTDOCSDIR}"/var
+	webapp_serverowned "${MY_HTDOCSDIR}"/var
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "\033[1;33m**************************************************\033[00m"
+	ewarn
+	ewarn "gallery3 requires short_open_tag to be enabled."
+	ewarn "You need to edit \"/etc/php/apache2-php5.?/php.ini\","
+	ewarn "set short_open_tag to \"On\" and then restart apache."
+	ewarn
+	ewarn "This ebuild does not depend on mysql or mariadb,"
+	ewarn "because the database may run on different host.  But"
+	ewarn "you will need to run a database server somewhere."
+	ewarn
+	ewarn "\033[1;33m**************************************************\033[00m"
+	ewarn
+
+	einfo
+	einfo "\033[1;32m**************************************************\033[00m"
+	einfo
+	einfo "To see the post install instructions, do"
+	einfo
+	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
+	einfo
+	einfo "or for the post upgrade instructions, do"
+	einfo
+	einfo "    webapp-config --show-postupgrade ${PN} ${PVR}"
+	einfo
+	einfo "\033[1;32m**************************************************\033[00m"
+	einfo
+}
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 88df4e4d1402..9436680cd562 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -6,3 +6,5 @@ DIST chromium-27.0.1453.56-lite.tar.xz 108263340 SHA256 ac25359177b9d66b52f17b5a
 DIST chromium-27.0.1453.56-testdata.tar.xz 138714060 SHA256 11c9a424fa27d7b83967f03cb6fae678dac4d0b400a06800309972502bf54bed SHA512 96dfbe815a1fd614819d48871f37be3aa05947ad4ccf936a279cfd2227a752fd41efc35196502ef4d70b06650e9312e9a0a2f9b0b2a3b6901412eac047fb3d05 WHIRLPOOL 5ce9147d89d6fe9948e8351d9d762b6ecd6545567ed0f6229931e923771ae37a9ae6a35342b3f76654538834281697445a615d6f7a9a991700665f2cc3cd1f93
 DIST chromium-28.0.1478.0-lite.tar.xz 107077280 SHA256 3c9dc47799a8e1edfbe47579521348b626ab7149cec30e661b7fc93e5a3d5b3c SHA512 66a5e2f42734e0f7172350aacf1dd48066b121c4ae3de94241470539ceface1ce4e3f58c46f3c7ca2e654ca1370a38438d5efff7bafa0dee2bafc79a3e20a2d2 WHIRLPOOL a03f75900a21d189d0a1ea56858044f238c37923fb62992e1e7439f9dcfec4b1c6d6077172c54d5571a096a0ed5beda7198a06d5cd75cc118ae60478161b98cf
 DIST chromium-28.0.1478.0-testdata.tar.xz 139976184 SHA256 fdee09fe7f02b353b2ec5657f499a653d1d7f17aa5c13ac30de6050d2bc67ee3 SHA512 e1408eaaa6a6a65833928e67b8a5ca9fc79ec4fdd3162dac72e122513fc0b13e7457deb3e6470822b73acb4c820448f781bc4836127a814dad42600fce022df0 WHIRLPOOL 5fb8205c2ae341f52e0255aefacaa861f5ce4b2a3116b99ebb8cb4b6f2ce380b369381d422a44525e667b8d81900564ca2e90a471109334fd87d71fc000ec5ba
+DIST chromium-28.0.1485.0-lite.tar.xz 107423036 SHA256 ba64463b6ec3a1f1a15efae9eedc641f88d9fcf81de0fec2d03c5ce855d022b1 SHA512 99ccc4e63fe046f2eb6e27133aff37e0fb61b29a583ce9bd879d5de8757b9319c781cb7adaf6ab63542bcc26068130d6cd9e543d27c37e61fe4cb4dc1c154992 WHIRLPOOL a4924a2a30b2eb6a5d1e2a47b0828af5b2f864f8f3f28e80e0e36a1e208799d2382080414772ab94eb79a31b3b11fc1f322635ff50b34778833753fac5bfb172
+DIST chromium-28.0.1485.0-testdata.tar.xz 139968712 SHA256 7ef75e7cf526c1838486a1f4b0b9bcfa03b98d8c9100b6e60bedc162db020084 SHA512 a900aa978e9671b09066ca99462c92f29fea2782a16501f8089285996f923b3700883ec92d9dc924af4e3108ff8af1c6cc769dd930106da8c2d6477da1e774df WHIRLPOOL 8c145cb7dfa49f3b5aca19970a071600655fcaaa6357ce19cecc289de2165239b4cdeba2885e5c035a97b4a0dbbf41ddb7fbb6681a68ebf8dc4de322b976bfa2
diff --git a/www-client/chromium/chromium-28.0.1485.0.ebuild b/www-client/chromium/chromium-28.0.1485.0.ebuild
new file mode 100644
index 000000000000..2723d55c2df5
--- /dev/null
+++ b/www-client/chromium/chromium-28.0.1485.0.ebuild
@@ -0,0 +1,548 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-28.0.1485.0.ebuild,v 1.1 2013/04/23 00:34:02 phajdan.jr Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+CHROMIUM_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 ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit chromium eutils flag-o-matic multilib \
+	pax-utils portability python-any-r1 toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz
+	test? ( https://commondatastorage.googleapis.com/chromium-browser-official/${P}-testdata.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux +system-ffmpeg system-sqlite tcmalloc"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
+	app-arch/bzip2:=
+	system-sqlite? ( dev-db/sqlite:3 )
+	cups? (
+		dev-libs/libgcrypt:=
+		>=net-print/cups-1.3.11:=
+	)
+	>=dev-lang/v8-3.17.6:=
+	=dev-lang/v8-3.18*
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	>=dev-libs/icu-49.1.1-r1:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	>=dev-libs/libevent-1.4.13:=
+	dev-libs/libxml2:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.12.3:=
+	dev-libs/protobuf:=
+	dev-libs/re2:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= )
+	gps? ( >=sci-geosciences/gpsd-3.7:=[shm] )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/flac:=
+	media-libs/harfbuzz:=
+	>=media-libs/libjpeg-turbo-1.2.0-r1:=
+	media-libs/libpng:0=
+	media-libs/libvpx:=
+	>=media-libs/libwebp-0.2.0_rc1:=
+	!arm? ( !x86? ( >=media-libs/mesa-9.1:=[gles2] ) )
+	media-libs/opus:=
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( >=media-video/ffmpeg-1.0:=[opus] )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	sys-libs/zlib:=[minizip]
+	virtual/udev
+	virtual/libusb:1=
+	x11-libs/gtk+:2=
+	x11-libs/libXinerama:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	kerberos? ( virtual/krb5 )
+	selinux? (
+		sec-policy/selinux-chromium
+		sys-libs/libselinux:=
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	!arm? (
+		>=dev-lang/nacl-toolchain-newlib-0_p9093
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-python/ply
+	dev-python/simplejson
+	>=dev-util/gperf-3.0.3
+	sys-apps/hwids
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	>=sys-devel/make-3.81-r2
+	virtual/pkgconfig
+	test? ( dev-python/pyftpdlib )"
+RDEPEND+="
+	!=www-client/chromium-9999
+	x11-misc/xdg-utils
+	virtual/ttf-fonts"
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+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 python, bug #344367.
+	python-any-r1_pkg_setup
+
+	if ! use selinux; then
+		chromium_suid_sandbox_check_kernel_config
+	fi
+
+	if use bindist && ! use system-ffmpeg; then
+		elog "bindist enabled: H.264 video support will be disabled."
+	fi
+	if ! use bindist; then
+		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
+	fi
+}
+
+src_prepare() {
+	if ! use arm; then
+		mkdir -p out/Release/obj/gen/sdk/toolchain || die
+		# Do not preserve SELinux context, bug #460892 .
+		cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
+			out/Release/obj/gen/sdk/toolchain/linux_x86_newlib || die
+		touch out/Release/obj/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+	fi
+
+	epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-ffmpeg-r4.patch"
+
+	# Fix build with system minizip, to be upstreamed.
+	epatch "${FILESDIR}/${PN}-system-minizip-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/cros_system_api/*' \
+		\! -path 'third_party/ffmpeg/*' \
+		\! -path 'third_party/flot/*' \
+		\! -path 'third_party/hunspell/*' \
+		\! -path 'third_party/hyphen/*' \
+		\! -path 'third_party/iccjpeg/*' \
+		\! -path 'third_party/jstemplate/*' \
+		\! -path 'third_party/khronos/*' \
+		\! -path 'third_party/leveldatabase/*' \
+		\! -path 'third_party/libjingle/*' \
+		\! -path 'third_party/libphonenumber/*' \
+		\! -path 'third_party/libsrtp/*' \
+		\! -path 'third_party/libxml/chromium/*' \
+		\! -path 'third_party/libXNVCtrl/*' \
+		\! -path 'third_party/libyuv/*' \
+		\! -path 'third_party/lss/*' \
+		\! -path 'third_party/mesa/*' \
+		\! -path 'third_party/modp_b64/*' \
+		\! -path 'third_party/mongoose/*' \
+		\! -path 'third_party/mt19937ar/*' \
+		\! -path 'third_party/npapi/*' \
+		\! -path 'third_party/openmax/*' \
+		\! -path 'third_party/ots/*' \
+		\! -path 'third_party/pywebsocket/*' \
+		\! -path 'third_party/qcms/*' \
+		\! -path 'third_party/sfntly/*' \
+		\! -path 'third_party/skia/*' \
+		\! -path 'third_party/smhasher/*' \
+		\! -path 'third_party/sqlite/*' \
+		\! -path 'third_party/tcmalloc/*' \
+		\! -path 'third_party/tlslite/*' \
+		\! -path 'third_party/trace-viewer/*' \
+		\! -path 'third_party/undoview/*' \
+		\! -path 'third_party/v8-i18n/*' \
+		\! -path 'third_party/webdriver/*' \
+		\! -path 'third_party/webrtc/*' \
+		\! -path 'third_party/widevine/*' \
+		\! -path 'third_party/x86inc/*' \
+		-delete || die
+
+	# Remove bundled v8.
+	find v8 -type f \! -iname '*.gyp*' -delete || die
+}
+
+src_configure() {
+	local myconf=""
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf+=" -Ddisable_sse2=1"
+
+	# Optional tcmalloc. Note it causes problems with e.g. NVIDIA
+	# drivers, bug #413637.
+	myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)"
+
+	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
+	myconf+=" -Ddisable_glibc=1"
+
+	# TODO: also build with pnacl
+	myconf+=" -Ddisable_pnacl=1"
+
+	# It would be awkward for us to tar the toolchain and get it untarred again
+	# during the build.
+	myconf+=" -Ddisable_newlib_untar=1"
+
+	# Make it possible to remove third_party/adobe.
+	echo > "${T}/flapper_version.h" || die
+	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	myconf+="
+		-Duse_system_bzip2=1
+		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
+		-Duse_system_icu=1
+		-Duse_system_jsoncpp=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libusb=1
+		-Duse_system_libvpx=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_opus=1
+		-Duse_system_protobuf=1
+		-Duse_system_re2=1
+		-Duse_system_speex=1
+		-Duse_system_v8=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1
+		$(gyp_use system-ffmpeg use_system_ffmpeg)"
+
+	# TODO: Use system mesa on x86, bug #457130 .
+	if ! use x86 && ! use arm; then
+		myconf+="
+			-Duse_system_mesa=1"
+	fi
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf+="
+			-Duse_system_yasm=1"
+	fi
+
+	# TODO: re-enable on vp9 libvpx release (http://crbug.com/174287).
+	myconf+="
+		-Dmedia_use_libvpx=0"
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf+="
+		$(gyp_use cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use gps linux_use_libgps)
+		$(gyp_use gps linux_link_libgps)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)
+		$(gyp_use selinux selinux)"
+
+	if use system-sqlite; then
+		elog "Enabling system sqlite. WebSQL - http://www.w3.org/TR/webdatabase/"
+		elog "will not work. Please report sites broken by this"
+		elog "to https://bugs.gentoo.org"
+		myconf+="
+			-Duse_system_sqlite=1
+			-Denable_sql_database=0"
+	fi
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf+="
+		-Dlinux_link_gsettings=1
+		-Dlinux_link_libpci=1
+		-Dlinux_link_libspeechd=1
+		-Dlibspeechd_h_prefix=speech-dispatcher/"
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	if ! use selinux; then
+		# Enable SUID sandbox.
+		myconf+="
+			-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
+			-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	myconf+="
+		-Dlinux_use_gold_binary=0
+		-Dlinux_use_gold_flags=0"
+
+	# Always support proprietary codecs.
+	myconf+=" -Dproprietary_codecs=1"
+
+	if ! use bindist && ! use system-ffmpeg; then
+		# Enable H.624 support in bundled ffmpeg.
+		myconf+=" -Dffmpeg_branding=Chrome"
+	fi
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
+		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	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: re-enable NaCl (NativeClient).
+		myconf+=" -Dtarget_arch=arm
+			-Dsysroot=
+			-Darmv7=0
+			-Darm_neon=0
+			-Ddisable_nacl=1"
+	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
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX RANLIB
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	tc-export_build_env BUILD_AR BUILD_CC BUILD_CXX
+
+	egyp_chromium ${myconf} || die
+}
+
+src_compile() {
+	# TODO: add media_unittests after fixing compile (bug #462546).
+	local test_targets=""
+	for x in base cacheinvalidation content crypto \
+		googleurl gpu net printing sql; do
+		test_targets+=" ${x}_unittests"
+	done
+
+	local make_targets="chrome chromedriver"
+	if ! use selinux; then
+		make_targets+=" chrome_sandbox"
+	fi
+	if use test; then
+		make_targets+=" $test_targets"
+	fi
+
+	# See bug #410883 for more info about the .host mess.
+	emake ${make_targets} BUILDTYPE=Release V=1 \
+		CC.host="${BUILD_CC}" CFLAGS.host="${BUILD_CFLAGS}" \
+		CXX.host="${BUILD_CXX}" CXXFLAGS.host="${BUILD_CXXFLAGS}" \
+		LINK.host="${BUILD_CXX}" LDFLAGS.host="${BUILD_LDFLAGS}" \
+		AR.host="${BUILD_AR}" || die
+
+	pax-mark m out/Release/chrome
+	if use test; then
+		for x in $test_targets; do
+			pax-mark m out/Release/${x}
+		done
+	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
+
+	runtest() {
+		local cmd=$1
+		shift
+		local filter="--gtest_filter=$(IFS=:; echo "-${*}")"
+		einfo "${cmd}" "${filter}"
+		LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "${filter}"
+	}
+
+	local excluded_base_unittests=(
+		"ICUStringConversionsTest.*" # bug #350347
+		"MessagePumpLibeventTest.*" # bug #398591
+		"TimeTest.JsTime" # bug #459614
+		"SecurityTest.NewOverflow" # bug #465724
+	)
+	runtest out/Release/base_unittests "${excluded_base_unittests[@]}"
+
+	runtest out/Release/cacheinvalidation_unittests
+
+	local excluded_content_unittests=(
+		"RendererDateTimePickerTest.*" # bug #465452
+	)
+	runtest out/Release/content_unittests "${excluded_content_unittests[@]}"
+
+	runtest out/Release/crypto_unittests
+	runtest out/Release/googleurl_unittests
+	runtest out/Release/gpu_unittests
+
+	# TODO: add media_unittests after fixing compile (bug #462546).
+	# runtest out/Release/media_unittests
+
+	local excluded_net_unittests=(
+		"NetUtilTest.IDNToUnicode*" # bug 361885
+		"NetUtilTest.FormatUrl*" # see above
+		"DnsConfigServiceTest.GetSystemConfig" # bug #394883
+		"CertDatabaseNSSTest.ImportServerCert_SelfSigned" # bug #399269
+		"CertDatabaseNSSTest.TrustIntermediateCa*" # http://crbug.com/224612
+		"URLFetcher*" # bug #425764
+		"HTTPSOCSPTest.*" # bug #426630
+		"HTTPSEVCRLSetTest.*" # see above
+		"HTTPSCRLSetTest.*" # see above
+		"*SpdyFramerTest.BasicCompression*" # bug #465444
+	)
+	runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
+
+	runtest out/Release/printing_unittests
+
+	local excluded_sql_unittests=(
+		"SQLiteFeaturesTest.FTS2" # bug #461286
+	)
+	runtest out/Release/sql_unittests "${excluded_sql_unittests[@]}"
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	if ! use selinux; then
+		doexe out/Release/chrome_sandbox || die
+		fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
+	fi
+
+	doexe out/Release/chromedriver || die
+
+	if ! use arm; then
+		doexe out/Release/nacl_helper{,_bootstrap} || die
+		insinto "${CHROMIUM_HOME}"
+		doins out/Release/nacl_irt_*.nexe || die
+		doins out/Release/libppGoogleNaClPluginChrome.so || die
+	fi
+
+	newexe "${FILESDIR}"/chromium-launcher-r3.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
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.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
+
+	if ! use system-ffmpeg; then
+		doexe out/Release/libffmpegsumo.so || die
+	fi
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser${CHROMIUM_SUFFIX}.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	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
+}
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 7171aacfca12..35ba1079d0de 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.188 2013/04/11 22:30:22 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.189 2013/04/23 00:34:02 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -32,6 +32,7 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 		>=net-print/cups-1.3.11:=
 	)
 	>=dev-lang/v8-3.17.6:=
+	=dev-lang/v8-3.18*
 	>=dev-libs/elfutils-0.149
 	dev-libs/expat:=
 	>=dev-libs/icu-49.1.1-r1:=
@@ -342,7 +343,8 @@ src_configure() {
 	myconf+="
 		-Dlinux_link_gsettings=1
 		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1"
+		-Dlinux_link_libspeechd=1
+		-Dlibspeechd_h_prefix=speech-dispatcher/"
 
 	# TODO: use the file at run time instead of effectively compiling it in.
 	myconf+="
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index d172aaffbf34..3cccbf2d2acc 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -2,5 +2,5 @@ DIST google-chrome-beta_27.0.1453.56-r194414_amd64.deb 41944398 SHA256 e9915686d
 DIST google-chrome-beta_27.0.1453.56-r194414_i386.deb 39824132 SHA256 7da1fce169c4c502eac82ee59a6e943cfc20774878a6c25cfae46c4f2d55685e SHA512 b0f505657d765a7cc2b3359e5aea0f4db91fdb49b870c67e33d870e2f4d2cc35f862c75009d2e799c22e526a338c2fc0511d50ae52deb167521bf21ba8364ec0 WHIRLPOOL 4fa2dbc63d07a3bda2ba25d17b001d425329f01c886c8c88d960c3b3888072a86340a34b4d93db48bc5bb4de88815f4f886cf8489c1d0482cc7b5383b556e3b8
 DIST google-chrome-stable_26.0.1410.63-r192696_amd64.deb 42434828 SHA256 649eb397e0c2e91e3f9c6ee732b948b3f9ca033a0cb5ab306ca1d7697d4d6d3b SHA512 2c4ab9ace0a1974ccc389cc67fbfe5bdc92f169f576afaf078e1797879c93e7e56f5389965e3a16374c01a2264a68ab4873011914125368f57925b9b7ed82326 WHIRLPOOL dba5f1220846b8cac446d1fea2441a225dd9445892037319c35419fead902011757a98534122a4ca43b2789a94bc4f9513c4624ef241004a3406af74c010eda1
 DIST google-chrome-stable_26.0.1410.63-r192696_i386.deb 40297242 SHA256 0f7734721008d096e5067eb331577bc3c6ecc4984d1b23f38af761f267f50993 SHA512 4d3d32358b8498fe1ba0d6e4ceacc97aa77bba0b60ab21c68448179d443b5481aa6a1b50f13cdb1e017513147b2a34683ce583d74c7296d895f0fec6eb0dbf54 WHIRLPOOL 590095f4c8cb7722495620fb9d81af2c6f662f0bfa3f8edd28e172c4b7f59c2da8d753ec52d943e1a821e18d72282068ea3d4dab022caa0936237eea9a78c82c
-DIST google-chrome-unstable_28.0.1478.0-r194114_amd64.deb 42012742 SHA256 10809985668d5f1350834621ccb471ab9473ffd422a51c6e2540fa8bf15351ff SHA512 9d108dbd5b607882cc081e9d93f5418a79f281f39ed0d8ba5131841b4dca2f23b14adf2bde8d05b64bc52f33cc22efe66d0540228051d2d34c533d749932f91e WHIRLPOOL cd8e44a3d76eb1d22178ea0d793b5e88ea691dee71a2974115c5da551c6270cc6ae160bc9f4ef98685974c44caf8e3a4dc25257898f0671c0245d04f36baf953
-DIST google-chrome-unstable_28.0.1478.0-r194114_i386.deb 40095964 SHA256 8a90c4e9deeacf0ee1ad35dfc9aec0718445790c433eceab08c32e580f93d5cf SHA512 4c4223d68e2e4b08b3f4e060668c0812daa1aa8848b67c8ff7cf272849ddcbdb597c6808b0ba147f5d312eca3d8a52d5aa51dad4cc9d46425f8e98a0ab0f1be9 WHIRLPOOL 07428a9a4310ef8562895acf5ad2c2648bf1e5b08a2f72fcf8aff5c7cf02e1526ad46af70f93687d03f4b0b873696c78073ba4a63b7a08988f739d4706e18dff
+DIST google-chrome-unstable_28.0.1485.0-r195393_amd64.deb 42040242 SHA256 62f4986cabf4c76d493a7a7633a077f6dcb9d0e2650a57141ffcb92f2c022de2 SHA512 a3626063e1b74536ffff09aa93c3885d08f5e7638b5c4798e29951999238b63671f19cbb8efa035ec75735846dcab0c57f1b705fe7f68fc3747a50aefcaea906 WHIRLPOOL d034de9f89e59f48ae44239efbde063235637aec567f807eb60e0ba2ca5425566ed49183cce7a22f9e2a441cb3506407a5c87d6861b5c6910b192be695b2709b
+DIST google-chrome-unstable_28.0.1485.0-r195393_i386.deb 40141622 SHA256 88b274e2b3456d4a33e568a76527c5fad3b58e504559e36528379a1365fd88ab SHA512 4eb9424acd93a5ae3b4fc8b3d0040d7980e0a4346aaef0be204c325b43b67c506d2d3f19755657f3ed8ac4ad527e3c688b0912db55ef00f647e8beabc5691e54 WHIRLPOOL e312e4ba983abb7d987b6fd755ca07239c6d51da1cd05583968b54167f36f295cd70e65a6162f8f24454b86367eee2d3603277443f5560e04ddabbd98053f0f1
diff --git a/www-client/google-chrome/google-chrome-28.0.1478.0_alpha194114.ebuild b/www-client/google-chrome/google-chrome-28.0.1485.0_alpha195393.ebuild
similarity index 97%
rename from www-client/google-chrome/google-chrome-28.0.1478.0_alpha194114.ebuild
rename to www-client/google-chrome/google-chrome-28.0.1485.0_alpha195393.ebuild
index b37963736a68..99b20b9066cc 100644
--- a/www-client/google-chrome/google-chrome-28.0.1478.0_alpha194114.ebuild
+++ b/www-client/google-chrome/google-chrome-28.0.1485.0_alpha195393.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-28.0.1478.0_alpha194114.ebuild,v 1.1 2013/04/16 01:28:55 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-28.0.1485.0_alpha195393.ebuild,v 1.1 2013/04/23 13:41:04 floppym Exp $
 
 EAPI="4"
 
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index d172aaffbf34..3cccbf2d2acc 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -2,5 +2,5 @@ DIST google-chrome-beta_27.0.1453.56-r194414_amd64.deb 41944398 SHA256 e9915686d
 DIST google-chrome-beta_27.0.1453.56-r194414_i386.deb 39824132 SHA256 7da1fce169c4c502eac82ee59a6e943cfc20774878a6c25cfae46c4f2d55685e SHA512 b0f505657d765a7cc2b3359e5aea0f4db91fdb49b870c67e33d870e2f4d2cc35f862c75009d2e799c22e526a338c2fc0511d50ae52deb167521bf21ba8364ec0 WHIRLPOOL 4fa2dbc63d07a3bda2ba25d17b001d425329f01c886c8c88d960c3b3888072a86340a34b4d93db48bc5bb4de88815f4f886cf8489c1d0482cc7b5383b556e3b8
 DIST google-chrome-stable_26.0.1410.63-r192696_amd64.deb 42434828 SHA256 649eb397e0c2e91e3f9c6ee732b948b3f9ca033a0cb5ab306ca1d7697d4d6d3b SHA512 2c4ab9ace0a1974ccc389cc67fbfe5bdc92f169f576afaf078e1797879c93e7e56f5389965e3a16374c01a2264a68ab4873011914125368f57925b9b7ed82326 WHIRLPOOL dba5f1220846b8cac446d1fea2441a225dd9445892037319c35419fead902011757a98534122a4ca43b2789a94bc4f9513c4624ef241004a3406af74c010eda1
 DIST google-chrome-stable_26.0.1410.63-r192696_i386.deb 40297242 SHA256 0f7734721008d096e5067eb331577bc3c6ecc4984d1b23f38af761f267f50993 SHA512 4d3d32358b8498fe1ba0d6e4ceacc97aa77bba0b60ab21c68448179d443b5481aa6a1b50f13cdb1e017513147b2a34683ce583d74c7296d895f0fec6eb0dbf54 WHIRLPOOL 590095f4c8cb7722495620fb9d81af2c6f662f0bfa3f8edd28e172c4b7f59c2da8d753ec52d943e1a821e18d72282068ea3d4dab022caa0936237eea9a78c82c
-DIST google-chrome-unstable_28.0.1478.0-r194114_amd64.deb 42012742 SHA256 10809985668d5f1350834621ccb471ab9473ffd422a51c6e2540fa8bf15351ff SHA512 9d108dbd5b607882cc081e9d93f5418a79f281f39ed0d8ba5131841b4dca2f23b14adf2bde8d05b64bc52f33cc22efe66d0540228051d2d34c533d749932f91e WHIRLPOOL cd8e44a3d76eb1d22178ea0d793b5e88ea691dee71a2974115c5da551c6270cc6ae160bc9f4ef98685974c44caf8e3a4dc25257898f0671c0245d04f36baf953
-DIST google-chrome-unstable_28.0.1478.0-r194114_i386.deb 40095964 SHA256 8a90c4e9deeacf0ee1ad35dfc9aec0718445790c433eceab08c32e580f93d5cf SHA512 4c4223d68e2e4b08b3f4e060668c0812daa1aa8848b67c8ff7cf272849ddcbdb597c6808b0ba147f5d312eca3d8a52d5aa51dad4cc9d46425f8e98a0ab0f1be9 WHIRLPOOL 07428a9a4310ef8562895acf5ad2c2648bf1e5b08a2f72fcf8aff5c7cf02e1526ad46af70f93687d03f4b0b873696c78073ba4a63b7a08988f739d4706e18dff
+DIST google-chrome-unstable_28.0.1485.0-r195393_amd64.deb 42040242 SHA256 62f4986cabf4c76d493a7a7633a077f6dcb9d0e2650a57141ffcb92f2c022de2 SHA512 a3626063e1b74536ffff09aa93c3885d08f5e7638b5c4798e29951999238b63671f19cbb8efa035ec75735846dcab0c57f1b705fe7f68fc3747a50aefcaea906 WHIRLPOOL d034de9f89e59f48ae44239efbde063235637aec567f807eb60e0ba2ca5425566ed49183cce7a22f9e2a441cb3506407a5c87d6861b5c6910b192be695b2709b
+DIST google-chrome-unstable_28.0.1485.0-r195393_i386.deb 40141622 SHA256 88b274e2b3456d4a33e568a76527c5fad3b58e504559e36528379a1365fd88ab SHA512 4eb9424acd93a5ae3b4fc8b3d0040d7980e0a4346aaef0be204c325b43b67c506d2d3f19755657f3ed8ac4ad527e3c688b0912db55ef00f647e8beabc5691e54 WHIRLPOOL e312e4ba983abb7d987b6fd755ca07239c6d51da1cd05583968b54167f36f295cd70e65a6162f8f24454b86367eee2d3603277443f5560e04ddabbd98053f0f1
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-28.0.1478.0_alpha194114.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-28.0.1485.0_alpha195393.ebuild
similarity index 95%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-28.0.1478.0_alpha194114.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-28.0.1485.0_alpha195393.ebuild
index 4d7455a795e8..bd6dae022f69 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-28.0.1478.0_alpha194114.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-28.0.1485.0_alpha195393.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-28.0.1478.0_alpha194114.ebuild,v 1.1 2013/04/16 01:43:40 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-28.0.1485.0_alpha195393.ebuild,v 1.1 2013/04/23 13:41:09 floppym Exp $
 
 EAPI=4
 
diff --git a/x11-libs/gtk+/gtk+-2.24.17.ebuild b/x11-libs/gtk+/gtk+-2.24.17.ebuild
index d5748f54a2fe..366dd856f229 100644
--- a/x11-libs/gtk+/gtk+-2.24.17.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.17.ebuild,v 1.8 2013/04/22 17:15:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.17.ebuild,v 1.11 2013/04/23 14:08:22 jer Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="aqua cups debug examples +introspection test vim-syntax xinerama"
 
 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
index 093c99482a38..055e74709385 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -1,2 +1,2 @@
 DIST pidgin-sipe-1.14.1.tar.gz 982386 SHA256 f9d6fdeb024b29b6c68be640f8da8f2bf5adb94771d89bed4b1cc4ba72acca7f SHA512 50ddb6aaf0dceab8e291e8fbe255fcef7d7dc802e83c0da2c59a03a06f6de3786ffafb4ce78ecde0a740d2122dc3183facb1bc006a6a6607f4192aec331f3a03 WHIRLPOOL f290bdfcb727d35b0a7e406edc5ff6480cd63de1c31986224058b0dc4b3012b587023bb0f765be9b0e12648ab5008f34de689d70b376a2e8788b771e10863039
-DIST pidgin-sipe-1.15.0.tar.gz 1010371 SHA256 38f3f8e632c8fc333c07553f741d8cb95c0e8d16a527fa9acba487144b709a59 SHA512 93d81d47d16f2bc5baff67fc8360de160e67368918a8da560d1033e6e2f147c166b05393f37ff523d3fa79b2c695e50294a961952a5fbb2bca902d422d829fac WHIRLPOOL 682d498e8493848bf8f65c11edfe7a4e78f7de3b89dcda65209e0b1481008f68d35a27206be78d5550c5f6463c6bc598436ef1f7eae7581417b63fed3c8be16b
+DIST pidgin-sipe-1.15.1.tar.gz 1015668 SHA256 dd1de3fa78834e73e19a905ab150b2e069afe73d2ed69f18239a29de56feb506 SHA512 2e80700b63887b05f8be45bdca4d080f4c37d5048f5da2d8fdeb92b756a4fd03ace2d6163d131e4485c9e6ac45d43df1ed8a56f492b95feacd3986ea87ffe2a8 WHIRLPOOL 1e7fff01add5c1d6f1c6cc6b3353f6739c995704b5ead585e1d3abb8aa90facb8a087af008c41fbeeb5c0c5b0daabd5ec57d6c8d5364f34e2458fd6666d5bf54
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.15.0.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.15.1.ebuild
similarity index 94%
rename from x11-plugins/pidgin-sipe/pidgin-sipe-1.15.0.ebuild
rename to x11-plugins/pidgin-sipe/pidgin-sipe-1.15.1.ebuild
index cdd602fcff4f..726937938b40 100644
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.15.0.ebuild
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.15.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/pidgin-sipe-1.15.0.ebuild,v 1.1 2013/03/17 19:27:42 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/pidgin-sipe-1.15.1.ebuild,v 1.1 2013/04/23 19:54:19 thev00d00 Exp $
 
 EAPI=5